diff --git a/.editorconfig b/.editorconfig
index 8628b45bd..aa77aa8ed 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,16 +4,27 @@ root = true
 max_line_length = 100
 indent_size = 2
 
-[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,super-linter.env,.gitleaksignore,*.json5}]
+[{version-rules.xml,maven-wrapper.properties,checkstyle.xml,docker-compose.yaml,docker-compose.yml,Dockerfile,example_target_info.json,mise.toml,mvnm,mvnw.cmd,generate-protobuf.sh,.gitleaksignore,prometheus.properties}]
 max_line_length = 200
 
-[{grafana-dashboard-*.json,.editorconfig}]
+[{grafana-dashboard-*.json,.editorconfig,lychee.toml,renovate.json5,CODE_OF_CONDUCT.md}]
 max_line_length = 300
 
 [pom.xml]
-max_line_length = 110
+max_line_length = 210
 
 [*.py]
 # checked by black
 indent_size = 4
 max_line_length = 120
+
+[{.mise/tasks/build-release.sh,.github/workflows/*.yml}]
+max_line_length = 300
+
+[*.java]
+# Java line length is handled by google-java-format
+max_line_length = off
+
+[*.md]
+# Markdown line length is handled by rumdl
+max_line_length = off
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..be1c40c4a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+mise.lock linguist-generated
+CHANGELOG.md linguist-generated
+**/src/main/generated/** linguist-generated
+docs/apidiffs/** linguist-generated
+docs/** linguist-documentation
diff --git a/.github/config/.release-please-manifest.json b/.github/config/.release-please-manifest.json
new file mode 100644
index 000000000..099626f4f
--- /dev/null
+++ b/.github/config/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "1.8.0"
+}
diff --git a/.github/config/.rumdl.toml b/.github/config/.rumdl.toml
new file mode 100644
index 000000000..066c5b40f
--- /dev/null
+++ b/.github/config/.rumdl.toml
@@ -0,0 +1,5 @@
+[MD013]
+enabled = true
+line-length = 120
+code-blocks = false
+tables = false
diff --git a/.github/config/.taplo.toml b/.github/config/.taplo.toml
new file mode 100644
index 000000000..91983407c
--- /dev/null
+++ b/.github/config/.taplo.toml
@@ -0,0 +1,3 @@
+[formatting]
+column_width = 120
+indent_string = "  "
diff --git a/.github/config/.yamllint.yml b/.github/config/.yamllint.yml
new file mode 100644
index 000000000..483f3d4bf
--- /dev/null
+++ b/.github/config/.yamllint.yml
@@ -0,0 +1,8 @@
+extends: relaxed
+
+rules:
+  document-start: disable
+  # Line length is owned by the repo's root .editorconfig.
+  line-length: disable
+  # Keep indentation checks in yamllint so YAML structure issues still fail lint.
+  indentation: enable
diff --git a/.github/config/_typos.toml b/.github/config/_typos.toml
new file mode 100644
index 000000000..291218241
--- /dev/null
+++ b/.github/config/_typos.toml
@@ -0,0 +1,10 @@
+[default]
+extend-ignore-re = [
+  're-use',
+  '\.atMost\(',
+  '<id>errorprone</id>',
+  'com\.google\.errorprone',
+  '\bNormalDistribution nd\b',
+  '\bnd\.inverseCumulativeProbability\(',
+  'BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MCAXDTI0MDUxMDE0MzY1NloYDzIxMjQw',
+]
diff --git a/.github/config/flint.toml b/.github/config/flint.toml
new file mode 100644
index 000000000..45ec061d4
--- /dev/null
+++ b/.github/config/flint.toml
@@ -0,0 +1,5 @@
+[settings]
+exclude = ["docs/themes/**", "mvnw", "simpleclient-archive/**"]
+
+[checks.renovate-deps]
+exclude_managers = ["github-actions", "github-runners", "maven"]
diff --git a/.github/config/lychee.toml b/.github/config/lychee.toml
new file mode 100644
index 000000000..d9c1cffa5
--- /dev/null
+++ b/.github/config/lychee.toml
@@ -0,0 +1,30 @@
+# Lychee configuration file
+# See https://lychee.cli.rs/config/
+
+timeout = 30
+retry_wait_time = 10
+max_retries = 2
+max_concurrency = 4
+
+# Check link anchors
+include_fragments = "anchor-only"
+
+base_url = "https://prometheus.github.io"
+exclude_path = ["docs/themes", "CHANGELOG.md"]
+
+exclude = [
+  # excluding links to pull requests and issues is done for performance
+  "^https://github.com/prometheus/client_java/(issues|pull)/\\d+$",
+
+  # exclude localhost URLs as they require running services
+  "^http://localhost",
+  "^https://localhost",
+
+  '#',
+  'CONTRIBUTING.md',
+  'LICENSE',
+  'MAINTAINERS.md',
+
+  # exclude private GitHub settings pages
+  "^https://github.com/prometheus/client_java/settings/",
+]
diff --git a/.github/config/release-please-config.json b/.github/config/release-please-config.json
new file mode 100644
index 000000000..b7986d08e
--- /dev/null
+++ b/.github/config/release-please-config.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "group-pull-request-title-pattern": "chore${scope}: release${component} ${version}",
+  "pull-request-footer": "> [!IMPORTANT]\n> Close and reopen this PR to trigger CI checks.",
+  "packages": {
+    ".": {
+      "release-type": "maven"
+    }
+  }
+}
diff --git a/.github/release.yml b/.github/release.yml
deleted file mode 100644
index fb9b4d9d4..000000000
--- a/.github/release.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# .github/release.yml
-
-changelog:
-  categories:
-    - title: 🏕 Features
-      labels:
-        - "*"
-      exclude:
-        labels:
-          - chore
-          - dependencies
-    - title: 🧹 Chore
-      labels:
-        - chore
-    - title: 👒 Dependencies
-      labels:
-        - dependencies
diff --git a/.github/renovate-tracked-deps.json b/.github/renovate-tracked-deps.json
new file mode 100644
index 000000000..292f6b0d8
--- /dev/null
+++ b/.github/renovate-tracked-deps.json
@@ -0,0 +1,200 @@
+{
+  "meta": {
+    "protoc": {
+      "packageName": "protocolbuffers/protobuf",
+      "datasource": "github-releases"
+    }
+  },
+  "files": {
+    ".github/renovate.json5": {
+      "renovate-config": [
+        "grafana/flint"
+      ]
+    },
+    ".github/workflows/acceptance-tests.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/api-diff.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/build.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/bump-api-diff-baseline.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/generate-protobuf.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/github-pages.yaml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/java-version-matrix-tests.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/jmx-exporter-compatibility.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/lint.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/micrometer-compatibility.yml": {
+      "regex": [
+        "micrometer-metrics/micrometer",
+        "mise",
+        "zeitlinger/micrometer"
+      ]
+    },
+    ".github/workflows/native-tests.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/nightly-benchmarks.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/pr-benchmarks.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/regenerate-api-diff-otel.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/release.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".github/workflows/test-release-build.yml": {
+      "regex": [
+        "mise"
+      ]
+    },
+    ".mise/envs/jmx-exporter/mise.toml": {
+      "mise": [
+        "java"
+      ]
+    },
+    ".mise/envs/micrometer/mise.toml": {
+      "mise": [
+        "java"
+      ]
+    },
+    ".mise/envs/native/mise.toml": {
+      "mise": [
+        "java"
+      ]
+    },
+    ".mvn/wrapper/maven-wrapper.properties": {
+      "maven-wrapper": [
+        "maven"
+      ]
+    },
+    "examples/example-custom-buckets/docker-compose.yaml": {
+      "docker-compose": [
+        "eclipse-temurin",
+        "grafana/grafana",
+        "prom/prometheus"
+      ]
+    },
+    "examples/example-exemplars-tail-sampling/docker-compose.yaml": {
+      "docker-compose": [
+        "grafana/grafana",
+        "grafana/k6",
+        "grafana/tempo",
+        "opentelemetry-java-agent",
+        "otel/opentelemetry-collector-contrib",
+        "prom/prometheus"
+      ]
+    },
+    "examples/example-exporter-opentelemetry/docker-compose.yaml": {
+      "docker-compose": [
+        "openjdk",
+        "otel/opentelemetry-collector-contrib",
+        "prom/prometheus"
+      ]
+    },
+    "examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile": {
+      "dockerfile": [
+        "eclipse-temurin"
+      ]
+    },
+    "examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile": {
+      "dockerfile": [
+        "eclipse-temurin"
+      ]
+    },
+    "examples/example-native-histogram/docker-compose.yaml": {
+      "docker-compose": [
+        "eclipse-temurin",
+        "grafana/grafana",
+        "prom/prometheus"
+      ]
+    },
+    "mise.toml": {
+      "mise": [
+        "actionlint",
+        "aqua:grafana/flint",
+        "aqua:grafana/gcx",
+        "aqua:grafana/oats",
+        "aqua:jonwiggins/xmloxide",
+        "aqua:owenlamont/ryl",
+        "biome",
+        "checkstyle",
+        "editorconfig-checker",
+        "google-java-format",
+        "hugo",
+        "java",
+        "lychee",
+        "node",
+        "npm:renovate",
+        "protoc",
+        "ruff",
+        "rumdl",
+        "shellcheck",
+        "shfmt",
+        "taplo",
+        "typos",
+        "zizmor"
+      ],
+      "regex": [
+        "grafana/docker-otel-lgtm",
+        "micrometer-metrics/micrometer",
+        "prometheus/jmx_exporter"
+      ]
+    },
+    "mvnw": {
+      "maven-wrapper": [
+        "maven-wrapper"
+      ]
+    },
+    "mvnw.cmd": {
+      "maven-wrapper": [
+        "maven-wrapper"
+      ]
+    }
+  }
+}
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 67c8c137f..720659e04 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -1,6 +1,6 @@
 {
   $schema: "https://docs.renovatebot.com/renovate-schema.json",
-  extends: ["config:best-practices", "config:recommended"],
+  extends: ["config:best-practices", "config:recommended", "github>grafana/flint#v0.22.10"],
   platformCommit: "enabled",
   automerge: true,
   ignorePaths: [
@@ -12,20 +12,64 @@
   labels: ["dependencies"],
   packageRules: [
     {
-      matchPackageNames: ["jdx/mise"],
-      groupName: "mise",
-      schedule: ["before 4am on monday"],
+      matchFileNames: ["mise.toml"],
+      matchDepNames: ["java"],
+      groupName: "java temurin",
+      additionalBranchPrefix: "temurin-",
+    },
+    {
+      matchFileNames: [".mise/envs/native/mise.toml"],
+      matchDepNames: ["java"],
+      groupName: "java graalvm",
+      additionalBranchPrefix: "graalvm-",
+    },
+    {
+      description: "Compat tests pin an LTS JDK the upstream release supports; block major JDK bumps that would break those builds",
+      matchFileNames: [".mise/envs/jmx-exporter/mise.toml", ".mise/envs/micrometer/mise.toml"],
+      matchDepNames: ["java"],
+      matchUpdateTypes: ["major"],
+      enabled: false,
     },
-  ],
-  customManagers: [
     {
-      customType: "regex",
-      description: "update mise",
-      managerFilePatterns: ["/(^|/)(workflow-templates|\\.(?:github|gitea|forgejo)/(?:workflows|actions))/.+\\.ya?ml$/", "/(^|/)action\\.ya?ml$/"],
-      datasourceTemplate: "github-release-attachments",
-      packageNameTemplate: "jdx/mise",
-      depNameTemplate: "mise",
-      matchStrings: ["jdx/mise-action.*\\n\\s*with:\\s*\\n\\s*version: [\"']?(?<currentValue>v[.\\d]+)[\"']?\\s*\\n\\s*sha256: [\"']?(?<currentDigest>\\w+)[\"']?"],
+      matchPackageNames: ["io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha"],
+      ignoreUnstable: false,
     },
+    {
+      enabled: false,
+      description: "Ignore internal project modules",
+      matchPackageNames: ["/^io\\.prometheus:(prometheus-metrics-bom|examples|example-.+|integration-tests|it-.+)$/"],
+    },
+    {
+      description: "Group protobuf-java and protoc together so generated code can be updated in one PR",
+      matchDepNames: ["com.google.protobuf:protobuf-java", "protoc"],
+      groupName: "protobuf",
+      separateMajorMinor: false,
+    },
+  ],
+  customManagers: [
+  {
+       "customType": "regex",
+       "description": "update _VERSION variables in mise.toml",
+       "managerFilePatterns": ["/^mise\\.toml$/"],
+       "matchStrings": [
+         "# renovate: datasource=(?<datasource>[a-z-]+?)(?: depName=(?<depName>.+?))?(?: packageName=(?<packageName>.+?))?(?: versioning=(?<versioning>[a-z-]+?))?\\s.+?_VERSION\\s*=\\s*\"?(?<currentValue>[^@\"]+?)(?:@(?<currentDigest>sha256:[a-f0-9]+))?\"?\\s"
+       ]
+     },
+     {
+       customType: "regex",
+       description: "track the latest Micrometer release for upstream compatibility",
+       managerFilePatterns: ["/^\\.github\\/workflows\\/micrometer-compatibility\\.yml$/"],
+       matchStrings: [
+         "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+) packageName=(?<packageName>\\S+)\\n\\s*ref:\\s*(?<currentValue>v[0-9][^\\s]*)",
+       ],
+     },
+     {
+       customType: "regex",
+       description: "pin the Micrometer typed-descriptor compatibility ref",
+       managerFilePatterns: ["/^\\.github\\/workflows\\/micrometer-compatibility\\.yml$/"],
+       matchStrings: [
+         "# renovate: datasource=(?<datasource>\\S+) depName=(?<depName>\\S+) packageName=(?<packageName>\\S+) currentValue=(?<currentValue>\\S+)\\n\\s*ref:\\s*(?<currentDigest>[a-f0-9]{40})",
+       ],
+     },
   ],
 }
diff --git a/.github/scripts/sync-api-diffs.sh b/.github/scripts/sync-api-diffs.sh
new file mode 100755
index 000000000..34fe18ff5
--- /dev/null
+++ b/.github/scripts/sync-api-diffs.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Refresh docs/apidiffs/current_vs_latest/ from the japicmp reports produced by
+# `mvn verify -P api-diff`.
+#
+# Each StableApi module gets one committed <module>.txt describing how its
+# published API surface differs from the baseline release
+# (<api.diff.baseline.version> in pom.xml). Committing these makes every API
+# change visible in the pull request diff. The CI check fails when the
+# regenerated files differ from what is committed.
+#
+# The layout and format match opentelemetry-java's docs/apidiffs: the
+# "Comparing ... .jar against ... .jar" header is kept, while the constant
+# ignore-missing-classes warning and the semantic-versioning suggestion are
+# dropped as noise.
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+out_dir="$repo_root/docs/apidiffs/current_vs_latest"
+
+shopt -s nullglob globstar
+
+reports=("$repo_root"/**/target/japicmp/api-diff.diff)
+if [ "${#reports[@]}" -eq 0 ]; then
+	echo "No japicmp reports found. Run 'mvn verify -P api-diff' first." >&2
+	exit 1
+fi
+
+rm -rf "$out_dir"
+mkdir -p "$out_dir"
+
+for report in "${reports[@]}"; do
+	# report path: <repo>/<module path>/target/japicmp/api-diff.diff
+	module="$(basename "$(dirname "$(dirname "$(dirname "$report")")")")"
+	grep -vE '^(WARNING: You are using the option|Semantic versioning suggestion)' \
+		"$report" >"$out_dir/$module.txt"
+done
+
+echo "Wrote ${#reports[@]} API diff report(s) to docs/apidiffs/current_vs_latest/."
diff --git a/.github/super-linter.env b/.github/super-linter.env
deleted file mode 100644
index 62850b064..000000000
--- a/.github/super-linter.env
+++ /dev/null
@@ -1,41 +0,0 @@
-FILTER_REGEX_EXCLUDE=mvnw|src/main/generated/.*|docs/themes/.*|keystore.pkcs12|.*.java|prometheus-metrics-exporter-opentelemetry-shaded/pom.xml|CODE_OF_CONDUCT.md
-IGNORE_GITIGNORED_FILES=true
-JAVA_FILE_NAME=google_checks.xml
-# conflicts with prettier
-VALIDATE_BIOME_FORMAT=false
-# conflicts with prettier
-VALIDATE_BIOME_LINT=false
-# disable kubernetes linter - complains about resource limits, etc
-VALIDATE_CHECKOV=false
-VALIDATE_CSS=false
-VALIDATE_CSS_PRETTIER=false
-VALIDATE_DOCKERFILE_HADOLINT=false
-VALIDATE_GIT_COMMITLINT=false
-# done by maven
-VALIDATE_GOOGLE_JAVA_FORMAT=false
-# times out
-VALIDATE_GO_MODULES=false
-VALIDATE_HTML=false
-# done by checkstyle
-VALIDATE_JAVA=false
-# we have many duplicate code in our codebase for demo purposes
-VALIDATE_JSCPD=false
-VALIDATE_PYTHON_PYLINT=false
-# conflicts with black
-VALIDATE_PYTHON_RUFF_FORMAT=false
-# excluding simpleclient-archive doesn't seem to work
-VALIDATE_TRIVY=false
-
-FIX_ENV=true
-FIX_GITHUB_ACTIONS_ZIZMOR=true
-FIX_GO=true
-FIX_JAVASCRIPT_PRETTIER=true
-FIX_JSON=true
-FIX_JSONC=true
-FIX_JSONC_PRETTIER=true
-FIX_JSON_PRETTIER=true
-FIX_MARKDOWN=true
-FIX_MARKDOWN_PRETTIER=true
-FIX_PYTHON_BLACK=true
-FIX_SHELL_SHFMT=true
-FIX_YAML_PRETTIER=true
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
index 735e4d30a..8c891d4bc 100644
--- a/.github/workflows/acceptance-tests.yml
+++ b/.github/workflows/acceptance-tests.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Check out
         with:
           persist-credentials: false
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
         with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
       - name: Run acceptance tests
         run: mise run acceptance-test
diff --git a/.github/workflows/api-diff.yml b/.github/workflows/api-diff.yml
new file mode 100644
index 000000000..892881fa9
--- /dev/null
+++ b/.github/workflows/api-diff.yml
@@ -0,0 +1,52 @@
+---
+name: API Diff
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  workflow_dispatch:
+    inputs:
+      baseline_version:
+        description: >-
+          Override the baseline version to compare against.
+          Defaults to <api.diff.baseline.version> in pom.xml.
+        required: false
+        default: ""
+
+permissions:
+  contents: read
+
+jobs:
+  api-diff:
+    if: ${{ !startsWith(github.head_ref, 'release-please--branches--') }}
+    runs-on: ubuntu-24.04
+    env:
+      # Empty unless overridden via workflow_dispatch; the api-diff task then
+      # falls back to <api.diff.baseline.version> in pom.xml.
+      API_DIFF_BASELINE_VERSION: ${{ inputs.baseline_version }}
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+      - name: Run japicmp API diff
+        run: mise run api-diff
+      - name: Check docs/apidiffs is up to date
+        run: |
+          if ! git diff --exit-code -- docs/apidiffs; then
+            echo "::error::Published API surface changed but docs/apidiffs is stale."
+            echo "Run 'mise run api-diff' locally and commit the updated docs/apidiffs."
+            exit 1
+          fi
diff --git a/.github/workflows/approve-workflows.yml b/.github/workflows/approve-workflows.yml
new file mode 100644
index 000000000..f372012f2
--- /dev/null
+++ b/.github/workflows/approve-workflows.yml
@@ -0,0 +1,27 @@
+---
+###
+# This action is synced from https://github.com/prometheus/prometheus
+###
+name: Approve pending workflows
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions: read-all
+
+jobs:
+  approve:
+    if: >-
+      github.event.issue.pull_request &&
+      github.event.comment.body == '/workflow-approve' &&
+      (github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community')
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: prometheus/promci/approve_workflows@370e8c15dcec50043cbe66f2f34633d9efc0a190 # v0.9.0
+        with:
+          github_token: ${{ github.token }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7727e98b..2acb7ea55 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,19 +9,17 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           persist-credentials: false
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
         with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
       - name: Cache local Maven repository
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         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 ci
diff --git a/.github/workflows/bump-api-diff-baseline.yml b/.github/workflows/bump-api-diff-baseline.yml
new file mode 100644
index 000000000..38004405d
--- /dev/null
+++ b/.github/workflows/bump-api-diff-baseline.yml
@@ -0,0 +1,94 @@
+---
+name: Bump API Diff Baseline
+
+# After release.yml publishes to Maven Central, push a baseline bump and
+# regenerated docs/apidiffs onto release-please's open snapshot-bump PR branch
+# (release-please--branches--main). The user merges a single PR that bumps to
+# the next -SNAPSHOT *and* updates the api-diff baseline, so there is no window
+# where main has a stale baseline.
+#
+# If the snapshot PR branch no longer exists (already merged), this workflow
+# fails loudly — re-run via workflow_dispatch after recreating it, or bump
+# manually.
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Released tag (e.g. v1.8.0)"
+        required: true
+
+permissions: {}
+
+env:
+  SNAPSHOT_BRANCH: release-please--branches--main
+
+jobs:
+  bump:
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write # push to the snapshot PR branch
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          ref: ${{ env.SNAPSHOT_BRANCH }}
+          persist-credentials: true
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Compute versions and bump baseline
+        id: bump
+        env:
+          TAG: ${{ inputs.tag }}
+        run: |
+          NEW="${TAG#v}"
+          baseline() {
+            grep -oP '(?<=<api\.diff\.baseline\.version>)[^<]+' "$1"
+          }
+          OLD=$(baseline pom.xml)
+          if [[ -z "$OLD" ]]; then
+            echo "::error::Could not read api.diff.baseline.version"
+            exit 1
+          fi
+          if [[ "$OLD" == "$NEW" ]]; then
+            echo "Baseline already $NEW; nothing to do"
+            echo "skip=true" >>"$GITHUB_OUTPUT"
+            exit 0
+          fi
+          sed -i -E \
+            "s|(<api\.diff\.baseline\.version>)[^<]+(</api\.diff\.baseline\.version>)|\1${NEW}\2|" \
+            pom.xml
+          if [[ -d docs/apidiffs/current_vs_latest ]]; then
+            cp -r docs/apidiffs/current_vs_latest "docs/apidiffs/${NEW}_vs_${OLD}"
+          fi
+          echo "old=${OLD}" >>"$GITHUB_OUTPUT"
+          echo "new=${NEW}" >>"$GITHUB_OUTPUT"
+      - name: Regenerate docs/apidiffs
+        if: steps.bump.outputs.skip != 'true'
+        run: mise run api-diff
+      - name: Push to snapshot PR branch
+        if: steps.bump.outputs.skip != 'true'
+        env:
+          NEW: ${{ steps.bump.outputs.new }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add pom.xml docs/apidiffs
+          OUTSIDE=$(git status --porcelain -- ':(exclude)pom.xml' ':(exclude)docs/apidiffs')
+          if [[ -n "$OUTSIDE" ]]; then
+            echo "::error::Unexpected changes outside pom.xml/docs/apidiffs:"
+            echo "$OUTSIDE"
+            exit 1
+          fi
+          git commit -m "chore: bump api-diff baseline to ${NEW}"
+          # Note: GITHUB_TOKEN pushes don't trigger CI re-runs on the PR.
+          # Close and reopen the snapshot PR to trigger CI after this commit.
+          git push origin "HEAD:${SNAPSHOT_BRANCH}"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..b9ae9d3ce
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,61 @@
+---
+name: CodeQL Security Analysis
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: "29 13 * * 2" # Weekly Tuesday 13:29 UTC
+
+permissions: {}
+
+jobs:
+  analyze:
+    name: Analyze Java
+    runs-on: ubuntu-24.04
+    permissions:
+      actions: read # required for github/codeql-action/init to get workflow details
+      contents: read
+      security-events: write # required for github/codeql-action/analyze to upload SARIF
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
+
+      - name: Set up Java
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
+        with:
+          distribution: temurin
+          java-version: "25"
+
+      - name: Cache Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-codeql-${{ hashFiles('**/pom.xml') }}
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        with:
+          languages: java
+          tools: linked
+          queries: security-extended
+
+      # Do not use autobuild — the multi-module Maven structure requires explicit
+      # build invocation so that CodeQL can trace the compilation correctly.
+      # Do not use mise-action here — CodeQL needs to trace the raw Maven build.
+      - name: Build (CodeQL traces the build)
+        run: >
+          ./mvnw clean compile
+          -P '!default'
+          -DskipTests
+          -Dcoverage.skip=true
+          -Dcheckstyle.skip=true
+          -Djavadoc.skip=true
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        with:
+          category: /language:java
diff --git a/.github/workflows/detect-api-changes.yml b/.github/workflows/detect-api-changes.yml
new file mode 100644
index 000000000..f0de28c7a
--- /dev/null
+++ b/.github/workflows/detect-api-changes.yml
@@ -0,0 +1,117 @@
+---
+name: Detect API Changes
+
+on:
+  # pull_request_target is used so the workflow can update labels and comments
+  # without checking out or executing code from the PR branch.
+  # zizmor: ignore[dangerous-triggers] -- this workflow only reads PR metadata
+  # via the GitHub API and never checks out or executes code from the PR branch.
+  pull_request_target:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+permissions: {}
+
+jobs:
+  detect-api-changes:
+    if: github.repository == 'prometheus/client_java'
+    runs-on: ubuntu-24.04
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Check for API changes and update PR
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REPO: ${{ github.repository }}
+        run: |
+          MARKER="<!-- api-change-detector -->"
+          BREAKING_LABEL="breaking-api-change"
+
+          api_files=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}/files" --paginate \
+            --jq '.[] | select(.filename | startswith("docs/apidiffs/current_vs_latest/")) | .filename')
+
+          comment_id=$(gh api "repos/${REPO}/issues/${PR_NUMBER}/comments" --paginate \
+            --jq ".[] | select(.body | startswith(\"${MARKER}\")) | .id" | head -1)
+
+          if [[ -z "$api_files" ]]; then
+            echo "No API diff files changed."
+            gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "api-change" 2>/dev/null || true
+            gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "$BREAKING_LABEL" 2>/dev/null || true
+            if [[ -n "$comment_id" ]]; then
+              gh api --method DELETE "repos/${REPO}/issues/comments/${comment_id}"
+            fi
+            exit 0
+          fi
+
+          echo "API diff files changed:"
+          echo "$api_files"
+
+          gh pr edit "$PR_NUMBER" --repo "$REPO" --add-label "api-change"
+
+          modules=$(echo "$api_files" \
+            | sed 's|docs/apidiffs/current_vs_latest/||' \
+            | sed 's|\.txt$||' \
+            | sort \
+            | sed 's/^/- /')
+
+          HEAD_SHA=$(gh api "repos/${REPO}/pulls/${PR_NUMBER}" --jq .head.sha)
+          breaking_files=()
+          while IFS= read -r file; do
+            [[ -z "$file" ]] && continue
+            content=$(gh api \
+              -H "Accept: application/vnd.github.raw" \
+              "repos/${REPO}/contents/${file}?ref=${HEAD_SHA}")
+            if grep -Eq '^[[:space:]]*(\*\*\*!|---!|\+\+\+!)' <<<"$content"; then
+              breaking_files+=("$file")
+            fi
+          done <<<"$api_files"
+
+          if [[ ${#breaking_files[@]} -gt 0 ]]; then
+            gh pr edit "$PR_NUMBER" --repo "$REPO" --add-label "$BREAKING_LABEL"
+            breaking_modules=$(printf '%s\n' "${breaking_files[@]}" \
+              | sed 's|docs/apidiffs/current_vs_latest/||' \
+              | sed 's|\.txt$||' \
+              | sort \
+              | sed 's/^/- /')
+            body=$(cat <<EOF
+          ${MARKER}
+          ## :warning: Breaking API changes detected — maintainer review required
+
+          This PR modifies the published API diff for the following module(s):
+
+          ${modules}
+
+          The committed API diff contains breaking-change markers for:
+
+          ${breaking_modules}
+
+          Please review the changes in \`docs/apidiffs/current_vs_latest/\` carefully before approving.
+          EOF
+            )
+          else
+            gh pr edit "$PR_NUMBER" --repo "$REPO" --remove-label "$BREAKING_LABEL" 2>/dev/null || true
+
+            body=$(cat <<EOF
+          ${MARKER}
+          ## :warning: API changes detected — maintainer review required
+
+          This PR modifies the published API diff for the following module(s):
+
+          ${modules}
+
+          Please review the changes in \`docs/apidiffs/current_vs_latest/\` carefully before approving.
+          EOF
+            )
+          fi
+
+          if [[ -n "$comment_id" ]]; then
+            gh api --method PATCH "repos/${REPO}/issues/comments/${comment_id}" \
+              --field body="$body"
+          else
+            gh pr comment "$PR_NUMBER" --repo "$REPO" --body "$body"
+          fi
diff --git a/.github/workflows/generate-protobuf.yml b/.github/workflows/generate-protobuf.yml
new file mode 100644
index 000000000..ea3298069
--- /dev/null
+++ b/.github/workflows/generate-protobuf.yml
@@ -0,0 +1,98 @@
+---
+name: Generate Protobuf
+
+on:
+  push:
+    branches:
+      - "renovate/protobuf"
+
+permissions: {}
+
+jobs:
+  generate:
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read # checkout + read-only `git fetch origin main` for the verify step
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          ref: ${{ github.ref }}
+          persist-credentials: false
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Verify both protobuf deps are updated
+        run: |
+          git fetch origin main
+          DIFF_POM=$(git diff origin/main -- pom.xml)
+          DIFF_MISE=$(git diff origin/main -- mise.toml)
+          if ! echo "$DIFF_POM" | grep -q 'protobuf-java.version'; then
+            echo "::error::protobuf-java not updated in pom.xml"
+            exit 1
+          fi
+          if ! echo "$DIFF_MISE" | grep -q 'protoc'; then
+            echo "::error::protoc not updated in mise.toml"
+            exit 1
+          fi
+      - name: Generate protobuf sources
+        run: mise run generate
+      - name: Validate and export generated sources as a patch
+        run: |
+          CHANGED=$(git diff --name-only; git ls-files --others --exclude-standard)
+          UNEXPECTED=$(echo "$CHANGED" | sed '/^$/d' | grep -v '\.java$' || true)
+          if [[ -n "$UNEXPECTED" ]]; then
+            echo "::error::Unexpected files changed:"
+            echo "$UNEXPECTED"
+            exit 1
+          fi
+          git add -A -- '*.java'
+          git diff --cached --binary > /tmp/protobuf-sources.patch
+      - name: Upload generated patch
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: protobuf-sources-patch
+          path: /tmp/protobuf-sources.patch
+          retention-days: 5
+
+  publish:
+    runs-on: ubuntu-24.04
+    needs: generate
+    permissions:
+      contents: write # push regenerated sources back to the renovate branch
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          ref: ${{ github.ref }}
+          # zizmor: ignore[artipacked] -- needs credentials to push
+          persist-credentials: true
+      - name: Download generated patch
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: protobuf-sources-patch
+          path: /tmp/patch
+      - name: Commit and push generated sources
+        run: |
+          PATCH=/tmp/patch/protobuf-sources.patch
+          if [[ ! -s "$PATCH" ]]; then
+            echo "No generated changes to commit"
+            exit 0
+          fi
+          git apply --index "$PATCH"
+          if git diff --cached --quiet; then
+            echo "No generated changes to commit"
+            exit 0
+          fi
+          # Note: GITHUB_TOKEN pushes don't trigger CI re-runs.
+          # Close and reopen the PR to trigger CI after this commit.
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git commit -m "chore: regenerate protobuf sources"
+          git push
diff --git a/.github/workflows/github-pages.yaml b/.github/workflows/github-pages.yaml
index 0f3ad00aa..4878af3fd 100644
--- a/.github/workflows/github-pages.yaml
+++ b/.github/workflows/github-pages.yaml
@@ -32,25 +32,25 @@ jobs:
     if: github.repository == 'prometheus/client_java'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           persist-credentials: false
           fetch-tags: "true"
           fetch-depth: 0
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
         with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
           cache: "false"
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
+        uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6
       - name: Build GitHub Pages
         run: mise run build-gh-pages
         env:
           BASE_URL: "${{ steps.pages.outputs.base_url }}/"
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4
+        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5
         with:
           path: ./docs/public
           # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
@@ -70,4 +70,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
+        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5
diff --git a/.github/workflows/issue-management-stale-action.yml b/.github/workflows/issue-management-stale-action.yml
new file mode 100644
index 000000000..f0a294745
--- /dev/null
+++ b/.github/workflows/issue-management-stale-action.yml
@@ -0,0 +1,59 @@
+---
+name: Issue management - run stale action
+
+on:
+  schedule:
+    # hourly at minute 23
+    - cron: "23 6 * * *"
+  workflow_dispatch:
+
+permissions: {}
+
+concurrency:
+  group: "stale-issues-and-prs"
+  cancel-in-progress: false
+
+jobs:
+  stale:
+    permissions:
+      contents: read
+      actions: write # because actions/stale deletes its old cache before saving new one
+      issues: write # for actions/stale to close stale issues
+      pull-requests: write # for actions/stale to close stale PRs
+    runs-on: ubuntu-latest
+    steps:
+      # Handle stale PRs
+      # - After 120 days inactive: Adds "stale" label + warning comment
+      # - After 30 more days inactive: Closes
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
+        with:
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          days-before-pr-stale: 120
+          days-before-pr-close: 30
+          stale-pr-label: stale
+          stale-pr-message: >
+            This PR has been marked as stale due to 120 days of inactivity.
+            It will be automatically closed if there is no further activity over the next 30 days.
+          close-pr-message: >
+            This PR was automatically closed due to lack of activity after being marked stale. Feel
+            free to reopen if you would like to continue working on it.
+          operations-per-run: 1000
+
+      # Handle stale issues
+      # - After 360 days (12 months) inactive: Adds "stale" label + warning comment
+      # - After 30 more days inactive: Closes
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
+        with:
+          days-before-issue-stale: 360
+          days-before-issue-close: 30
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          stale-issue-label: stale
+          stale-issue-message: >
+            This issue has been marked as stale due to 12 months of inactivity.
+            It will be automatically closed if there is no further activity over the next 30 days.
+          close-issue-message: >
+            This issue was automatically closed due to lack of activity after being marked stale.
+            Feel free to reopen if you would like to continue working on it.
+          operations-per-run: 1000
diff --git a/.github/workflows/java-version-matrix-tests.yml b/.github/workflows/java-version-matrix-tests.yml
new file mode 100644
index 000000000..1fa501465
--- /dev/null
+++ b/.github/workflows/java-version-matrix-tests.yml
@@ -0,0 +1,79 @@
+---
+name: Integration Tests - Java Version Compatibility Matrix
+
+on:
+  pull_request:
+    paths:
+      - "integration-tests/**"
+      - "prometheus-metrics-core/**"
+      - "prometheus-metrics-exporter-*/**"
+      - "prometheus-metrics-exposition-*/**"
+      - ".github/workflows/java-version-matrix-tests.yml"
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  integration-tests:
+    name: Java ${{ matrix.java-version }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java-version: [8, 11, 17, 21, 25]
+    steps:
+      - name: Check out
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Set up mise
+        uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+      - name: Build core library artifacts
+        run: mise exec -- ./mvnw install -DskipTests -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn -pl '!integration-tests'
+
+      - name: Install parent POMs
+        run: |
+          cd integration-tests
+          mise exec -- ../mvnw clean install -N
+          cd it-exporter
+          mise exec -- ../../mvnw install -N
+      - name: Rebuild sample apps targeting Java ${{ matrix.java-version }}
+        run: |
+          cd integration-tests
+          # Note: Jetty 12 and Tomcat 11 require Java 17+, so servlet samples are skipped for Java 8 & 11
+          if [[ "${{ matrix.java-version }}" == "11" || "${{ matrix.java-version }}" == "8" ]]; then
+            MODULES="it-common,it-exporter/it-exporter-httpserver-sample,it-exporter/it-exporter-no-protobuf,it-pushgateway"
+          else
+            MODULES="it-common,it-exporter/it-exporter-httpserver-sample,it-exporter/it-exporter-servlet-tomcat-sample,it-exporter/it-exporter-servlet-jetty-sample,it-exporter/it-exporter-no-protobuf,it-pushgateway"
+          fi
+          mise exec -- ../mvnw clean install -DskipTests -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
+            -Djava.version=${{ matrix.java-version }} \
+            -Dmaven.compiler.release=${{ matrix.java-version }} \
+            -pl $MODULES
+
+      - name: Run integration tests
+        env:
+          TEST_JAVA_VERSION: ${{ matrix.java-version }}
+        run: |
+          cd integration-tests
+          # Note: Servlet tests require Java 17+ (due to Jetty 12 and Tomcat 11)
+          if [[ "${{ matrix.java-version }}" == "11" || "${{ matrix.java-version }}" == "8" ]]; then
+            TEST_MODULES="it-exporter/it-no-protobuf-test,it-pushgateway"
+          else
+            TEST_MODULES="it-exporter/it-exporter-test,it-exporter/it-no-protobuf-test,it-pushgateway"
+          fi
+          mise exec -- ../mvnw verify -T 2C -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn \
+            -pl $TEST_MODULES
diff --git a/.github/workflows/jmx-exporter-compatibility.yml b/.github/workflows/jmx-exporter-compatibility.yml
new file mode 100644
index 000000000..5c300425c
--- /dev/null
+++ b/.github/workflows/jmx-exporter-compatibility.yml
@@ -0,0 +1,40 @@
+---
+name: JMX Exporter Compatibility
+
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      repository:
+        description: JMX Exporter repository to test, in owner/name form
+        required: false
+        default: prometheus/jmx_exporter
+      ref:
+        description: JMX Exporter branch, tag, or commit to test
+        required: true
+
+permissions: {}
+
+jobs:
+  jmx-exporter-compatibility:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+          working_directory: .mise/envs/jmx-exporter
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+      - name: Run JMX Exporter compatibility tests
+        working-directory: .mise/envs/jmx-exporter
+        env:
+          JMX_EXPORTER_REPOSITORY: ${{ inputs.repository || 'prometheus/jmx_exporter' }}
+          JMX_EXPORTER_REF: ${{ inputs.ref }}
+        run: mise compat-test
diff --git a/.github/workflows/lint-rest.yml b/.github/workflows/lint-rest.yml
deleted file mode 100644
index b6d4004a2..000000000
--- a/.github/workflows/lint-rest.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Lint What Super Linter Can't
-
-on: [pull_request]
-
-permissions: {}
-
-jobs:
-  lint:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Check out
-        with:
-          persist-credentials: false
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
-        with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
-      - name: Lint
-        run: mise run lint-rest
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
new file mode 100644
index 000000000..e2fb025fc
--- /dev/null
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,36 @@
+---
+name: Lint
+
+on:
+  pull_request:
+
+permissions: {}
+
+jobs:
+  lint:
+    runs-on: ubuntu-24.04
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+          fetch-depth: 0 # needed for git diff --merge-base in lint:links
+
+      - name: Setup mise
+        uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+
+      - name: Lint
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_BASE_REF: ${{ github.base_ref }}
+          GITHUB_HEAD_REF: ${{ github.head_ref }}
+          PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
+        run: mise run lint
diff --git a/.github/workflows/micrometer-compatibility.yml b/.github/workflows/micrometer-compatibility.yml
new file mode 100644
index 000000000..b73552299
--- /dev/null
+++ b/.github/workflows/micrometer-compatibility.yml
@@ -0,0 +1,61 @@
+---
+name: Micrometer Compatibility
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  compat-test:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: upstream
+            repository: micrometer-metrics/micrometer
+            # renovate: datasource=github-releases depName=micrometer-metrics/micrometer packageName=micrometer-metrics/micrometer
+            ref: v1.17.1
+          - name: typed-descriptor
+            # TODO: remove this temporary opt-in leg once Micrometer switches the
+            # Prometheus client integration to typed descriptors by default.
+            # Follow-up: https://github.com/prometheus/client_java/issues/2182
+            repository: zeitlinger/micrometer
+            # renovate: datasource=git-refs depName=zeitlinger/micrometer packageName=https://github.com/zeitlinger/micrometer currentValue=feat/prom-client-java-typed-family-descriptor
+            ref: f240f0978366378dae66ac005ea1d2ef65708ff3
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+          working_directory: .mise/envs/micrometer
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+      - name: Run Micrometer compatibility tests
+        working-directory: .mise/envs/micrometer
+        env:
+          MICROMETER_REPOSITORY: ${{ matrix.repository }}
+          MICROMETER_REF: ${{ matrix.ref }}
+        run: mise compat-test
+
+  micrometer-compatibility:
+    name: micrometer-compatibility
+    runs-on: ubuntu-24.04
+    needs: compat-test
+    if: always()
+    steps:
+      - name: Aggregate matrix results
+        run: |
+          if [[ "${{ needs.compat-test.result }}" != "success" ]]; then
+            echo "compat-test matrix failed: ${{ needs.compat-test.result }}"
+            exit 1
+          fi
diff --git a/.github/workflows/multi-version-test.yml b/.github/workflows/multi-version-test.yml
new file mode 100644
index 000000000..f90251766
--- /dev/null
+++ b/.github/workflows/multi-version-test.yml
@@ -0,0 +1,35 @@
+---
+name: Java-Version Compatibility Tests
+
+on: [pull_request]
+
+permissions: {}
+
+jobs:
+  compatibility-test:
+    name: Test on Java ${{ matrix.java }}
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [17, 21, 25]
+    steps:
+      - name: Check out
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
+
+      - name: Set up Java ${{ matrix.java }}
+        id: setup-java
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
+        with:
+          distribution: "temurin"
+          java-version: ${{ matrix.java }}
+
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
+      - name: Build and test on Java ${{ matrix.java }}
+        run: ./mvnw clean install -Dtest.java.version=${{ matrix.java }} -Dcheckstyle.skip=true -Dwarnings=-nowarn -Dcoverage.skip=true
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
index 1b2c51f0e..a099aaafc 100644
--- a/.github/workflows/native-tests.yml
+++ b/.github/workflows/native-tests.yml
@@ -12,12 +12,11 @@ jobs:
       - name: Check out
         with:
           persist-credentials: false
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
         with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
-        env:
-          MISE_ENV: native
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+          working_directory: .mise/envs/native
       - name: Run native tests
-        run: mise run test
+        run: mise //.mise/envs/native:native-test
diff --git a/.github/workflows/nightly-benchmarks.yml b/.github/workflows/nightly-benchmarks.yml
new file mode 100644
index 000000000..f7e1bb8cd
--- /dev/null
+++ b/.github/workflows/nightly-benchmarks.yml
@@ -0,0 +1,124 @@
+---
+name: Nightly Benchmarks
+
+on:
+  schedule:
+    # Run at 2 AM UTC every day
+    - cron: "0 2 * * *"
+  workflow_dispatch:
+    inputs:
+      jmh_args:
+        description: "Additional JMH arguments (e.g., '-f 1 -wi 1 -i 3' for quick run)"
+        required: false
+        default: ""
+
+permissions: {}
+
+concurrency:
+  group: "benchmarks"
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  benchmark:
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read # checkout only
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Setup mise
+        uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      - name: Run JMH benchmarks
+        run: mise run benchmark:ci-json
+        env:
+          JMH_ARGS: ${{ github.event.inputs.jmh_args }}
+
+      - name: Generate benchmark summary
+        run: |
+          mise run benchmark:generate-summary \
+            --input benchmark-results.json \
+            --output-dir benchmark-results \
+            --commit-sha "${{ github.sha }}"
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+
+      - name: Upload benchmark results
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: benchmark-results
+          path: benchmark-results
+          retention-days: 5
+
+  publish:
+    runs-on: ubuntu-24.04
+    needs: benchmark
+    permissions:
+      contents: write # push generated results to the benchmarks branch
+    steps:
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          # zizmor: ignore[artipacked] -- needs credentials to push to benchmarks branch
+          persist-credentials: true
+          fetch-depth: 0
+
+      - name: Download benchmark results
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: benchmark-results
+          path: /tmp/benchmark-output
+
+      - name: Commit and push results to benchmarks branch
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          # Checkout or create benchmarks branch (use -- to disambiguate from benchmarks/ directory)
+          if git ls-remote --heads origin benchmarks | grep -q benchmarks; then
+            git fetch origin benchmarks
+            git switch benchmarks
+            # Preserve existing history
+            if [ -d history ]; then
+              cp -r history /tmp/benchmark-output/
+            fi
+          else
+            git switch --orphan benchmarks
+          fi
+
+          # Clean working directory
+          git rm -rf . 2>/dev/null || true
+          find . -mindepth 1 -maxdepth 1 ! -name '.git' -exec rm -rf {} +
+
+          # Copy only the benchmark results
+          cp -r /tmp/benchmark-output/* .
+
+          git add README.md results.json history/
+
+          DATE=$(date -u +"%Y-%m-%d")
+          COMMIT_SHORT=$(echo "${{ github.sha }}" | cut -c1-7)
+
+          git commit \
+            -m "Benchmark results for ${DATE} (${COMMIT_SHORT})" \
+            -m "From commit ${{ github.sha }}" \
+            || echo "No changes to commit"
+
+          git push origin benchmarks --force-with-lease || git push origin benchmarks
diff --git a/.github/workflows/pr-benchmark-report.yml b/.github/workflows/pr-benchmark-report.yml
new file mode 100644
index 000000000..25e3d848e
--- /dev/null
+++ b/.github/workflows/pr-benchmark-report.yml
@@ -0,0 +1,123 @@
+---
+name: PR Benchmark Report
+
+on:
+  # zizmor: ignore[dangerous-triggers] -- this workflow never checks out or executes PR code;
+  # it only reads artifacts produced by the benchmark run and posts a PR comment.
+  workflow_run:
+    workflows:
+      - PR Benchmarks
+    types:
+      - completed
+
+permissions: {}
+
+jobs:
+  comment:
+    if: >
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion != 'cancelled'
+    runs-on: ubuntu-24.04
+    permissions:
+      actions: read
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Comment on PR with benchmark results
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+          RUN_ID: ${{ github.event.workflow_run.id }}
+          RUN_URL: ${{ github.event.workflow_run.html_url }}
+          CONCLUSION: ${{ github.event.workflow_run.conclusion }}
+        run: |
+          HEAD_SHA=$(gh api "repos/${REPO}/actions/runs/${RUN_ID}" --jq '.head_sha')
+          PR_NUMBER=$(gh api \
+            "repos/${REPO}/actions/runs/${RUN_ID}" \
+            --jq '.pull_requests[0].number // ""')
+
+          # workflow_run.pull_requests can be empty for forked PRs. Prefer the
+          # artifact name because the benchmark workflow had the PR number when it
+          # uploaded the artifacts, then fall back to the run head repository/branch.
+          if [[ -z "${PR_NUMBER}" ]]; then
+            PR_NUMBER=$(gh api "repos/${REPO}/actions/runs/${RUN_ID}/artifacts" \
+              --jq '.artifacts[].name
+                | select(startswith("pr-benchmark-") and endswith("-'"${HEAD_SHA}"'"))
+                | split("-")[4]' \
+              | sort -u | head -1)
+          fi
+          if [[ -z "${PR_NUMBER}" ]]; then
+            HEAD_OWNER=$(gh api \
+              "repos/${REPO}/actions/runs/${RUN_ID}" \
+              --jq '.head_repository.owner.login // ""')
+            HEAD_BRANCH=$(gh api \
+              "repos/${REPO}/actions/runs/${RUN_ID}" \
+              --jq '.head_branch // ""')
+            if [[ -n "${HEAD_OWNER}" && -n "${HEAD_BRANCH}" ]]; then
+              PR_NUMBER=$(gh api --method GET "repos/${REPO}/pulls" \
+                -f state=open \
+                -f head="${HEAD_OWNER}:${HEAD_BRANCH}" \
+                --jq '.[].number' \
+                | head -1)
+            fi
+          fi
+          if [[ -z "${PR_NUMBER}" ]]; then
+            PR_NUMBER=$(gh api "repos/${REPO}/commits/${HEAD_SHA}/pulls" \
+              --jq '.[] | select(.state == "open") | .number' | head -1)
+          fi
+          if [[ -z "${PR_NUMBER}" ]]; then
+            echo "Could not determine PR number for run ${RUN_ID} (head ${HEAD_SHA})." >&2
+            exit 1
+          fi
+
+          COMMENT_ARTIFACT_NAME="pr-benchmark-comment-pr-${PR_NUMBER}-${HEAD_SHA}"
+          RESULTS_ARTIFACT_NAME="pr-benchmark-results-pr-${PR_NUMBER}-${HEAD_SHA}"
+          COMMENT_ARTIFACT_ID=$(gh api "repos/${REPO}/actions/runs/${RUN_ID}/artifacts" \
+            --jq '.artifacts[]
+              | select(.name == "'"${COMMENT_ARTIFACT_NAME}"'")
+              | .id' \
+            | head -1)
+
+          MARKER="<!-- pr-benchmark-report -->"
+
+          if [[ -n "${COMMENT_ARTIFACT_ID}" ]]; then
+            gh api \
+              "repos/${REPO}/actions/artifacts/${COMMENT_ARTIFACT_ID}/zip" \
+              > /tmp/pr-benchmark-comment.zip
+            unzip -p /tmp/pr-benchmark-comment.zip pr-benchmark-comment.md \
+              > /tmp/pr-benchmark-comment.md
+            SUMMARY_BODY=$(cat /tmp/pr-benchmark-comment.md)
+          else
+            SUMMARY_BODY="_Benchmark summary artifact was not found; "
+            SUMMARY_BODY+="see the workflow run for details._"
+          fi
+
+          if [[ "${CONCLUSION}" == "success" ]]; then
+            STATUS_LINE="Benchmark run succeeded for \`${HEAD_SHA}\`."
+          else
+            STATUS_LINE="Benchmark run finished with conclusion \`${CONCLUSION}\` "
+            STATUS_LINE+="for \`${HEAD_SHA}\`."
+          fi
+
+          body=$(cat <<EOF
+          ${MARKER}
+          ## Benchmark results
+
+          ${STATUS_LINE}
+
+          - Workflow run: ${RUN_URL}
+          - Artifact: \`${RESULTS_ARTIFACT_NAME}\`
+
+          ${SUMMARY_BODY}
+          EOF
+          )
+
+          comment_id=$(gh api "repos/${REPO}/issues/${PR_NUMBER}/comments" --paginate \
+            --jq ".[] | select(.body | startswith(\"${MARKER}\")) | .id" | head -1)
+
+          if [[ -n "${comment_id}" ]]; then
+            gh api --method PATCH "repos/${REPO}/issues/comments/${comment_id}" \
+              --field body="$body"
+          else
+            gh pr comment "${PR_NUMBER}" --repo "${REPO}" --body "$body"
+          fi
diff --git a/.github/workflows/pr-benchmarks.yml b/.github/workflows/pr-benchmarks.yml
new file mode 100644
index 000000000..ae6fd30f9
--- /dev/null
+++ b/.github/workflows/pr-benchmarks.yml
@@ -0,0 +1,176 @@
+---
+name: PR Benchmarks
+
+on:
+  pull_request:
+    types:
+      - labeled
+
+permissions: {}
+
+concurrency:
+  group: pr-benchmarks-${{ github.event.pull_request.number }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  benchmark:
+    if: github.event.label.name == 'benchmark'
+    runs-on: ubuntu-24.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - topic: counter
+            pattern: CounterBenchmark
+          - topic: histogram
+            pattern: HistogramBenchmark
+          - topic: exposition
+            pattern: HistogramTextFormatBenchmark|TextFormatUtilBenchmark
+    permissions:
+      contents: read # checkout only
+    env:
+      HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+      JMH_PATTERN: ${{ matrix.pattern }}
+    steps:
+      - name: Checkout PR base
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          repository: ${{ github.repository }}
+          ref: ${{ github.event.pull_request.base.sha }}
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Setup mise
+        uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-pr-bench-maven-${{ matrix.topic }}-${{ env.HEAD_SHA }}
+          restore-keys: |
+            ${{ runner.os }}-pr-bench-maven-${{ matrix.topic }}-
+            ${{ runner.os }}-pr-bench-maven-
+            ${{ runner.os }}-maven-
+
+      - name: Capture runner info
+        run: |
+          python3 ./.mise/tasks/generate_benchmark_summary.py \
+            --write-system-info /tmp/runner-info.json
+
+      - name: Run base ${{ matrix.topic }} benchmarks
+        run: mise run benchmark:ci-json
+        env:
+          JMH_ARGS: -f 3 -wi 3 -i 5 ${{ env.JMH_PATTERN }}
+
+      - name: Save base ${{ matrix.topic }} results
+        run: mv benchmark-results.json /tmp/base-results.json
+
+      - name: Checkout PR head
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Run head ${{ matrix.topic }} benchmarks
+        run: mise run benchmark:ci-json
+        env:
+          JMH_ARGS: -f 3 -wi 3 -i 5 ${{ env.JMH_PATTERN }}
+
+      - name: Save head ${{ matrix.topic }} results
+        run: mv benchmark-results.json /tmp/head-results.json
+
+      - name: Upload ${{ matrix.topic }} benchmark results
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: pr-benchmark-topic-${{ matrix.topic }}-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}
+          path: |
+            /tmp/base-results.json
+            /tmp/head-results.json
+            /tmp/runner-info.json
+          retention-days: 5
+
+  summarize:
+    if: github.event.label.name == 'benchmark'
+    runs-on: ubuntu-24.04
+    needs: benchmark
+    permissions:
+      contents: read # checkout only
+    env:
+      HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+      PR_NUMBER: ${{ github.event.pull_request.number }}
+    steps:
+      - name: Checkout PR head
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+          persist-credentials: false
+          fetch-depth: 0
+
+      - name: Download topic benchmark results
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: pr-benchmark-topic-*-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}
+          path: /tmp/topic-benchmark-results
+
+      - name: Merge topic benchmark results
+        run: |
+          python3 - <<'PY'
+          import json
+          from pathlib import Path
+
+          root = Path('/tmp/topic-benchmark-results')
+          for name in ('base', 'head'):
+              files = sorted(root.glob(f'*/{name}-results.json'))
+              if not files:
+                  raise SystemExit(f'No {name} benchmark result files found')
+              merged = []
+              for file in files:
+                  with open(file, 'r') as f:
+                      merged.extend(json.load(f))
+              with open(f'/tmp/{name}-benchmark-results.json', 'w') as f:
+                  json.dump(merged, f)
+                  f.write('\n')
+          PY
+
+      - name: Generate benchmark summary
+        run: |
+          python3 ./.mise/tasks/generate_benchmark_summary.py \
+            --input /tmp/head-benchmark-results.json \
+            --baseline /tmp/base-benchmark-results.json \
+            --output-dir benchmark-results \
+            --commit-sha "${{ github.event.pull_request.head.sha }}" \
+            --baseline-sha "${{ github.event.pull_request.base.sha }}" \
+            --comparison-note \
+              "Base and head are compared on the same runner within each topic."
+        env:
+          GITHUB_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }}
+          GITHUB_BASE_REPOSITORY: ${{ github.repository }}
+
+      - name: Prepare PR comment summary
+        run: |
+          cp benchmark-results/README.md pr-benchmark-comment.md
+
+      - name: Upload PR benchmark results
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: pr-benchmark-results-pr-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}
+          path: benchmark-results
+          retention-days: 5
+
+      - name: Upload PR benchmark comment
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: pr-benchmark-comment-pr-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}
+          path: pr-benchmark-comment.md
+          retention-days: 5
diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml
new file mode 100644
index 000000000..8cc398ee0
--- /dev/null
+++ b/.github/workflows/pr-title.yml
@@ -0,0 +1,17 @@
+---
+name: PR Title
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+permissions: {}
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read # action-semantic-pull-request reads the PR title
+    steps:
+      - uses: grafana/shared-workflows/actions/lint-pr-title@823ed150196915a86971ab4beb899b0c80d835fe # lint-pr-title/v1.2.3
diff --git a/.github/workflows/regenerate-api-diff-otel.yml b/.github/workflows/regenerate-api-diff-otel.yml
new file mode 100644
index 000000000..68f6fd865
--- /dev/null
+++ b/.github/workflows/regenerate-api-diff-otel.yml
@@ -0,0 +1,88 @@
+---
+name: Regenerate API Diff (OTel update)
+
+on:
+  push:
+    branches:
+      - "renovate/otel.instrumentation.version"
+
+permissions: {}
+
+jobs:
+  generate:
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read # checkout + read-only `git fetch origin main` for the verify step
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          ref: ${{ github.ref }}
+          persist-credentials: false
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
+        with:
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
+      - name: Cache local Maven repository
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Verify OTel instrumentation version was updated
+        run: |
+          git fetch origin main
+          DIFF_POM=$(git diff origin/main -- pom.xml)
+          if ! echo "$DIFF_POM" | grep -q 'otel.instrumentation.version'; then
+            echo "::error::otel.instrumentation.version not updated in pom.xml"
+            exit 1
+          fi
+      - name: Regenerate API diff
+        run: mise run api-diff
+      - name: Validate and export apidiff changes as a patch
+        run: |
+          UNEXPECTED=$(git diff --name-only | grep -v '^docs/apidiffs/' || true)
+          if [[ -n "$UNEXPECTED" ]]; then
+            echo "::error::Unexpected files changed:"
+            echo "$UNEXPECTED"
+            exit 1
+          fi
+          git diff --binary -- docs/apidiffs > /tmp/apidiffs.patch
+      - name: Upload generated patch
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: apidiffs-patch
+          path: /tmp/apidiffs.patch
+          retention-days: 5
+
+  publish:
+    runs-on: ubuntu-24.04
+    needs: generate
+    permissions:
+      contents: write # push regenerated apidiffs back to the renovate branch
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          ref: ${{ github.ref }}
+          # zizmor: ignore[artipacked] -- needs credentials to push
+          persist-credentials: true
+      - name: Download generated patch
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: apidiffs-patch
+          path: /tmp/patch
+      - name: Commit and push regenerated apidiffs
+        run: |
+          PATCH=/tmp/patch/apidiffs.patch
+          if [[ ! -s "$PATCH" ]]; then
+            echo "No apidiff changes to commit"
+            exit 0
+          fi
+          git apply "$PATCH"
+          # Note: GITHUB_TOKEN pushes don't trigger CI re-runs.
+          # Close and reopen the PR to trigger CI after this commit.
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add docs/apidiffs
+          git commit -m "chore: regenerate api diff"
+          git push
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
new file mode 100644
index 000000000..9e2b1cf62
--- /dev/null
+++ b/.github/workflows/release-please.yml
@@ -0,0 +1,35 @@
+---
+name: Release Please
+
+on:
+  push:
+    branches:
+      - main
+
+permissions: {}
+
+jobs:
+  release-please:
+    if: ${{ github.repository == 'prometheus/client_java' }}
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write # release-please creates release commits, tags, and the GitHub release
+      pull-requests: write # release-please opens/updates the release PR
+      issues: write # release-please comments on/labels issues included in the release
+      actions: write # required to trigger release.yml via `gh workflow run`
+    steps:
+      - uses: googleapis/release-please-action@45996ed1f6d02564a971a2fa1b5860e934307cf7 # v5.0
+        id: release-please
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config-file: .github/config/release-please-config.json
+          manifest-file: .github/config/.release-please-manifest.json
+
+      - name: Trigger deploy to Maven Central
+        if: ${{ steps.release-please.outputs.releases_created == 'true' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG_NAME: ${{ steps.release-please.outputs.tag_name }}
+        run: >
+          gh workflow run release.yml --repo "${GITHUB_REPOSITORY}"
+          -f "tag=${TAG_NAME}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 84492d0c2..6a8335014 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,41 +2,87 @@
 name: Deploy to Maven Central
 
 on:
-  push:
-    tags:
-      - "v*.*.*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Release tag to deploy (e.g. v1.5.1)"
+        required: true
+
+permissions: {}
 
 jobs:
   deploy:
     if: ${{ github.repository == 'prometheus/client_java' }}
+    environment: release
     runs-on: ubuntu-24.04
-    permissions: {}
+    env:
+      # Artifact releases pair a focused tool allowlist with cache: false.
+      MISE_ENABLE_TOOLS: java
+    permissions:
+      actions: write # required to trigger bump-api-diff-baseline.yml via `gh workflow run`
 
     steps:
-      - name: Debug gpg key
+      - name: Verify release secrets
         env:
+          MAVEN_USERNAME: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_USERNAME }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_PASSWORD }}
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+          GPG_SIGNING_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }}
         run: |
-          echo "${#GPG_SIGNING_KEY}"
-          echo "${GPG_SIGNING_KEY}" | gpg --batch --import-options import-show --import
+          fail() {
+            echo "::error::$1"
+            echo "::error::Fix: see '$2' in RELEASING.md"
+            exit 1
+          }
+
+          # Sonatype token
+          response=$(curl -s -u "${MAVEN_USERNAME}:${MAVEN_CENTRAL_TOKEN}" \
+            "https://central.sonatype.com/api/v1/publisher/status?id=test")
+          echo "Sonatype response: ${response}"
+          if echo "${response}" | grep -q "Invalid token"; then
+            fail "Sonatype Central token is invalid." \
+              "If the Sonatype Central Token is Invalid"
+          fi
+
+          # GPG key import
+          if ! echo "${GPG_SIGNING_KEY}" | gpg --batch --import 2>&1 | \
+              tee /tmp/gpg-import.log | grep -q "secret key imported\|secret keys read"; then
+            cat /tmp/gpg-import.log
+            fail "GPG_SIGNING_KEY did not import a secret key." \
+              "If the GPG Key Expired"
+          fi
+
+          # GPG passphrase
+          key_id=$(gpg --list-secret-keys --with-colons | \
+            awk -F: '/^sec:/ { print $5; exit }')
+          if [ -z "${key_id}" ]; then
+            fail "No secret key available after import." \
+              "If the GPG Key Expired"
+          fi
+          if ! echo "test" | gpg --batch --pinentry-mode loopback \
+              --passphrase "${GPG_SIGNING_PASSPHRASE}" \
+              -u "${key_id}" --clearsign >/dev/null 2>/tmp/gpg-sign.log; then
+            cat /tmp/gpg-sign.log
+            fail "GPG_SIGNING_PASSPHRASE does not match GPG_SIGNING_KEY." \
+              "If the GPG Key Expired"
+          fi
       - name: Checkout Plugin Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
+          ref: ${{ inputs.tag }}
           persist-credentials: false
 
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
         with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
           cache: false
 
       - name: Build release version
         run: mise run build-release
-        env:
-          TAG: ${{ github.ref_name }}
 
       - name: Set up Apache Maven Central
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: "temurin"
           java-version: "21"
@@ -52,3 +98,11 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_USERNAME }}
           MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_REPOSITORY_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSPHRASE }}
+
+      - name: Bump api-diff baseline
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: ${{ inputs.tag }}
+        run: >
+          gh workflow run bump-api-diff-baseline.yml
+          --repo "${GITHUB_REPOSITORY}" -f "tag=${TAG}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 000000000..290d3c9da
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,46 @@
+---
+name: OSSF Scorecard
+
+on:
+  push:
+    branches: [main]
+  schedule:
+    - cron: "43 6 * * 5" # Weekly Friday 06:43 UTC
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-24.04
+    # Prevents fork runs from failing due to missing write permissions or secrets.
+    if: ${{ github.repository == 'prometheus/client_java' }}
+    permissions:
+      contents: read
+      security-events: write # required to upload SARIF results
+      id-token: write # required by scorecard-action for OIDC token
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
+
+      - name: Run OSSF Scorecard analysis
+        uses: ossf/scorecard-action@2d1146689b8cda280b9bc96326124645441f03bc # v2.4.4
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      - name: Upload to code scanning
+        uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
+        with:
+          sarif_file: results.sarif
diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
deleted file mode 100644
index 1c7c56541..000000000
--- a/.github/workflows/super-linter.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Lint
-
-on: [pull_request]
-
-jobs:
-  lint:
-    runs-on: ubuntu-24.04
-
-    permissions:
-      contents: read
-      packages: read
-      # To report GitHub Actions status checks
-      statuses: write
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-          fetch-depth: 0
-
-      - name: Load super-linter configuration
-        run: grep -v '^#' .github/super-linter.env | grep -v 'FIX_' >> "$GITHUB_ENV"
-
-      - name: Super-linter
-        uses: super-linter/super-linter@2bdd90ed3262e023ac84bf8fe35dc480721fc1f2 # v8.2.1
-        env:
-          # To report GitHub Actions status checks
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-release-build.yml b/.github/workflows/test-release-build.yml
index 8bb7a7fec..f5914a1aa 100644
--- a/.github/workflows/test-release-build.yml
+++ b/.github/workflows/test-release-build.yml
@@ -13,22 +13,23 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
         with:
           persist-credentials: false
-      - uses: jdx/mise-action@be3be2260bc02bc3fbf94c5e2fed8b7964baf074 # v3.4.0
+          fetch-tags: "true"
+          fetch-depth: 0
+      - uses: jdx/mise-action@3c2e0cf82a5b2e5249f0d3635a4d83d0ae861518 # v4.2.5
         with:
-          version: v2025.11.3
-          sha256: 2b01d2063ac9fb6988ed5bfa087bebfba4ae6300b0739231bb534924acd31306
+          version: v2026.8.6
+          sha256: 96f6f1f416d868b78addd22746eefc7f4bf7820c6a3afa392a9f653f708c1644
       - name: Cache local Maven repository
-        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+      - name: Build GitHub Pages
+        run: mise run build-gh-pages
+        env:
+          BASE_URL: "/client_java"
       - name: Build release version
         run: mise run build-release
-        env:
-          # don't use the current snapshot version, to test a more realistic release
-          TAG: ${{ github.run_number }}
diff --git a/.gitignore b/.gitignore
index b727017a9..b98fa5703 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,9 @@ dependency-reduced-pom.xml
 **/.settings/
 docs/public
 .lycheecache
+
+benchmark-results/
+benchmark-results.json
+benchmark-output.log
+
+*.DS_Store
\ No newline at end of file
diff --git a/.gitleaksignore b/.gitleaksignore
deleted file mode 100644
index 605fefa97..000000000
--- a/.gitleaksignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/tmp/lint/integration-tests/it-pushgateway/src/test/resources/pushgateway-ssl.yaml:private-key:36
-/github/workspace/integration-tests/it-pushgateway/src/test/resources/pushgateway-ssl.yaml:private-key:36
diff --git a/.mise/envs/jmx-exporter/mise.lock b/.mise/envs/jmx-exporter/mise.lock
new file mode 100644
index 000000000..3a07b15c3
--- /dev/null
+++ b/.mise/envs/jmx-exporter/mise.lock
@@ -0,0 +1,33 @@
+# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
+
+[[tools.java]]
+version = "temurin-21.0.11+10.0.LTS"
+backend = "core:java"
+
+[tools.java."platforms.linux-arm64"]
+checksum = "sha256:8d498ec88e1c1989fab95c6784240ab92d011e29c54d20a3f9c324b13476f9ad"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.linux-arm64-musl"]
+checksum = "sha256:c8d63598d1dc0a656033515ed258bd6db37506a05407d9f65cd23b95c21027b5"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.linux-x64"]
+checksum = "sha256:4b2220e232a97997b436ca6ab15cbf70171ecff52958a46159dfa5a8c44ca4de"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.linux-x64-musl"]
+checksum = "sha256:38bfdcef1e4b45de2ec222047ac79c76bea75d4d7406a310e26cfa236763f05f"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.macos-arm64"]
+checksum = "sha256:6ebcf221c9b41507b14c098e93c6ead6440b8d9bd154f8ec666c4c73abbdb201"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.macos-x64"]
+checksum = "sha256:34180eb03e6d207c388cce3da668f6cc7cd7508c185c24782fadac2c9c0e66f9"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_mac_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.windows-x64"]
+checksum = "sha256:d3625e7cadf23787ea540229544b6e2ab494b3b54da1801879e583e1dfee0a64"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_windows_hotspot_21.0.11_10.zip"
diff --git a/.mise/envs/jmx-exporter/mise.toml b/.mise/envs/jmx-exporter/mise.toml
new file mode 100644
index 000000000..a04b4948c
--- /dev/null
+++ b/.mise/envs/jmx-exporter/mise.toml
@@ -0,0 +1,10 @@
+# The pinned JMX Exporter release does not build on the primary JDK (Java 25):
+# its spotless google-java-format predates JDK 25 support. Build it under an LTS
+# JDK the release supports instead.
+[tools]
+java = "temurin-21.0.11+10.0.LTS"
+
+[tasks.compat-test]
+description = "Run JMX Exporter compatibility tests under a supported JDK"
+dir = "../../.."
+run = "python3 .mise/tasks/jmx-exporter/test.py"
diff --git a/.mise/envs/micrometer/mise.lock b/.mise/envs/micrometer/mise.lock
new file mode 100644
index 000000000..3a07b15c3
--- /dev/null
+++ b/.mise/envs/micrometer/mise.lock
@@ -0,0 +1,33 @@
+# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
+
+[[tools.java]]
+version = "temurin-21.0.11+10.0.LTS"
+backend = "core:java"
+
+[tools.java."platforms.linux-arm64"]
+checksum = "sha256:8d498ec88e1c1989fab95c6784240ab92d011e29c54d20a3f9c324b13476f9ad"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.linux-arm64-musl"]
+checksum = "sha256:c8d63598d1dc0a656033515ed258bd6db37506a05407d9f65cd23b95c21027b5"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.linux-x64"]
+checksum = "sha256:4b2220e232a97997b436ca6ab15cbf70171ecff52958a46159dfa5a8c44ca4de"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.linux-x64-musl"]
+checksum = "sha256:38bfdcef1e4b45de2ec222047ac79c76bea75d4d7406a310e26cfa236763f05f"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.macos-arm64"]
+checksum = "sha256:6ebcf221c9b41507b14c098e93c6ead6440b8d9bd154f8ec666c4c73abbdb201"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_aarch64_mac_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.macos-x64"]
+checksum = "sha256:34180eb03e6d207c388cce3da668f6cc7cd7508c185c24782fadac2c9c0e66f9"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_mac_hotspot_21.0.11_10.tar.gz"
+
+[tools.java."platforms.windows-x64"]
+checksum = "sha256:d3625e7cadf23787ea540229544b6e2ab494b3b54da1801879e583e1dfee0a64"
+url = "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_windows_hotspot_21.0.11_10.zip"
diff --git a/.mise/envs/micrometer/mise.toml b/.mise/envs/micrometer/mise.toml
new file mode 100644
index 000000000..e5318c1d6
--- /dev/null
+++ b/.mise/envs/micrometer/mise.toml
@@ -0,0 +1,10 @@
+# The pinned Micrometer release does not build on the primary JDK (Java 25):
+# its bundled Kotlin compiler predates JDK 25 support. Build it under an LTS JDK
+# the release supports instead.
+[tools]
+java = "temurin-21.0.11+10.0.LTS"
+
+[tasks.compat-test]
+description = "Run Micrometer compatibility tests under a supported JDK"
+dir = "../../.."
+run = "python3 .mise/tasks/micrometer/test.py"
diff --git a/.mise/envs/native/mise.lock b/.mise/envs/native/mise.lock
new file mode 100644
index 000000000..87f54de47
--- /dev/null
+++ b/.mise/envs/native/mise.lock
@@ -0,0 +1,25 @@
+# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
+
+[[tools.java]]
+version = "oracle-graalvm-25.0.1"
+backend = "core:java"
+
+[tools.java."platforms.linux-arm64"]
+checksum = "sha256:edd77565c76570a6df5f38e53d54524102f2c1b1cf74eebd9f51e7fc19f667cd"
+url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_linux-aarch64_bin.tar.gz"
+
+[tools.java."platforms.linux-x64"]
+checksum = "sha256:d4ab02ba1029e639f03374fdf91c242e1d0d49079880e1af1932ea7b7c431837"
+url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_linux-x64_bin.tar.gz"
+
+[tools.java."platforms.macos-arm64"]
+checksum = "sha256:19dfd49ad112e6e6c2bdedc507c6859bf21294fa4c164f1be670d469c65b7993"
+url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_macos-aarch64_bin.tar.gz"
+
+[tools.java."platforms.macos-x64"]
+checksum = "sha256:a762ca1d9a163e32790b9286f3af4c16369729ff27999d8dbab60d7be16cff2f"
+url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_macos-x64_bin.tar.gz"
+
+[tools.java."platforms.windows-x64"]
+checksum = "sha256:5398592ecdf8f47f4b481896e1e63cbfff4cb8e0ba61538526e3b3795b1a85e5"
+url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_windows-x64_bin.zip"
diff --git a/.mise/envs/native/mise.toml b/.mise/envs/native/mise.toml
new file mode 100644
index 000000000..b64367044
--- /dev/null
+++ b/.mise/envs/native/mise.toml
@@ -0,0 +1,10 @@
+[tools]
+java = "oracle-graalvm-25.0.1"
+
+[tasks.native-test]
+depends = "//:build"
+# Native Test uses Surefire, so explicitly select the Failsafe-named test class.
+run = '''
+cd "$MISE_MONOREPO_ROOT/integration-tests/it-spring-boot-smoke-test"
+"$MISE_MONOREPO_ROOT/mvnw" test -PnativeTest -Dtest=ApplicationIT
+'''
diff --git a/.mise/lib/jmx_exporter_compat.py b/.mise/lib/jmx_exporter_compat.py
new file mode 100755
index 000000000..dd364e064
--- /dev/null
+++ b/.mise/lib/jmx_exporter_compat.py
@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+
+from __future__ import annotations
+
+import os
+import re
+import subprocess
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+DEFAULT_JMX_EXPORTER_DIR = Path(
+    os.environ.get("JMX_EXPORTER_DIR", "/tmp/jmx-exporter-compat")
+)
+DEFAULT_JMX_EXPORTER_REPOSITORY = os.environ.get(
+    "JMX_EXPORTER_REPOSITORY", "prometheus/jmx_exporter"
+)
+DEFAULT_JMX_EXPORTER_REMOTE = os.environ.get("JMX_EXPORTER_REMOTE", "origin")
+DEFAULT_JMX_EXPORTER_REF = (
+    os.environ.get("JMX_EXPORTER_REF")
+    or os.environ.get("DEFAULT_JMX_EXPORTER_VERSION")
+    or "main"
+)
+DEFAULT_PROM_VERSION = os.environ.get("PROM_VERSION")
+
+# Quick test configuration: the integration_test_suite runs one matrix cell
+# (single Java + Prometheus distribution) instead of the full smoke-test matrix.
+# The distributions are read from the checked-out jmx_exporter's run-quick-test.sh
+# so they stay aligned with upstream rather than drifting from a hardcoded copy.
+QUICK_TEST_SCRIPT = "run-quick-test.sh"
+QUICK_TEST_IMAGE_VARS = ("JAVA_DOCKER_IMAGES", "PROMETHEUS_DOCKER_IMAGES")
+
+
+def run_cmd(
+    cmd: list[str],
+    cwd: Path | None = None,
+    env: dict[str, str] | None = None,
+) -> None:
+    subprocess.run(cmd, cwd=cwd, check=True, env=env)
+
+
+def jmx_exporter_repository_url(repository: str) -> str:
+    return f"https://github.com/{repository}.git"
+
+
+def check_clean_worktree(jmx_exporter_dir: Path) -> None:
+    result = subprocess.run(
+        ["git", "status", "--short"],
+        cwd=jmx_exporter_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    if result.stdout.strip():
+        raise RuntimeError(
+            f"{jmx_exporter_dir} has uncommitted changes; use a clean clone or set "
+            "JMX_EXPORTER_DIR"
+        )
+
+
+def get_prom_version(root_dir: Path | None = None) -> str:
+    configured_version = DEFAULT_PROM_VERSION
+    if configured_version:
+        return configured_version
+    if root_dir is None:
+        root_dir = Path.cwd()
+    pom = ET.parse(root_dir / "pom.xml")
+    root = pom.getroot()
+    version = root.findtext("./{*}version")
+    if not version:
+        version = root.findtext("./{*}parent/{*}version")
+    if not version:
+        raise RuntimeError("could not determine Prometheus version from pom.xml")
+    return version
+
+
+def prepare_repo(
+    jmx_exporter_dir: Path = DEFAULT_JMX_EXPORTER_DIR,
+    repository: str = DEFAULT_JMX_EXPORTER_REPOSITORY,
+    remote: str = DEFAULT_JMX_EXPORTER_REMOTE,
+    ref: str = DEFAULT_JMX_EXPORTER_REF,
+) -> None:
+    repository_url = jmx_exporter_repository_url(repository)
+    if (jmx_exporter_dir / ".git").is_dir():
+        check_clean_worktree(jmx_exporter_dir)
+        run_cmd(
+            ["git", "remote", "set-url", remote, repository_url],
+            cwd=jmx_exporter_dir,
+        )
+        run_cmd(["git", "fetch", remote, ref], cwd=jmx_exporter_dir)
+    else:
+        run_cmd(["git", "clone", repository_url, str(jmx_exporter_dir)])
+        run_cmd(["git", "fetch", remote, ref], cwd=jmx_exporter_dir)
+    run_cmd(
+        ["git", "checkout", "-B", "jmx-exporter-compat", "FETCH_HEAD"],
+        cwd=jmx_exporter_dir,
+    )
+
+
+def install_local_artifacts(root_dir: Path | None = None) -> None:
+    if root_dir is None:
+        root_dir = Path.cwd()
+    run_cmd(
+        [
+            "./mvnw",
+            "install",
+            # Skip test compilation too (not just execution): downstream needs only
+            # our main artifacts, and our test sources target a newer release than
+            # the compatibility JDK supports.
+            "-Dmaven.test.skip=true",
+            # Deactivate the activeByDefault profiles that add test-only
+            # dependencies (incl. a test-jar). With maven.test.skip those are not
+            # built, so leaving the profile active breaks dependency resolution.
+            # Same approach the release task uses (-P 'release,!default').
+            "-P",
+            "!default",
+            "-Dcoverage.skip=true",
+            "-Dcheckstyle.skip=true",
+            "-Dwarnings=-nowarn",
+        ],
+        cwd=root_dir,
+    )
+
+
+def quick_test_images(
+    jmx_exporter_dir: Path = DEFAULT_JMX_EXPORTER_DIR,
+) -> dict[str, str]:
+    """Read the quick test docker image pins from the checked-out jmx_exporter's
+    run-quick-test.sh. An explicit env var overrides the script value."""
+    script_path = jmx_exporter_dir / QUICK_TEST_SCRIPT
+    script = script_path.read_text()
+    images: dict[str, str] = {}
+    for var in QUICK_TEST_IMAGE_VARS:
+        override = os.environ.get(var)
+        if override:
+            images[var] = override
+            continue
+        match = re.search(rf'^\s*export\s+{var}="([^"]+)"', script, re.MULTILINE)
+        if not match:
+            raise RuntimeError(f"could not find {var} in {script_path}")
+        images[var] = match.group(1)
+    return images
+
+
+def run_maven_test(
+    jmx_exporter_dir: Path = DEFAULT_JMX_EXPORTER_DIR,
+    prom_version: str | None = None,
+) -> None:
+    if prom_version is None:
+        prom_version = get_prom_version()
+    # Build the full reactor (including the integration_test_suite) the same way
+    # run-quick-test.sh does, but against our locally installed io.prometheus
+    # artifacts. The pinned distribution env vars keep this to the quick (single
+    # cell) matrix rather than the full smoke-test matrix.
+    env = {**os.environ, **quick_test_images(jmx_exporter_dir)}
+    cmd = [
+        "./mvnw",
+        "-B",
+        "clean",
+        "install",
+        f"-Dprometheus.metrics.version={prom_version}",
+        f"-Dparamixel.parallelism={os.cpu_count() or 1}",
+        "-Djacoco.skip=true",
+    ]
+    run_cmd(cmd, cwd=jmx_exporter_dir, env=env)
diff --git a/.mise/lib/micrometer_compat.py b/.mise/lib/micrometer_compat.py
new file mode 100755
index 000000000..b1c50d49f
--- /dev/null
+++ b/.mise/lib/micrometer_compat.py
@@ -0,0 +1,162 @@
+#!/usr/bin/env python3
+
+from __future__ import annotations
+
+import os
+import subprocess
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+DEFAULT_MICROMETER_DIR = Path(
+    os.environ.get("MICROMETER_DIR", "/tmp/micrometer-compat")
+)
+DEFAULT_MICROMETER_REPOSITORY = os.environ.get(
+    "MICROMETER_REPOSITORY", "micrometer-metrics/micrometer"
+)
+DEFAULT_MICROMETER_REMOTE = os.environ.get("MICROMETER_REMOTE", "origin")
+DEFAULT_MICROMETER_REF = (
+    os.environ.get("MICROMETER_REF")
+    or os.environ.get("DEFAULT_MICROMETER_VERSION")
+    or "main"
+)
+DEFAULT_INIT_SCRIPT = Path(
+    os.environ.get("MICROMETER_INIT_SCRIPT", "/tmp/micrometer-prom-local.init.gradle")
+)
+DEFAULT_PROM_VERSION = os.environ.get("PROM_VERSION")
+
+
+def run_cmd(cmd: list[str], cwd: Path | None = None) -> None:
+    subprocess.run(cmd, cwd=cwd, check=True)
+
+
+def micrometer_repository_url(repository: str) -> str:
+    return f"https://github.com/{repository}.git"
+
+
+def check_clean_worktree(micrometer_dir: Path) -> None:
+    result = subprocess.run(
+        ["git", "status", "--short"],
+        cwd=micrometer_dir,
+        check=True,
+        capture_output=True,
+        text=True,
+    )
+    if result.stdout.strip():
+        raise RuntimeError(
+            f"{micrometer_dir} has uncommitted changes; use a clean clone or set MICROMETER_DIR"
+        )
+
+
+def get_prom_version(root_dir: Path | None = None) -> str:
+    configured_version = DEFAULT_PROM_VERSION
+    if configured_version:
+        return configured_version
+    if root_dir is None:
+        root_dir = Path.cwd()
+    pom = ET.parse(root_dir / "pom.xml")
+    root = pom.getroot()
+    version = root.findtext("./{*}version")
+    if not version:
+        version = root.findtext("./{*}parent/{*}version")
+    if not version:
+        raise RuntimeError("could not determine Prometheus version from pom.xml")
+    return version
+
+
+def write_init_script(
+    init_script: Path = DEFAULT_INIT_SCRIPT, prom_version: str | None = None
+) -> None:
+    if prom_version is None:
+        prom_version = get_prom_version()
+    init_script.write_text(
+        f"""allprojects {{
+    repositories {{
+        mavenLocal()
+        mavenCentral()
+        gradlePluginPortal()
+    }}
+    configurations.configureEach {{
+        resolutionStrategy.eachDependency {{ details ->
+            if (details.requested.group == 'io.prometheus') {{
+                details.useVersion('{prom_version}')
+                details.because(
+                    'Use local prom_client_java artifacts for downstream compatibility testing'
+                )
+            }}
+        }}
+    }}
+}}
+""",
+        encoding="utf-8",
+    )
+
+
+def prepare_repo(
+    micrometer_dir: Path = DEFAULT_MICROMETER_DIR,
+    repository: str = DEFAULT_MICROMETER_REPOSITORY,
+    remote: str = DEFAULT_MICROMETER_REMOTE,
+    ref: str = DEFAULT_MICROMETER_REF,
+) -> None:
+    repository_url = micrometer_repository_url(repository)
+    if (micrometer_dir / ".git").is_dir():
+        check_clean_worktree(micrometer_dir)
+        run_cmd(
+            ["git", "remote", "set-url", remote, repository_url], cwd=micrometer_dir
+        )
+        run_cmd(["git", "fetch", remote, ref], cwd=micrometer_dir)
+    else:
+        run_cmd(
+            [
+                "git",
+                "clone",
+                repository_url,
+                str(micrometer_dir),
+            ]
+        )
+        run_cmd(["git", "fetch", remote, ref], cwd=micrometer_dir)
+    run_cmd(
+        ["git", "checkout", "-B", "micrometer-compat", "FETCH_HEAD"],
+        cwd=micrometer_dir,
+    )
+
+
+def install_local_artifacts(root_dir: Path | None = None) -> None:
+    if root_dir is None:
+        root_dir = Path.cwd()
+    run_cmd(
+        [
+            "./mvnw",
+            "install",
+            # Skip test compilation too (not just execution): downstream needs only
+            # our main artifacts, and our test sources target a newer release than
+            # the compatibility JDK supports.
+            "-Dmaven.test.skip=true",
+            # Deactivate the activeByDefault profiles that add test-only
+            # dependencies (incl. a test-jar). With maven.test.skip those are not
+            # built, so leaving the profile active breaks dependency resolution.
+            # Same approach the release task uses (-P 'release,!default').
+            "-P",
+            "!default",
+            "-Dcoverage.skip=true",
+            "-Dcheckstyle.skip=true",
+            "-Dwarnings=-nowarn",
+        ],
+        cwd=root_dir,
+    )
+
+
+def run_gradle_test(
+    test_selector: str | None = None,
+    micrometer_dir: Path = DEFAULT_MICROMETER_DIR,
+    init_script: Path = DEFAULT_INIT_SCRIPT,
+) -> None:
+    cmd = [
+        "./gradlew",
+        "--no-daemon",
+        "-I",
+        str(init_script),
+        ":micrometer-registry-prometheus:test",
+    ]
+    if test_selector:
+        cmd.extend(["--tests", test_selector])
+    run_cmd(cmd, cwd=micrometer_dir)
diff --git a/.mise/tasks/build-release.sh b/.mise/tasks/build-release.sh
index a29b0d22f..620dca77a 100755
--- a/.mise/tasks/build-release.sh
+++ b/.mise/tasks/build-release.sh
@@ -1,12 +1,8 @@
 #!/usr/bin/env bash
 
 #MISE description="Build release package"
-#USAGE arg "<tag>" env="TAG" default="1.5.0-SNAPSHOT"
 
 set -euo pipefail
 
-# shellcheck disable=SC2154 # is set by mise
-VERSION=${usage_tag#v}
-
-mise run set-version "$VERSION"
-mvn -B package -P 'release,!default' -Dmaven.test.skip=true
+mvn -B package -P 'release,!default,!examples-and-integration-tests' \
+	-Dmaven.test.skip=true -Dgpg.skip=true
diff --git a/.mise/tasks/generate_benchmark_summary.py b/.mise/tasks/generate_benchmark_summary.py
new file mode 100755
index 000000000..0da622bcb
--- /dev/null
+++ b/.mise/tasks/generate_benchmark_summary.py
@@ -0,0 +1,780 @@
+#!/usr/bin/env python3
+
+# [MISE] description="Generate markdown summary from JMH benchmark JSON results"
+# [MISE] alias="generate-benchmark-summary"
+
+"""
+Generate a markdown summary from JMH benchmark JSON results.
+
+Usage:
+    python3 .mise/tasks/generate_benchmark_summary.py \
+        [--input results.json] [--output-dir ./benchmark-results]
+
+This script:
+1. Reads JMH JSON output
+2. Generates a README.md with formatted tables
+3. Copies results to the output directory with historical naming
+"""
+
+import argparse
+import json
+import math
+import os
+import shutil
+import subprocess
+import sys
+from datetime import datetime, timezone
+from pathlib import Path
+
+PRACTICAL_CHANGE_THRESHOLD = 5.0
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description="Generate benchmark summary from JMH JSON"
+    )
+    parser.add_argument(
+        "--input",
+        default="benchmark-results.json",
+        help="Path to JMH JSON results file (default: benchmark-results.json)",
+    )
+    parser.add_argument(
+        "--output-dir",
+        default="benchmark-results",
+        help="Output directory for results (default: benchmark-results)",
+    )
+    parser.add_argument(
+        "--commit-sha",
+        default=None,
+        help="Git commit SHA (default: read from git or 'local')",
+    )
+    parser.add_argument(
+        "--baseline",
+        default=None,
+        help="Optional JMH JSON results file to compare against",
+    )
+    parser.add_argument(
+        "--baseline-sha",
+        default=None,
+        help="Baseline commit SHA (default: read from git or 'local')",
+    )
+    parser.add_argument(
+        "--baseline-repo",
+        default=None,
+        help="Baseline GitHub repository for commit links",
+    )
+    parser.add_argument(
+        "--comparison-note",
+        default=None,
+        help="Optional note to include in the benchmark comparison section",
+    )
+    parser.add_argument(
+        "--system-info",
+        default=None,
+        help="Optional JSON file with system info for the measured run",
+    )
+    parser.add_argument(
+        "--baseline-system-info",
+        default=None,
+        help="Optional JSON file with system info for the baseline run",
+    )
+    parser.add_argument(
+        "--write-system-info",
+        default=None,
+        help="Write current system info to this JSON file and exit",
+    )
+    return parser.parse_args()
+
+
+def get_system_info() -> dict[str, str]:
+    """Capture system hardware information."""
+    import multiprocessing
+    import platform
+
+    info = {}
+
+    try:
+        info["cpu_cores"] = str(multiprocessing.cpu_count())
+    except NotImplementedError:
+        pass
+
+    try:
+        with open("/proc/cpuinfo", "r") as f:
+            for line in f:
+                if line.startswith("model name"):
+                    info["cpu_model"] = line.split(":")[1].strip()
+                    break
+    except FileNotFoundError:
+        # macOS
+        try:
+            result = subprocess.run(
+                ["sysctl", "-n", "machdep.cpu.brand_string"],
+                capture_output=True,
+                check=False,
+                text=True,
+                timeout=5,
+            )
+            if result.returncode == 0:
+                info["cpu_model"] = result.stdout.strip()
+        except (OSError, subprocess.SubprocessError):
+            pass
+
+    try:
+        with open("/proc/meminfo", "r") as f:
+            for line in f:
+                if line.startswith("MemTotal"):
+                    kb = int(line.split()[1])
+                    info["memory_gb"] = str(round(kb / 1024 / 1024))
+                    break
+    except FileNotFoundError:
+        # macOS
+        try:
+            result = subprocess.run(
+                ["sysctl", "-n", "hw.memsize"],
+                capture_output=True,
+                check=False,
+                text=True,
+                timeout=5,
+            )
+            if result.returncode == 0:
+                bytes_mem = int(result.stdout.strip())
+                info["memory_gb"] = str(round(bytes_mem / 1024 / 1024 / 1024))
+        except (OSError, ValueError, subprocess.SubprocessError):
+            pass
+
+    info["os"] = f"{platform.system()} {platform.release()}"
+
+    return info
+
+
+def read_system_info(path: str | None) -> dict[str, str]:
+    """Read system info from JSON, or capture it from the current host."""
+    if not path:
+        return get_system_info()
+    with open(path, "r") as f:
+        return json.load(f)
+
+
+def write_system_info(path: str) -> None:
+    """Write current system info to JSON."""
+    output_path = Path(path)
+    output_path.parent.mkdir(parents=True, exist_ok=True)
+    with open(output_path, "w") as f:
+        json.dump(get_system_info(), f, indent=2, sort_keys=True)
+        f.write("\n")
+
+
+def format_system_info(sysinfo: dict[str, str] | None) -> str:
+    """Format captured system info for markdown."""
+    if not sysinfo:
+        return "unknown"
+    parts = []
+    if sysinfo.get("cpu_model"):
+        parts.append(sysinfo["cpu_model"])
+    if sysinfo.get("cpu_cores"):
+        parts.append(f"{sysinfo['cpu_cores']} cores")
+    if sysinfo.get("memory_gb"):
+        parts.append(f"{sysinfo['memory_gb']} GB RAM")
+    if sysinfo.get("os"):
+        parts.append(sysinfo["os"])
+    return ", ".join(parts) if parts else "unknown"
+
+
+def get_commit_sha(provided_sha: str | None) -> str:
+    """Get commit SHA from argument, git, or return 'local'."""
+    if provided_sha:
+        return provided_sha
+
+    try:
+        result = subprocess.run(
+            ["git", "rev-parse", "HEAD"],
+            capture_output=True,
+            check=False,
+            text=True,
+            timeout=5,
+        )
+        if result.returncode == 0:
+            return result.stdout.strip()
+    except (OSError, subprocess.SubprocessError):
+        pass
+
+    return "local"
+
+
+def format_score(score) -> str:
+    """Format score with appropriate precision."""
+    if score is None:
+        return ""
+    try:
+        val = float(score)
+        if val >= 1_000_000:
+            return f"{val / 1_000_000:.2f}M"
+        elif val >= 1_000:
+            return f"{val / 1_000:.2f}K"
+        else:
+            return f"{val:.2f}"
+    except (ValueError, TypeError):
+        return str(score)
+
+
+def format_error(error) -> str:
+    """Format error value, handling NaN."""
+    try:
+        error_val = float(error)
+        if math.isnan(error_val):
+            return ""
+        elif error_val >= 1_000:
+            return f"± {error_val / 1_000:.2f}K"
+        else:
+            return f"± {error_val:.2f}"
+    except (ValueError, TypeError):
+        return ""
+
+
+def format_commit_link(commit_sha: str, repo: str) -> str:
+    """Format a commit SHA as a GitHub markdown link."""
+    commit_short = commit_sha[:7]
+    if commit_sha != "local":
+        return f"[`{commit_short}`](https://github.com/{repo}/commit/{commit_sha})"
+    return f"`{commit_short}` (local run)"
+
+
+def short_benchmark_name(name: str) -> str:
+    """Remove the common benchmark package prefix."""
+    return name.replace("io.prometheus.metrics.benchmarks.", "")
+
+
+def metric_score(result: dict) -> float | None:
+    """Extract a benchmark score as a finite float."""
+    try:
+        score = float(result.get("primaryMetric", {}).get("score"))
+        if math.isfinite(score):
+            return score
+    except (ValueError, TypeError):
+        pass
+    return None
+
+
+def score_interval(result: dict) -> tuple[float, float] | None:
+    """Extract the JMH confidence interval for a benchmark result."""
+    metric = result.get("primaryMetric", {})
+    confidence = metric.get("scoreConfidence")
+    if isinstance(confidence, list) and len(confidence) == 2:
+        try:
+            low = float(confidence[0])
+            high = float(confidence[1])
+            if math.isfinite(low) and math.isfinite(high):
+                return min(low, high), max(low, high)
+        except (ValueError, TypeError):
+            pass
+
+    score = metric_score(result)
+    if score is None:
+        return None
+    try:
+        error = float(metric.get("scoreError"))
+        if math.isfinite(error) and error >= 0:
+            return score - error, score + error
+    except (ValueError, TypeError):
+        pass
+    return None
+
+
+def lower_is_better(result: dict) -> bool:
+    """Return true for JMH modes where lower score is better."""
+    mode = str(result.get("mode", ""))
+    unit = str(result.get("primaryMetric", {}).get("scoreUnit", ""))
+    return mode in {"avgt", "sample", "ss"} or unit.endswith("/op")
+
+
+def normalize_jvm_args(value) -> list:
+    """Normalize optional JMH JVM argument fields for metadata comparison."""
+    if value is None:
+        return []
+    if isinstance(value, list):
+        return value
+    return [value]
+
+
+def benchmark_metadata(result: dict) -> dict:
+    """Return metadata that must match for a base/head comparison."""
+    primary_metric = result.get("primaryMetric", {})
+    return {
+        "jmhVersion": result.get("jmhVersion"),
+        "mode": result.get("mode"),
+        "vmName": result.get("vmName"),
+        "vmVersion": result.get("vmVersion"),
+        "jvmArgs": normalize_jvm_args(result.get("jvmArgs")),
+        "jvmArgsPrepend": normalize_jvm_args(result.get("jvmArgsPrepend")),
+        "jvmArgsAppend": normalize_jvm_args(result.get("jvmArgsAppend")),
+        "threads": result.get("threads"),
+        "forks": result.get("forks"),
+        "warmupIterations": result.get("warmupIterations"),
+        "warmupTime": result.get("warmupTime"),
+        "warmupBatchSize": result.get("warmupBatchSize"),
+        "measurementIterations": result.get("measurementIterations"),
+        "measurementTime": result.get("measurementTime"),
+        "measurementBatchSize": result.get("measurementBatchSize"),
+        "jdkVersion": result.get("jdkVersion"),
+        "scoreUnit": primary_metric.get("scoreUnit"),
+        "params": result.get("params", {}),
+    }
+
+
+def comparable_metadata(head: dict, baseline: dict) -> bool:
+    """Return whether two results describe the same benchmark configuration."""
+    return benchmark_metadata(head) == benchmark_metadata(baseline)
+
+
+def comparison_status(head: dict, baseline: dict) -> str:
+    """Classify a benchmark comparison using confidence intervals and a threshold."""
+    head_interval = score_interval(head)
+    baseline_interval = score_interval(baseline)
+    head_score = metric_score(head)
+    baseline_score = metric_score(baseline)
+    if (
+        not comparable_metadata(head, baseline)
+        or head_score is None
+        or baseline_score is None
+    ):
+        return "inconclusive"
+
+    change = performance_change(head, baseline)
+    if change is None or head_interval is None or baseline_interval is None:
+        return "inconclusive"
+
+    head_low, head_high = head_interval
+    baseline_low, baseline_high = baseline_interval
+    intervals_overlap = head_low <= baseline_high and baseline_low <= head_high
+    if intervals_overlap or abs(change) < PRACTICAL_CHANGE_THRESHOLD:
+        return "within noise"
+
+    return "meaningful improvement" if change > 0 else "meaningful regression"
+
+
+def performance_change(head: dict, baseline: dict) -> float | None:
+    """Return percent performance change, with positive meaning faster."""
+    head_score = metric_score(head)
+    baseline_score = metric_score(baseline)
+    if (
+        head_score is None
+        or baseline_score is None
+        or head_score == 0
+        or baseline_score == 0
+    ):
+        return None
+    if lower_is_better(head):
+        return (float(baseline_score) / head_score - 1) * 100
+    return (head_score / float(baseline_score) - 1) * 100
+
+
+def format_change(change: float | None) -> str:
+    """Format a percent performance change."""
+    if change is None:
+        return ""
+    return f"{change:+.1f}%"
+
+
+def metric_direction_note(results: list) -> str:
+    """Describe whether scores represent throughput or latency."""
+    directions = {
+        "latency" if lower_is_better(result) else "throughput" for result in results
+    }
+    if directions == {"throughput"}:
+        return (
+            "Throughput scores are higher-is-better; positive Head vs base deltas "
+            "indicate faster performance."
+        )
+    if directions == {"latency"}:
+        return (
+            "Latency scores are lower-is-better; positive Head vs base deltas "
+            "indicate faster performance."
+        )
+    return (
+        "Throughput scores are higher-is-better and latency scores are "
+        "lower-is-better; positive Head vs base deltas indicate faster performance."
+    )
+
+
+def generate_comparison_section(
+    results: list,
+    baseline_results: list,
+    commit_sha: str,
+    baseline_sha: str,
+    repo: str,
+    baseline_repo: str,
+    comparison_note: str | None = None,
+    system_info: dict[str, str] | None = None,
+    baseline_system_info: dict[str, str] | None = None,
+) -> list[str]:
+    """Generate a base-vs-head benchmark comparison section."""
+    by_name = {b.get("benchmark", ""): b for b in results if b.get("benchmark")}
+    baseline_by_name = {
+        b.get("benchmark", ""): b for b in baseline_results if b.get("benchmark")
+    }
+    common_names = sorted(set(by_name) & set(baseline_by_name))
+
+    md = []
+    md.append("## Comparison with base")
+    md.append("")
+    md.append(f"- **Head:** {format_commit_link(commit_sha, repo)}")
+    md.append(f"- **Base:** {format_commit_link(baseline_sha, baseline_repo)}")
+    md.append(f"- **Metric direction:** {metric_direction_note(results)}")
+    if comparison_note:
+        md.append(f"- **Note:** {comparison_note}")
+    if baseline_system_info:
+        md.append(f"- **Head runner:** {format_system_info(system_info)}")
+        md.append(f"- **Base runner:** {format_system_info(baseline_system_info)}")
+        md.append(
+            "- **Note:** base and head run in parallel jobs, so runner "
+            "hardware can differ and affect results."
+        )
+    md.append("")
+
+    if not common_names:
+        md.append("_No matching benchmark names were found in the base results._")
+        md.append("")
+        return md
+
+    md.append("| Benchmark | PR | Base | Head vs base | Regression verdict |")
+    md.append("|:----------|---:|-----:|-------:|:-------|")
+
+    for name in common_names:
+        head = by_name[name]
+        baseline = baseline_by_name[name]
+        head_score = metric_score(head)
+        baseline_score = metric_score(baseline)
+        md.append(
+            "| "
+            f"{short_benchmark_name(name)} | "
+            f"{format_score(head_score)} | "
+            f"{format_score(baseline_score)} | "
+            f"{format_change(performance_change(head, baseline))} | "
+            f"{comparison_status(head, baseline)} |"
+        )
+
+    missing_in_base = sorted(set(by_name) - set(baseline_by_name))
+    missing_in_head = sorted(set(baseline_by_name) - set(by_name))
+    if missing_in_base or missing_in_head:
+        md.append("")
+        if missing_in_base:
+            missing = ", ".join(short_benchmark_name(name) for name in missing_in_base)
+            md.append(
+                f"- Benchmarks only in PR results (listed separately below): {missing}"
+            )
+        if missing_in_head:
+            missing = ", ".join(short_benchmark_name(name) for name in missing_in_head)
+            md.append(f"- Benchmarks only in base results: {missing}")
+
+    md.append("")
+    return md
+
+
+def generate_markdown(
+    results: list,
+    commit_sha: str,
+    repo: str,
+    baseline_results: list | None = None,
+    baseline_sha: str | None = None,
+    baseline_repo: str | None = None,
+    comparison_note: str | None = None,
+    system_info: dict[str, str] | None = None,
+    baseline_system_info: dict[str, str] | None = None,
+) -> str:
+    """Generate markdown summary from JMH results."""
+    datetime_str = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
+
+    # Extract metadata from first result
+    first = results[0] if results else {}
+    jdk_version = first.get("jdkVersion", "unknown")
+    vm_name = first.get("vmName", "unknown")
+    threads = first.get("threads", "?")
+    forks = first.get("forks", "?")
+    warmup_iters = first.get("warmupIterations", "?")
+    measure_iters = first.get("measurementIterations", "?")
+
+    sysinfo = system_info or get_system_info()
+
+    md = []
+    md.append("# Prometheus Java Client Benchmarks")
+    md.append("")
+
+    md.append("## Run Information")
+    md.append("")
+    md.append(f"- **Date:** {datetime_str}")
+    md.append(f"- **Commit:** {format_commit_link(commit_sha, repo)}")
+    md.append(f"- **JDK:** {jdk_version} ({vm_name})")
+    bench_cfg = (
+        f"{forks} fork(s), {warmup_iters} warmup, "
+        f"{measure_iters} measurement, {threads} threads"
+    )
+    md.append(f"- **Benchmark config:** {bench_cfg}")
+
+    hw_parts = []
+    if sysinfo.get("cpu_model"):
+        hw_parts.append(sysinfo["cpu_model"])
+    if sysinfo.get("cpu_cores"):
+        hw_parts.append(f"{sysinfo['cpu_cores']} cores")
+    if sysinfo.get("memory_gb"):
+        hw_parts.append(f"{sysinfo['memory_gb']} GB RAM")
+    if hw_parts:
+        md.append(f"- **Hardware:** {', '.join(hw_parts)}")
+    if sysinfo.get("os"):
+        md.append(f"- **OS:** {sysinfo['os']}")
+
+    md.append("")
+
+    if baseline_results and baseline_sha and baseline_repo:
+        md.extend(
+            generate_comparison_section(
+                results,
+                baseline_results,
+                commit_sha,
+                baseline_sha,
+                repo,
+                baseline_repo,
+                comparison_note=comparison_note,
+                system_info=sysinfo,
+                baseline_system_info=baseline_system_info,
+            )
+        )
+
+    # A benchmark without a base counterpart cannot receive a regression verdict.
+    # Keep it out of the comparison-oriented head table and list it separately.
+    baseline_names = {
+        b.get("benchmark", "") for b in (baseline_results or []) if b.get("benchmark")
+    }
+    if baseline_results:
+        comparable_results = [
+            b for b in results if b.get("benchmark", "") in baseline_names
+        ]
+        head_only_results = [
+            b for b in results if b.get("benchmark", "") not in baseline_names
+        ]
+    else:
+        comparable_results = results
+        head_only_results = []
+
+    # Group by benchmark class
+    benchmarks_by_class: dict[str, list] = {}
+    for b in comparable_results:
+        name = b.get("benchmark", "")
+        parts = name.rsplit(".", 1)
+        if len(parts) == 2:
+            class_name, _method = parts
+            class_short = class_name.split(".")[-1]
+        else:
+            class_short = "Other"
+        benchmarks_by_class.setdefault(class_short, []).append(b)
+
+    md.append("## Results for PR head")
+    md.append("")
+
+    # Generate table for each class
+    for class_name in sorted(benchmarks_by_class.keys()):
+        benchmarks = benchmarks_by_class[class_name]
+        md.append(f"### {class_name}")
+        md.append("")
+
+        # Sort by score descending
+        sorted_benchmarks = sorted(
+            benchmarks,
+            key=lambda x: x.get("primaryMetric", {}).get("score", 0),
+            reverse=True,
+        )
+
+        md.append("| Benchmark | Score | Error | Units |")
+        md.append("|:----------|------:|------:|:------|")
+
+        for b in sorted_benchmarks:
+            name = b.get("benchmark", "").split(".")[-1]
+            score = b.get("primaryMetric", {}).get("score", 0)
+            error = b.get("primaryMetric", {}).get("scoreError", 0)
+            unit = b.get("primaryMetric", {}).get("scoreUnit", "ops/s")
+
+            score_fmt = format_score(score)
+            error_fmt = format_error(error)
+
+            md.append(f"| {name} | {score_fmt} | {error_fmt} | {unit} |")
+
+        md.append("")
+
+    if head_only_results:
+        md.append("## New benchmarks in PR head")
+        md.append("")
+        md.append(
+            "These benchmarks have no base counterpart; scores are descriptive only "
+            "and have no regression verdict."
+        )
+        md.append("")
+        md.append("| Benchmark | Score | Error | Units |")
+        md.append("|:----------|------:|------:|:------|")
+        for b in sorted(head_only_results, key=lambda x: x.get("benchmark", "")):
+            name = short_benchmark_name(b.get("benchmark", ""))
+            score = b.get("primaryMetric", {}).get("score", 0)
+            error = b.get("primaryMetric", {}).get("scoreError", 0)
+            unit = b.get("primaryMetric", {}).get("scoreUnit", "ops/s")
+            md.append(
+                f"| {name} | {format_score(score)} | {format_error(error)} | {unit} |"
+            )
+        md.append("")
+
+    md.append("### Raw Results")
+    md.append("")
+    md.append("```")
+    md.append(
+        f"{'Benchmark':<50} {'Mode':>6} {'Cnt':>4} {'Score':>14} {'Error':>12}  Units"
+    )
+
+    for b in sorted(results, key=lambda x: x.get("benchmark", "")):
+        name = short_benchmark_name(b.get("benchmark", ""))
+        mode = b.get("mode", "thrpt")
+        cnt = b.get("measurementIterations", 0) * b.get("forks", 1)
+        score = b.get("primaryMetric", {}).get("score", 0)
+        error = b.get("primaryMetric", {}).get("scoreError", 0)
+        unit = b.get("primaryMetric", {}).get("scoreUnit", "ops/s")
+
+        try:
+            score_str = f"{float(score):.3f}"
+        except (ValueError, TypeError):
+            score_str = str(score)
+
+        try:
+            error_val = float(error)
+            if math.isnan(error_val):
+                error_str = ""
+            else:
+                error_str = f"± {error_val:.3f}"
+        except (ValueError, TypeError):
+            error_str = ""
+
+        md.append(
+            f"{name:<50} {mode:>6} {cnt:>4} {score_str:>14} {error_str:>12}  {unit}"
+        )
+
+    md.append("```")
+    md.append("")
+
+    md.append("## Notes")
+    md.append("")
+    md.append(
+        "- **Score** = the JMH primary metric; "
+        "throughput is higher-is-better and latency is lower-is-better."
+    )
+    md.append("- **Error** = 99.9% confidence interval")
+    if baseline_results:
+        md.append(
+            "- **Regression verdict** requires comparable benchmark metadata, "
+            "non-overlapping JMH confidence intervals, and a change of at least "
+            f"{PRACTICAL_CHANGE_THRESHOLD:.0f}%; otherwise it is marked "
+            '"within noise" or "inconclusive".'
+        )
+    md.append(
+        "- Scores for different benchmark methods are not ranked against one another; "
+        "they may measure different workloads."
+    )
+    md.append("")
+
+    md.append("## Benchmark Descriptions")
+    md.append("")
+    md.append("| Benchmark | Description |")
+    md.append("|:----------|:------------|")
+    md.append(
+        "| **CounterBenchmark** | Counter increment performance: "
+        "Prometheus, OpenTelemetry, simpleclient, Codahale |"
+    )
+    md.append(
+        "| **HistogramBenchmark** | Histogram observation performance "
+        "(classic vs native/exponential) |"
+    )
+    md.append(
+        "| **TextFormatUtilBenchmark** | Metric exposition format writing speed |"
+    )
+    md.append("")
+    return "\n".join(md)
+
+
+def main():
+    args = parse_args()
+
+    if args.write_system_info:
+        write_system_info(args.write_system_info)
+        print(f"Wrote system info to: {args.write_system_info}")
+        return
+
+    input_path = Path(args.input)
+    if not input_path.exists():
+        print(f"Error: Input file not found: {input_path}")
+        sys.exit(1)
+
+    print(f"Reading results from: {input_path}")
+    with open(input_path, "r") as f:
+        results = json.load(f)
+
+    print(f"Found {len(results)} benchmark results")
+
+    commit_sha = get_commit_sha(args.commit_sha)
+    commit_short = commit_sha[:7]
+    repo = os.environ.get("GITHUB_REPOSITORY", "prometheus/client_java")
+    baseline_results = None
+    baseline_sha = None
+    baseline_repo = args.baseline_repo or os.environ.get("GITHUB_BASE_REPOSITORY", repo)
+    system_info = read_system_info(args.system_info)
+    baseline_system_info = None
+
+    baseline_path = Path(args.baseline) if args.baseline else None
+    if baseline_path:
+        if not baseline_path.exists():
+            print(f"Error: Baseline file not found: {baseline_path}")
+            sys.exit(1)
+        print(f"Reading baseline results from: {baseline_path}")
+        with open(baseline_path, "r") as f:
+            baseline_results = json.load(f)
+        baseline_sha = get_commit_sha(args.baseline_sha)
+        baseline_system_info = (
+            read_system_info(args.baseline_system_info)
+            if args.baseline_system_info
+            else None
+        )
+        print(f"Found {len(baseline_results)} baseline benchmark results")
+
+    output_dir = Path(args.output_dir)
+    output_dir.mkdir(parents=True, exist_ok=True)
+    history_dir = output_dir / "history"
+    history_dir.mkdir(parents=True, exist_ok=True)
+
+    results_json_path = output_dir / "results.json"
+    shutil.copy(input_path, results_json_path)
+    print(f"Copied results to: {results_json_path}")
+
+    if baseline_path:
+        baseline_json_path = output_dir / "baseline-results.json"
+        shutil.copy(baseline_path, baseline_json_path)
+        print(f"Copied baseline results to: {baseline_json_path}")
+
+    date_str = datetime.now(timezone.utc).strftime("%Y-%m-%d")
+    history_path = history_dir / f"{date_str}-{commit_short}.json"
+    shutil.copy(input_path, history_path)
+    print(f"Saved historical entry: {history_path}")
+
+    markdown = generate_markdown(
+        results,
+        commit_sha,
+        repo,
+        baseline_results=baseline_results,
+        baseline_sha=baseline_sha,
+        baseline_repo=baseline_repo,
+        comparison_note=args.comparison_note,
+        system_info=system_info,
+        baseline_system_info=baseline_system_info,
+    )
+    readme_path = output_dir / "README.md"
+    with open(readme_path, "w") as f:
+        f.write(markdown)
+    print(f"Generated summary: {readme_path}")
+
+    print(f"\nDone! Results are in: {output_dir}/")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.mise/tasks/jmx-exporter/prepare.py b/.mise/tasks/jmx-exporter/prepare.py
new file mode 100755
index 000000000..845b76661
--- /dev/null
+++ b/.mise/tasks/jmx-exporter/prepare.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+# [MISE] description="Install local artifacts and check out a target JMX Exporter ref"
+# [MISE] alias="jmx-exporter:prepare"
+
+import sys
+
+sys.path.insert(0, ".mise/lib")
+
+
+def main() -> int:
+    from jmx_exporter_compat import install_local_artifacts, prepare_repo
+
+    install_local_artifacts()
+    prepare_repo()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/.mise/tasks/jmx-exporter/test.py b/.mise/tasks/jmx-exporter/test.py
new file mode 100755
index 000000000..0f7694c19
--- /dev/null
+++ b/.mise/tasks/jmx-exporter/test.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+# [MISE] description="Run JMX Exporter tests against a target ref"
+# [MISE] alias="jmx-exporter:test"
+
+import sys
+
+sys.path.insert(0, ".mise/lib")
+
+
+def main() -> int:
+    from jmx_exporter_compat import (
+        install_local_artifacts,
+        prepare_repo,
+        run_maven_test,
+    )
+
+    install_local_artifacts()
+    prepare_repo()
+    run_maven_test()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/.mise/tasks/lint-bom.py b/.mise/tasks/lint/bom.py
similarity index 85%
rename from .mise/tasks/lint-bom.py
rename to .mise/tasks/lint/bom.py
index 76f996ef5..e4c70988c 100755
--- a/.mise/tasks/lint-bom.py
+++ b/.mise/tasks/lint/bom.py
@@ -7,9 +7,8 @@
 import sys
 from fnmatch import fnmatch
 from pathlib import Path
-from typing import List
 
-ROOT = Path(__file__).resolve().parents[2]  # repo root (.. from .mise/tasks)
+ROOT = Path(__file__).resolve().parents[3]  # repo root (.. from .mise/tasks/lint)
 IGNORE_DIRS = {"prometheus-metrics-parent"}
 MODULE_PREFIX = "prometheus-metrics"
 BOM_POM = ROOT / "prometheus-metrics-bom" / "pom.xml"
@@ -31,12 +30,11 @@ def first_artifact_id(pom_file: Path) -> str:
     return matches[1].strip()
 
 
-def add_dir(dir_path: Path, want: List[str]):
+def add_dir(dir_path: Path, want: list[str]):
     if not dir_path.is_dir():
         raise FileNotFoundError(f"Directory {dir_path} does not exist.")
 
     if any(dir_path.name == ig for ig in IGNORE_DIRS):
-        print(f"Skipping {dir_path}")
         return
 
     pom = dir_path / "pom.xml"
@@ -47,12 +45,11 @@ def add_dir(dir_path: Path, want: List[str]):
     if not artifact_id:
         raise RuntimeError(f"No artifactId found in {pom}")
 
-    print(f"Found artifactId '{artifact_id}' in {pom}")
     want.append(artifact_id)
 
 
-def collect_want(root: Path) -> List[str]:
-    want: List[str] = []
+def collect_want(root: Path) -> list[str]:
+    want: list[str] = []
     # top-level prometheus-metrics*
     for entry in sorted(root.iterdir()):
         if entry.is_dir() and fnmatch(entry.name, f"{MODULE_PREFIX}*"):
@@ -70,14 +67,15 @@ def collect_want(root: Path) -> List[str]:
     return want_unique
 
 
-def collect_have(bom_pom: Path) -> List[str]:
+def collect_have(bom_pom: Path) -> list[str]:
     if not bom_pom.is_file():
         raise FileNotFoundError(f"BOM file {bom_pom} does not exist.")
 
     text = bom_pom.read_text(encoding="utf-8")
     # find artifactId values that start with MODULE_PREFIX
     matches = re.findall(
-        r"<artifactId>\s*(%s[^<\s]*)\s*</artifactId>" % re.escape(MODULE_PREFIX), text
+        rf"<artifactId>\s*({re.escape(MODULE_PREFIX)}[^<\s]*)\s*</artifactId>",
+        text,
     )
     return sorted(matches)
 
@@ -108,10 +106,9 @@ def main() -> int:
             sys.stdout.writelines(diff)
             return 1
         else:
-            print("BOM file is up to date.")
             return 0
 
-    except Exception as e:
+    except (OSError, RuntimeError) as e:
         print(e, file=sys.stderr)
         return 1
 
diff --git a/.mise/tasks/micrometer/prepare.py b/.mise/tasks/micrometer/prepare.py
new file mode 100755
index 000000000..c4fbf2208
--- /dev/null
+++ b/.mise/tasks/micrometer/prepare.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python3
+
+# [MISE] description="Install local artifacts and check out a target Micrometer ref"
+# [MISE] alias="micrometer:prepare"
+
+import sys
+
+sys.path.insert(0, ".mise/lib")
+
+
+def main() -> int:
+    from micrometer_compat import (
+        install_local_artifacts,
+        prepare_repo,
+        write_init_script,
+    )
+
+    install_local_artifacts()
+    prepare_repo()
+    write_init_script()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/.mise/tasks/micrometer/test.py b/.mise/tasks/micrometer/test.py
new file mode 100755
index 000000000..68fb3f661
--- /dev/null
+++ b/.mise/tasks/micrometer/test.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+# [MISE] description="Run Micrometer Prometheus registry tests against a target Micrometer ref"
+# [MISE] alias="micrometer:test"
+
+import sys
+
+sys.path.insert(0, ".mise/lib")
+
+
+def main() -> int:
+    from micrometer_compat import (
+        install_local_artifacts,
+        prepare_repo,
+        run_gradle_test,
+        write_init_script,
+    )
+
+    install_local_artifacts()
+    prepare_repo()
+    write_init_script()
+    run_gradle_test()
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/.mise/tasks/set-release-version-github-pages.sh b/.mise/tasks/set-release-version-github-pages.sh
index 142d0eb82..2016373c8 100755
--- a/.mise/tasks/set-release-version-github-pages.sh
+++ b/.mise/tasks/set-release-version-github-pages.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 
-#MISE description="Set release version in GitHub Pages quickstart.md"
+#MISE description="Set release version in all GitHub Pages docs"
 
 set -euox pipefail
 
 version=$(git tag -l | grep 'v' | sort | tail -1 | sed 's/v//')
-marker="\$version"
-sed -i "s/$marker/$version/g" docs/content/getting-started/quickstart.md
+otelVersion=$(grep -oP '<otel.instrumentation.version>\K[^<]+' pom.xml | sed 's/-alpha$//')
+
+find ./docs/content -name '*.md' \
+	-exec sed -i "s/\$version/$version/g" {} + \
+	-exec sed -i "s/\$otelVersion/$otelVersion/g" {} +
diff --git a/.mise/tasks/set-version.sh b/.mise/tasks/set-version.sh
deleted file mode 100755
index 2309976ce..000000000
--- a/.mise/tasks/set-version.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-#MISE description="Update version in all pom.xml files"
-#USAGE arg "<version>" help="new version"
-
-set -euo pipefail
-
-# replace all occurrences '<version>1.5.0-SNAPSHOT</version>' with
-# '<version>$usage_version</version>' in all pom.xml files in the current directory and
-# subdirectories
-
-# shellcheck disable=SC2154 # is set by mise
-find . -name 'pom.xml' -exec \
-	sed -i "s/<version>1.5.0-SNAPSHOT<\/version>/<version>$usage_version<\/version>/g" {} +
diff --git a/.mise/tasks/super-linter.sh b/.mise/tasks/super-linter.sh
deleted file mode 100755
index 54c2b434e..000000000
--- a/.mise/tasks/super-linter.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-#MISE description="Run GitHub Super Linter on the repository"
-
-set -euo pipefail
-
-docker pull ghcr.io/super-linter/super-linter:latest
-
-docker run --rm \
-	-e RUN_LOCAL=true \
-	-e DEFAULT_BRANCH=main \
-	--env-file ".github/super-linter.env" \
-	-v "$(pwd)":/tmp/lint \
-	ghcr.io/super-linter/super-linter:latest
diff --git a/.mise/tasks/test_generate-benchmark-summary.py b/.mise/tasks/test_generate-benchmark-summary.py
new file mode 100644
index 000000000..9918d0e49
--- /dev/null
+++ b/.mise/tasks/test_generate-benchmark-summary.py
@@ -0,0 +1,156 @@
+import os
+import sys
+import unittest
+
+here = os.path.dirname(__file__)
+if here not in sys.path:
+    sys.path.insert(0, here)
+
+from generate_benchmark_summary import (
+    comparison_status,
+    generate_markdown,
+)
+
+
+def result(
+    name="io.prometheus.metrics.benchmarks.CounterBenchmark.prometheusInc",
+    score=100.0,
+    error=1.0,
+    threads=4,
+):
+    primary_metric = {
+        "score": score,
+        "scoreUnit": "ops/s",
+    }
+    if error is not None:
+        primary_metric.update(
+            {
+                "scoreError": error,
+                "scoreConfidence": [score - error, score + error],
+            }
+        )
+
+    return {
+        "benchmark": name,
+        "jmhVersion": "1.37",
+        "mode": "thrpt",
+        "threads": threads,
+        "forks": 3,
+        "warmupIterations": 3,
+        "warmupTime": "10 s",
+        "measurementIterations": 5,
+        "measurementTime": "10 s",
+        "jdkVersion": "25.0.3",
+        "primaryMetric": primary_metric,
+    }
+
+
+class TestBenchmarkComparison(unittest.TestCase):
+    def test_meaningful_improvement_requires_threshold_and_separation(self):
+        self.assertEqual(
+            comparison_status(result(score=106), result()), "meaningful improvement"
+        )
+
+    def test_meaningful_regression_requires_threshold_and_separation(self):
+        self.assertEqual(
+            comparison_status(result(score=94), result()), "meaningful regression"
+        )
+
+    def test_small_or_uncertain_change_is_within_noise(self):
+        self.assertEqual(
+            comparison_status(result(score=102, error=5), result(error=5)),
+            "within noise",
+        )
+
+    def test_mismatched_metadata_is_inconclusive(self):
+        self.assertEqual(comparison_status(result(threads=1), result()), "inconclusive")
+
+    def test_execution_metadata_mismatch_is_inconclusive(self):
+        for field, value in (
+            ("vmName", "different-vm"),
+            ("vmVersion", "different-vm-version"),
+            ("jvmArgs", ["-Xmx1g"]),
+            ("jvmArgsPrepend", ["-XX:+UseZGC"]),
+            ("jvmArgsAppend", ["-XX:-UseCompressedOops"]),
+            ("warmupBatchSize", 2),
+            ("measurementBatchSize", 2),
+        ):
+            head = result()
+            base = result()
+            head[field] = value
+            self.assertEqual(comparison_status(head, base), "inconclusive", field)
+
+    def test_latency_uses_lower_is_better_direction(self):
+        head = result(score=94, error=1)
+        base = result(score=100, error=1)
+        head["mode"] = base["mode"] = "avgt"
+        head["primaryMetric"]["scoreUnit"] = base["primaryMetric"]["scoreUnit"] = "ms"
+        self.assertEqual(comparison_status(head, base), "meaningful improvement")
+
+    def test_exact_practical_threshold_is_meaningful(self):
+        self.assertEqual(
+            comparison_status(result(score=105, error=0.1), result(error=0.1)),
+            "meaningful improvement",
+        )
+
+    def test_zero_or_non_finite_scores_are_inconclusive(self):
+        self.assertEqual(comparison_status(result(score=0), result()), "inconclusive")
+        self.assertEqual(comparison_status(result(), result(score=0)), "inconclusive")
+        self.assertEqual(
+            comparison_status(result(score=float("inf")), result()), "inconclusive"
+        )
+
+    def test_invalid_fallback_uncertainty_is_inconclusive(self):
+        for error in (float("inf"), float("-inf"), -1.0):
+            head = result(error=error)
+            head["primaryMetric"].pop("scoreConfidence")
+            self.assertEqual(comparison_status(head, result()), "inconclusive", error)
+
+    def test_missing_confidence_interval_is_inconclusive(self):
+        head = result(score=106, error=None)
+        self.assertEqual(comparison_status(head, result()), "inconclusive")
+
+
+class TestBenchmarkMarkdown(unittest.TestCase):
+    def test_head_only_benchmarks_are_separate_and_not_ranked(self):
+        base = [result()]
+        head_only = result(
+            name="io.prometheus.metrics.benchmarks.HistogramBenchmark.newProbe",
+            score=5.0,
+        )
+        markdown = generate_markdown(
+            base + [head_only],
+            "head",
+            "prometheus/client_java",
+            baseline_results=base,
+            baseline_sha="base",
+            baseline_repo="prometheus/client_java",
+        )
+
+        self.assertIn(
+            "| Benchmark | PR | Base | Head vs base | Regression verdict |", markdown
+        )
+        self.assertIn("## New benchmarks in PR head", markdown)
+        self.assertIn("no base counterpart", markdown)
+        self.assertIn("Throughput scores are higher-is-better", markdown)
+        self.assertNotIn("Within run", markdown)
+        self.assertNotIn("x slower", markdown)
+
+    def test_latency_note_is_mode_aware(self):
+        base = result()
+        head = result()
+        base["mode"] = head["mode"] = "avgt"
+        base["primaryMetric"]["scoreUnit"] = head["primaryMetric"]["scoreUnit"] = "ms"
+        markdown = generate_markdown(
+            [head],
+            "head",
+            "prometheus/client_java",
+            baseline_results=[base],
+            baseline_sha="base",
+            baseline_repo="prometheus/client_java",
+        )
+        self.assertIn("Latency scores are lower-is-better", markdown)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/.mise/tasks/test_update-benchmarks.py b/.mise/tasks/test_update-benchmarks.py
index 3d80b4983..a42091ef1 100644
--- a/.mise/tasks/test_update-benchmarks.py
+++ b/.mise/tasks/test_update-benchmarks.py
@@ -66,7 +66,7 @@ def test_update_only_inserts_matching_class_lines(self):
         updated = update_pre_blocks_under_module(self.module_path, self.table)
         # All three files should be updated
         self.assertEqual(
-            set(os.path.basename(p) for p in updated),
+            {os.path.basename(p) for p in updated},
             {
                 os.path.basename(self.files["CounterBenchmark"]),
                 os.path.basename(self.files["HistogramBenchmark"]),
diff --git a/.mise/tasks/update_benchmarks.py b/.mise/tasks/update_benchmarks.py
index 8a5819ae7..6f7f788dd 100755
--- a/.mise/tasks/update_benchmarks.py
+++ b/.mise/tasks/update_benchmarks.py
@@ -29,10 +29,9 @@
 import shlex
 import subprocess
 import sys
-from typing import List, Optional
 
 
-def run_cmd(cmd: List[str], cwd: Optional[str] = None) -> str:
+def run_cmd(cmd: list[str], cwd: str | None = None) -> str:
     """Run a command, stream stdout/stderr to the console for progress, and return the full output.
 
     This replaces the previous blocking subprocess.run approach so users can see build / JMH
@@ -47,13 +46,13 @@ def run_cmd(cmd: List[str], cwd: Optional[str] = None) -> str:
         print(f"Command not found: {cmd[0]}")
         raise
 
-    output_lines: List[str] = []
+    output_lines: list[str] = []
     try:
         assert proc.stdout is not None
         # Stream lines as they appear and capture them for returning
         for line in proc.stdout:
             # Print immediately so callers (and CI) can observe progress
-            print(line, end="")
+            print(line, end="", flush=True)
             output_lines.append(line)
         proc.wait()
     except KeyboardInterrupt:
@@ -74,7 +73,7 @@ def run_cmd(cmd: List[str], cwd: Optional[str] = None) -> str:
 
 def build_benchmarks(mvnw: str, module: str) -> None:
     print(f"Building Maven module '{module}' using {mvnw} (this may take a while)...")
-    cmd = [mvnw, "-pl", module, "-am", "-DskipTests", "package"]
+    cmd = [mvnw, "-pl", module, "-am", "-DskipTests", "clean", "package"]
     run_cmd(cmd)
     print("Build completed.")
 
@@ -94,7 +93,7 @@ def find_benchmarks_jar(module: str) -> str:
     return jar
 
 
-def run_jmh(jar: str, java_cmd: str, extra_args: Optional[str]) -> str:
+def run_jmh(jar: str, java_cmd: str, extra_args: str | None) -> str:
     args = [java_cmd, "-jar", jar, "-rf", "text"]
     if extra_args:
         args += shlex.split(extra_args)
@@ -128,7 +127,7 @@ def extract_first_table(jmh_output: str) -> str:
     return table
 
 
-def filter_table_for_class(table: str, class_name: str) -> Optional[str]:
+def filter_table_for_class(table: str, class_name: str) -> str | None:
     """
     Return a table string that contains only the header and the lines belonging to `class_name`.
     If no matching lines are found, return None.
@@ -157,16 +156,19 @@ def filter_table_for_class(table: str, class_name: str) -> Optional[str]:
     return header + "\n" + "\n".join(matched)
 
 
-def update_pre_blocks_under_module(module: str, table: str) -> List[str]:
+def update_pre_blocks_under_module(module: str, table: str) -> list[str]:
     # Find files under module and update any <pre>...</pre> block that contains 'thrpt'
     updated_files = []
     for path in glob.glob(os.path.join(module, "**"), recursive=True):
         if os.path.isdir(path):
             continue
+        content = None
         try:
             with open(path, "r", encoding="utf-8") as f:
                 content = f.read()
-        except Exception:
+        except (OSError, UnicodeError):
+            pass
+        if content is None:
             continue
         # quick filter
         if "<pre>" not in content or "thrpt" not in content:
@@ -188,10 +190,10 @@ def update_pre_blocks_under_module(module: str, table: str) -> List[str]:
         # This will match patterns like: " * <pre>... </pre>" and capture the prefix (e.g. " * ")
         pattern = re.compile(r"(?m)^(?P<prefix>[ \t]*\*[ \t]*)<pre>[\s\S]*?</pre>")
 
-        def repl(m: re.Match) -> str:
+        def repl(m: re.Match, replacement_table: str = filtered_table) -> str:
             prefix = m.group("prefix")
             # Build the new block with the same prefix on each line
-            lines = filtered_table.splitlines()
+            lines = replacement_table.splitlines()
             replaced = prefix + "<pre>\n"
             for ln in lines:
                 replaced += prefix + ln.rstrip() + "\n"
@@ -207,7 +209,7 @@ def repl(m: re.Match) -> str:
     return updated_files
 
 
-def main(argv: List[str]):
+def main(argv: list[str]):
     parser = argparse.ArgumentParser()
     parser.add_argument("--mvnw", default="./mvnw", help="Path to maven wrapper")
     parser.add_argument(
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 44f3cf2c1..e788e5e69 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 000000000..2949d8089
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,163 @@
+# AGENTS.md
+
+This file provides guidance to AI coding agents when working
+with code in this repository.
+
+## Build Commands
+
+This project uses Maven with mise for task automation.
+The Maven wrapper (`./mvnw`) is used for all builds.
+
+```bash
+# Full CI build (clean + install + all checks)
+mise run ci
+
+# Quick compile without tests or checks (fastest)
+mise run compile
+
+# Run unit tests only (skips formatting and coverage)
+mise run test
+
+# Run all tests including integration tests
+mise run test-all
+
+# Run a single test class
+./mvnw test -Dtest=CounterTest \
+  -Dcoverage.skip=true
+
+# Run a single test method
+./mvnw test -Dtest=CounterTest#testIncrement \
+  -Dcoverage.skip=true
+
+# Run tests in a specific module
+./mvnw test -pl prometheus-metrics-core \
+  -Dcoverage.skip=true
+
+# Regenerate protobuf classes (after protobuf dep update)
+mise run generate
+```
+
+## Architecture
+
+The library follows a layered architecture where metrics
+flow from core types through a registry to exporters:
+
+```text
+prometheus-metrics-core (user-facing API)
+         │
+         ▼ collect()
+prometheus-metrics-model (immutable snapshots)
+         │
+         ▼
+prometheus-metrics-exposition-formats
+         │
+         ▼
+Exporters (httpserver, servlet, pushgateway, otel)
+```
+
+### Key Modules
+
+- **prometheus-metrics-core**: User-facing metric types
+  (Counter, Gauge, Histogram, Summary, Info, StateSet).
+  All metrics implement `Collector` with `collect()`.
+- **prometheus-metrics-model**: Internal read-only immutable
+  snapshot types returned by `collect()`.
+  Contains `PrometheusRegistry` for metric registration.
+- **prometheus-metrics-config**: Runtime configuration via
+  properties files or system properties.
+- **prometheus-metrics-exposition-formats**: Converts
+  snapshots to Prometheus exposition formats.
+- **prometheus-metrics-tracer**: Exemplar support with
+  OpenTelemetry tracing integration.
+- **prometheus-metrics-simpleclient-bridge**: Allows legacy
+  simpleclient 0.16.0 metrics to work with the new registry.
+
+### Instrumentation Modules
+
+Pre-built instrumentations:
+`prometheus-metrics-instrumentation-jvm`, `-caffeine`,
+`-guava`, `-dropwizard`, `-dropwizard5`.
+
+## Code Style
+
+- **Formatter**: Google Java Format (enforced via flint)
+- **Line length**: 100 characters
+  (enforced for ALL files including Markdown, Java, YAML)
+- **Indentation**: 2 spaces
+- **Static analysis**: `Error Prone` with NullAway
+  (`io.prometheus.metrics` package)
+- **Logger naming**: Logger fields must be named `logger`
+  (not `log`, `LOG`, or `LOGGER`)
+- **Assertions in tests**: Use static imports from AssertJ
+  (`import static ...Assertions.assertThat`)
+- **Empty catch blocks**: Use `ignored` as the variable name
+- **Markdown code blocks**: Always specify language
+  (e.g., ` ```java`, ` ```bash`, ` ```text`)
+
+## Pull Requests
+
+- PR titles must use semantic/conventional prefixes, for example
+  `feat: ...`, `fix: ...`, `docs: ...`, `chore: ...`, or
+  `test: ...`.
+- Do not prefix PR titles with `[codex]`.
+- Match the PR title type to the primary user-facing change.
+
+## Linting
+
+Run `mise run lint:fix` before committing changes.
+If output includes `fixed`, keep those changes.
+If output includes `partial` or `review`, address the remaining issues and
+run `mise run lint:fix` again.
+
+Example output:
+flint: fixed: gofmt — commit before pushing | partial: cargo-clippy
+
+**CRITICAL**: These checks MUST be run before creating any
+commits. CI will fail if these checks fail.
+
+### Java Files
+
+- **ALWAYS** run `mise run build` after modifying Java files
+  to ensure:
+  - Code formatting via flint
+  - Static analysis (`Error Prone` with NullAway)
+  - Checkstyle validation
+  - Build succeeds (tests are skipped;
+    run `mise run test` or `mise run test-all` for tests)
+
+## API Design
+
+- For internal or SDK-facing classes, prefer static factories and builders
+  over adding new public constructors.
+- Keep constructors non-public unless they are intentionally part of the
+  stable API.
+
+## Testing
+
+- JUnit 5 (Jupiter) with `@Test` annotations
+- AssertJ for fluent assertions
+- Mockito for mocking
+- **Test visibility**: Test classes and test methods must be
+  package-protected (no `public` modifier)
+- Integration tests are in `integration-tests/` and run
+  during `verify` phase
+- Acceptance tests use OATs framework:
+  `mise run acceptance-test`
+
+## Documentation
+
+- Docs live under `docs/content/` and use `$version` as a
+  placeholder for the library version
+- When publishing GitHub Pages,
+  `mise run set-release-version-github-pages` replaces
+  `$version` with the latest Git tag across all
+  `docs/content/**/*.md` files
+  (the published site is not versioned)
+- Use `$version` for the Prometheus client version and
+  `$otelVersion-alpha` for the OTel instrumentation
+  version — never hardcode them
+
+## Java Version
+
+Source compatibility: Java 8. Tests run on Java 25
+(configured in `mise.toml`).
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..81ba1f52a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,144 @@
+# Changelog
+
+## [1.8.0](https://github.com/prometheus/client_java/compare/v1.7.0...v1.8.0) (2026-06-11)
+
+
+### Features
+
+* Add custom labels to exemplars ([#2191](https://github.com/prometheus/client_java/issues/2191)) ([fd1f3e8](https://github.com/prometheus/client_java/commit/fd1f3e85177ec4d4e4922f22f3aa79dc2dd7e17e))
+* add MetricMetadata.Builder, deprecate wide constructors ([#2202](https://github.com/prometheus/client_java/issues/2202)) ([adeef32](https://github.com/prometheus/client_java/commit/adeef32f303a9dfadee9b7702b255db193c9c533))
+
+
+### Bug Fixes
+
+* Avoid unnuecessary exemplar allocations ([#2209](https://github.com/prometheus/client_java/issues/2209)) ([0b6a91f](https://github.com/prometheus/client_java/commit/0b6a91f2bafe0fa15f6fe828f315103d8c20f9f9))
+* **deps:** update spring boot to v4.1.0 ([#2213](https://github.com/prometheus/client_java/issues/2213)) ([df25c08](https://github.com/prometheus/client_java/commit/df25c0821605b7edf7b87b9874a65d3d529592a5))
+
+
+### Documentation
+
+* cover typed family descriptors and @StableApi since v1.6.1 ([#2181](https://github.com/prometheus/client_java/issues/2181)) ([7ca9f99](https://github.com/prometheus/client_java/commit/7ca9f99b8f1731315d2cf8f68247fc94174a8b3b))
+
+## [1.7.0](https://github.com/prometheus/client_java/compare/v1.6.1...v1.7.0) (2026-06-03)
+
+
+### Features
+
+* Add StableApi marker and API diff check ([#2168](https://github.com/prometheus/client_java/issues/2168)) ([768fd3a](https://github.com/prometheus/client_java/commit/768fd3a7aab5f11f3558a35c0d6257b5a217a078))
+* add typed metric family descriptors ([#2114](https://github.com/prometheus/client_java/issues/2114)) ([9c3b097](https://github.com/prometheus/client_java/commit/9c3b097f6842ffc08fb3a2ed00217c73a6c2b191))
+* track api-diff baseline via Renovate and store diffs in docs/apidiffs ([#2174](https://github.com/prometheus/client_java/issues/2174)) ([3adb890](https://github.com/prometheus/client_java/commit/3adb89078df4bf3d7739886612d4cf051176a6f3))
+
+
+### Bug Fixes
+
+* **deps:** update dependency com.github.ben-manes.caffeine:caffeine to v3.2.4 ([#2088](https://github.com/prometheus/client_java/issues/2088)) ([144eb61](https://github.com/prometheus/client_java/commit/144eb61030d412afe83631b8f341d2cb1595ab1c))
+* **deps:** update dependency io.dropwizard.metrics:metrics-core to v4.2.39 ([#2139](https://github.com/prometheus/client_java/issues/2139)) ([5817d13](https://github.com/prometheus/client_java/commit/5817d1395dc348b6634ea169264fd13f4ad56e82))
+* **deps:** update dependency io.dropwizard.metrics5:metrics-core to v5.0.7 ([#2140](https://github.com/prometheus/client_java/issues/2140)) ([261c451](https://github.com/prometheus/client_java/commit/261c4510eefe156ad688e019b9239cfcfd39bd2b))
+* **deps:** update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.28.0-alpha ([#2126](https://github.com/prometheus/client_java/issues/2126)) ([b62b5d0](https://github.com/prometheus/client_java/commit/b62b5d0ab4b8d3a1335286bd3d36e8c9ac5aa269))
+* **deps:** update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.28.0-alpha ([#2127](https://github.com/prometheus/client_java/issues/2127)) ([e11ce3d](https://github.com/prometheus/client_java/commit/e11ce3de19daf5acd2f73ffb90c96689c172f3c3))
+* **deps:** update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.28.1-alpha ([#2132](https://github.com/prometheus/client_java/issues/2132)) ([b09be38](https://github.com/prometheus/client_java/commit/b09be3882f0ad95ff299db41d706a2e52faa7525))
+* **deps:** update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.28.1-alpha ([#2133](https://github.com/prometheus/client_java/issues/2133)) ([a241c16](https://github.com/prometheus/client_java/commit/a241c165927d3cbb91b97eedd52de9c9eff595d0))
+* **deps:** update dependency org.apache.tomcat.embed:tomcat-embed-core to v11.0.22 ([#2099](https://github.com/prometheus/client_java/issues/2099)) ([22125c5](https://github.com/prometheus/client_java/commit/22125c5f531467030793fc48cb2308ff14bbcaa7))
+* **deps:** update jetty monorepo to v12.1.10 ([#2169](https://github.com/prometheus/client_java/issues/2169)) ([ddd3991](https://github.com/prometheus/client_java/commit/ddd3991096d409a3e58ae2003ce13457a51b8876))
+* **deps:** update jetty monorepo to v12.1.9 ([#2102](https://github.com/prometheus/client_java/issues/2102)) ([04bee70](https://github.com/prometheus/client_java/commit/04bee70efff866f8c4966643926905c28a4eae3a))
+* **deps:** update protobuf ([#2129](https://github.com/prometheus/client_java/issues/2129)) ([320538a](https://github.com/prometheus/client_java/commit/320538a09efad128c6d80bcc3d6eecca394603db))
+* Reduce allocations for classic histogram buckets  ([#2081](https://github.com/prometheus/client_java/issues/2081)) ([edd160a](https://github.com/prometheus/client_java/commit/edd160ab93254c80250d7cf58a1dcb399fef67a1))
+* restore legacy suffix compatibility ([#2100](https://github.com/prometheus/client_java/issues/2100)) ([b2ae70f](https://github.com/prometheus/client_java/commit/b2ae70ffd4ac0830fb567319beae9d1c3ad8bc2f))
+* restore reserved suffix stripping in `PrometheusNaming.sanitizeMetricName()` ([#2124](https://github.com/prometheus/client_java/issues/2124)) ([2d0f508](https://github.com/prometheus/client_java/commit/2d0f508efd2f5e009b6f09f6a9ccb451cf9f3b6f))
+
+
+### Performance Improvements
+
+* Refactored sorting to use optimized sort algorithms ([#2161](https://github.com/prometheus/client_java/issues/2161)) ([25b94fc](https://github.com/prometheus/client_java/commit/25b94fc16273659892af0132cedb71f57597adf7))
+
+
+### Documentation
+
+* clarify downstream adapter validation requirements ([#2101](https://github.com/prometheus/client_java/issues/2101)) ([ef8c75c](https://github.com/prometheus/client_java/commit/ef8c75cf352bddd0d3a2052c3f1b0c8b6103a6f4))
+* Document OM2  ([#2059](https://github.com/prometheus/client_java/issues/2059)) ([45d753c](https://github.com/prometheus/client_java/commit/45d753c418f005fbb17bf7caca3dc94655717687))
+* document PushGateway shading workaround ([#2106](https://github.com/prometheus/client_java/issues/2106)) ([8ca0eb8](https://github.com/prometheus/client_java/commit/8ca0eb8d79b800ad8d7a08f10762ed631f4f2a70))
+
+## [1.6.1](https://github.com/prometheus/client_java/compare/v1.6.0...v1.6.1) (2026-04-27)
+
+> Note: With the OM2 metric-name preservation fix in this release, OpenMetrics 2.0 can now be
+> tested. It is still in progress and not ready for general use yet.
+
+### Bug Fixes
+
+* Preserve original metric names in OM2 output ([#2058](https://github.com/prometheus/client_java/issues/2058)) ([59a7a6d](https://github.com/prometheus/client_java/commit/59a7a6d4d5a9eb31c33167764b11ba96d6625b74))
+
+
+### Documentation
+
+* clarify 1.6.0 release notes ([#2062](https://github.com/prometheus/client_java/issues/2062)) ([9e5d591](https://github.com/prometheus/client_java/commit/9e5d591f4c2e8e0d39ce5141ac14fff057b09c67))
+* Document semantic PR title guidance ([#2060](https://github.com/prometheus/client_java/issues/2060)) ([7277889](https://github.com/prometheus/client_java/commit/727788942cccbecfa57d75eee9fb3e942083a95e))
+
+## [1.6.0](https://github.com/prometheus/client_java/compare/v1.5.1...v1.6.0) (2026-04-25)
+
+> Note: OpenMetrics 2.0 support is still in progress and not ready for general use yet.
+>
+> As part of the OM2 work, metric-name suffix handling moved from metric creation time to scrape
+> time. A positive side effect is that metric names are now more flexible across the board, for
+> example names ending in suffixes like `_total` are accepted where they were previously rejected.
+> To keep the Prometheus and OM1 output unambiguous, the registry tracks claimed exposition names
+> and still rejects registrations that would collide at scrape time.
+>
+> Downstream adapter libraries that implement `MultiCollector` need their registration-time
+> metadata to match the metric families they emit at scrape time. When upgrading to 1.6.0+, adapter
+> registration metadata needs to stay aligned with emitted names, types, label names, and suffix
+> behavior under the new collision model.
+> See also: [Validation at registration only](docs/content/getting-started/registry.md#validation-at-registration-only)
+>
+> | Example | Before 1.6.0 | Since 1.6.0 | Reason |
+> | --- | --- | --- | --- |
+> | `Gauge("foo_total")` | Rejected | Allowed | Not breaking because this previously failed at registration, so no working setup changes behavior, and safe because `_total` suffix expansion applies to counters, not gauges. |
+> | `Counter("events_total")` | Rejected | Allowed | Not breaking because the OM1 output is still `events_total`; only the builder now accepts the name. |
+> | `Gauge("foo_total")` + `Histogram("foo")` | Rejected | Allowed | Not breaking because this combination used to be blocked even though the exposed names do not overlap. |
+> | `Gauge("events_total")` + `Counter("events")` | Rejected | Rejected | Not breaking because the ambiguous OM1 output would still expose two `events_total` series. |
+> | `Gauge("foo_count")` + `Histogram("foo")` | Allowed | Rejected | Intentionally breaking because the old behavior could expose a conflicting `foo_count` name at scrape time. |
+
+### Features
+
+* Relax metric name validation in Dropwizard5 ([#1985](https://github.com/prometheus/client_java/issues/1985)) ([deb782f](https://github.com/prometheus/client_java/commit/deb782f9fce60ffb1308a98b661c0a1ccb79a82b))
+
+
+### Bug Fixes
+
+* **deps:** update dependency com.google.guava:guava to v33.6.0-jre ([#2021](https://github.com/prometheus/client_java/issues/2021)) ([1382693](https://github.com/prometheus/client_java/commit/13826930b9c2f566040a6929090ef23c94e81796))
+* **deps:** update dependency commons-io:commons-io to v2.22.0 ([#2044](https://github.com/prometheus/client_java/issues/2044)) ([9e05c1d](https://github.com/prometheus/client_java/commit/9e05c1d56b7b0de17ba5aaaa300eb6433cc70824))
+* **deps:** update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.27.0-alpha ([#2022](https://github.com/prometheus/client_java/issues/2022)) ([30ac534](https://github.com/prometheus/client_java/commit/30ac534d860fb7c60a1e7835723a6cf0035ea7f7))
+* **deps:** update dependency io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha to v2.27.0-alpha ([#2023](https://github.com/prometheus/client_java/issues/2023)) ([2d51a32](https://github.com/prometheus/client_java/commit/2d51a3251f6943cf1b03ba9ea8778ff052f83ef9))
+* **deps:** update dependency io.prometheus:prometheus-metrics-bom to v1.5.1 ([#2004](https://github.com/prometheus/client_java/issues/2004)) ([650ce4b](https://github.com/prometheus/client_java/commit/650ce4b677f2ca65f5877e77260e403fa85533db))
+* **deps:** update dependency org.apache.tomcat.embed:tomcat-embed-core to v11.0.21 ([#2005](https://github.com/prometheus/client_java/issues/2005)) ([7a36df7](https://github.com/prometheus/client_java/commit/7a36df7151e55adafd5bb5a72af81fd7bf8f1133))
+* **deps:** update dependency org.springframework.boot:spring-boot-starter-parent to v4.0.5 ([#2006](https://github.com/prometheus/client_java/issues/2006)) ([0106c18](https://github.com/prometheus/client_java/commit/0106c18adffd6d3e829f73979917bdf7cc5f53dd))
+* **deps:** update dependency org.springframework.boot:spring-boot-starter-parent to v4.0.6 ([#2046](https://github.com/prometheus/client_java/issues/2046)) ([40a9db8](https://github.com/prometheus/client_java/commit/40a9db868805e36fbaa0f9ac3d02becb17104cd0))
+* **deps:** update jetty monorepo to v12.1.8 ([#2007](https://github.com/prometheus/client_java/issues/2007)) ([acab5b2](https://github.com/prometheus/client_java/commit/acab5b213e7661818470716158b3cfe67caae9da))
+* **deps:** update protobuf ([#2024](https://github.com/prometheus/client_java/issues/2024)) ([8e2214e](https://github.com/prometheus/client_java/commit/8e2214e0a3ac2fe8a9194d9519dcee10f6c9a694))
+* pass release tag as input to deploy workflow ([#1982](https://github.com/prometheus/client_java/issues/1982)) ([165c921](https://github.com/prometheus/client_java/commit/165c921c2508e073baa8f403b30e536ba9b43df9))
+* pin grafana/otel-lgtm to 0.7.2 in OATs acceptance test ([#1992](https://github.com/prometheus/client_java/issues/1992)) ([f17ad9a](https://github.com/prometheus/client_java/commit/f17ad9ad9be2ed0a8519db094f9d8fe9a8a83c48))
+* stabilize flaky timer and thread count tests ([#1973](https://github.com/prometheus/client_java/issues/1973)) ([ce5867b](https://github.com/prometheus/client_java/commit/ce5867b3e25e10c68a6face275732b994a80ec98))
+* trigger Maven deploy from release-please via workflow_dispatch ([#1981](https://github.com/prometheus/client_java/issues/1981)) ([698f956](https://github.com/prometheus/client_java/commit/698f9565e825cdb0f58d2782131cb152cc13894a))
+
+## [1.5.1](https://github.com/prometheus/client_java/compare/v1.5.0...v1.5.1) (2026-03-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency io.prometheus:prometheus-metrics-bom to v1.5.0 ([#1877](https://github.com/prometheus/client_java/issues/1877)) ([043fc57](https://github.com/prometheus/client_java/commit/043fc5742752fdc2f67f0219418030a190c53bde))
+* **deps:** update dependency org.springframework.boot:spring-boot-starter-parent to v4.0.3 ([#1900](https://github.com/prometheus/client_java/issues/1900)) ([0d800d0](https://github.com/prometheus/client_java/commit/0d800d0a91578e48f34909472c183174fdf1d83e))
+* **deps:** update jetty monorepo to v12.1.7 ([#1932](https://github.com/prometheus/client_java/issues/1932)) ([5bd3b79](https://github.com/prometheus/client_java/commit/5bd3b7932f454f3ed2cf55f26d6e1e1908d9ad16))
+* **deps:** update junit-framework monorepo to v6.0.3 ([#1880](https://github.com/prometheus/client_java/issues/1880)) ([05ad751](https://github.com/prometheus/client_java/commit/05ad751a40053f11eae90b9e6cbd741814ca71a7))
+* exclude standalone examples from `mise run format` ([#1931](https://github.com/prometheus/client_java/issues/1931)) ([537fb88](https://github.com/prometheus/client_java/commit/537fb88aae4048ab36041268f902afbbdce54a96))
+* fix release-please PR title pattern and permissions ([#1978](https://github.com/prometheus/client_java/issues/1978)) ([d737978](https://github.com/prometheus/client_java/commit/d7379780f1351a1521c8d93d0544bffce49d02a6))
+* Handle empty datapoints in otel exporter ([#1898](https://github.com/prometheus/client_java/issues/1898)) ([59c8552](https://github.com/prometheus/client_java/commit/59c8552f3d67c06d82344383b45e07fea8ed88b9))
+* inline set-version logic in build-release.sh ([#1884](https://github.com/prometheus/client_java/issues/1884)) ([c050435](https://github.com/prometheus/client_java/commit/c050435a4153046c72d158991c4c8e064dfb24ec))
+* reduce lychee retries to avoid compounding GitHub 429s ([#1940](https://github.com/prometheus/client_java/issues/1940)) ([cc17d6e](https://github.com/prometheus/client_java/commit/cc17d6e4346c9d51e054010fddc75cf8935cbc7d))
+* remove version manipulation from build-release.sh ([#1886](https://github.com/prometheus/client_java/issues/1886)) ([93e2b6d](https://github.com/prometheus/client_java/commit/93e2b6da48abc03ba7d96ffff5020ab73c1ee8c1))
+* trigger Maven deploy on release-please published events ([#1966](https://github.com/prometheus/client_java/issues/1966)) ([643d0e7](https://github.com/prometheus/client_java/commit/643d0e70c274e2a55024611c73a53545a65e94a0))
+* use /tree/ instead of /blob/ for directory URL ([#1944](https://github.com/prometheus/client_java/issues/1944)) ([b81332e](https://github.com/prometheus/client_java/commit/b81332e3a09e465f956f118a2403e64b83771ae5))
+* use maven release type for release-please ([#1967](https://github.com/prometheus/client_java/issues/1967)) ([ff3bd2d](https://github.com/prometheus/client_java/commit/ff3bd2d329acdb6761044846559c353a526c0384))
+
+
+### Documentation
+
+* document DCO sign-off requirement for contributions ([#1937](https://github.com/prometheus/client_java/issues/1937)) ([0860e77](https://github.com/prometheus/client_java/commit/0860e7742b08ab019d129ea24c348191c3f9e0da))
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..6b5e23414
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,3 @@
+<!-- markdownlint-disable-file -->
+
+@AGENTS.md
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..1f70593ce
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,4 @@
+# https://help.github.com/articles/about-codeowners/
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+* @fstab @dhoard @zeitlinger @jaydeluca
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 50d60bfcc..1b42bfaf4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,12 +12,73 @@ Prometheus uses GitHub to manage reviews of pull requests.
   This will avoid unnecessary work and surely give you and us a good deal
   of inspiration.
 
+## Pull Request Titles
+
+Use a [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary)-style
+title for pull requests:
+
+```text
+<type>[optional scope]: <description>
+```
+
+For example: `fix(metrics): handle empty scrapes`. Common types include `feat`, `fix`,
+`docs`, `test`, `refactor`, `perf`, `build`, `ci`, `chore`, and `revert`.
+
+## Signing Off Commits
+
+Every commit must include a `Signed-off-by` line, as required by the
+[Developer Certificate of Origin (DCO)](https://developercertificate.org/).
+
+Sign off each commit by passing `--signoff` (or `-s`) to `git commit`:
+
+```bash
+git commit --signoff -m "Your commit message"
+```
+
+To sign off only the most recent commit, use `--amend`:
+
+```bash
+git commit --amend --signoff --no-edit
+```
+
+To sign off multiple commits, rebase (replace `N` with the number of commits):
+
+```bash
+git rebase --signoff HEAD~N
+```
+
+Then force-push the branch:
+
+```bash
+git push --force-with-lease
+```
+
 ## Formatting
 
-This repository uses [Google Java Format](https://github.com/google/google-java-format) to format
-the code.
+This repository uses flint to run formatting and lint checks.
+
+Run all the linters:
+
+`mise run lint`
+
+To autofix linting issues:
+
+`mise run lint:fix`
+
+### Pre-commit Hook (Optional)
 
-Run `./mvnw spotless:apply` to format the code (only changed files) before committing.
+Run `mise run setup:pre-commit-hook` to install a git pre-commit hook
+that auto-lints changed files before each commit.
+This requires native lint tools,
+which you can install with `mise run setup:native-lint-tools`.
+These are optional but catch formatting and lint issues before CI.
+
+## API Design
+
+For internal or SDK-facing classes, prefer static factories and builders over
+adding new public constructors. Constructors are difficult to evolve
+compatibly, so keep them non-public unless they are intentionally part of the
+stable API.
 
 ## Running Tests
 
@@ -29,21 +90,18 @@ If you're getting errors when running tests:
 ### Running native tests
 
 ```shell
-mise --env native test
+mise --cd .mise/envs/native run native-test
 ```
 
 ### Avoid failures while running tests
 
-- Use `-Dspotless.check.skip=true` to skip the formatting check during development.
 - Use `-Dcoverage.skip=true` to skip the coverage check during development.
-- Use `-Dcheckstyle.skip=true` to skip the checkstyle check during development.
 - Use `-Dwarnings=-nowarn` to skip the warnings during development.
 
 Combine all with
 
 ```shell
-./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true \
-  -Dcheckstyle.skip=true -Dwarnings=-nowarn
+./mvnw install -DskipTests -Dcoverage.skip=true -Dwarnings=-nowarn
 ```
 
 or simply
@@ -52,12 +110,34 @@ or simply
 mise run compile
 ```
 
+## Version Numbers in Examples
+
+Example `pom.xml` files (under `examples/`) should reference the latest
+**released** version, not a SNAPSHOT. After each release, Renovate
+updates these versions automatically.
+
+Only use a SNAPSHOT version in an example when it demonstrates a new
+feature that has not been released yet.
+
 ## Updating the Protobuf Java Classes
 
+The generated protobuf `Metrics.java` lives in a versioned package
+(e.g., `...generated.com_google_protobuf_4_33_5`) that changes with each
+protobuf release. A stable extending class at
+`...generated/Metrics.java` reexports all types so that consumer code
+only imports from the version-free package. On protobuf upgrades only
+the `extends` clause in the stable class changes.
+
 In the failing PR from renovate, run:
 
 ```shell
 mise run generate
 ```
 
-Add the new `Metrics.java` to Git and commit it.
+The script will:
+
+1. Re-generate the protobuf sources with the new version.
+2. Update the versioned package name in all Java files
+   (including the stable `Metrics.java` extends clause).
+
+Add the updated files to Git and commit them.
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index cf0a885eb..a247eb14a 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -2,5 +2,9 @@
 
 - Fabian Stäber <fabian@fstab.de> @fstab
 - Doug Hoard <doug.hoard@gmail.com> @dhoard
-- Tom Wilkie <tom@grafana.com> @tomwilkie
 - Gregor Zeitlinger <gregor.zeitlinger@grafana.com> @zeitlinger
+- Jay DeLuca <jaydeluca4@gmail.com> @jaydeluca
+
+## Emeritus
+
+- Tom Wilkie <tom@grafana.com> @tomwilkie
diff --git a/README.md b/README.md
index a6b611db2..daef2ac3d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,15 @@
 # Prometheus Java Metrics Library
 
-[![Build](https://github.com/prometheus/client_java/actions/workflows/build.yml/badge.svg)](https://github.com/prometheus/client_java/actions/workflows/build.yml) <a href="#"><img src="https://img.shields.io/badge/JDK%20compatibility-8+-blue.svg" alt="java 8+"></a> <a href="#"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg" alt="Apache 2.0"></a> # editorconfig-checker-disable-line
+<!-- markdownlint-disable MD033 -->
+
+[![Build][build-badge]][build-workflow]
+<a href="#"><img src="https://img.shields.io/badge/JDK%20compatibility-8+-blue.svg" alt="java 8+"></a>
+<a href="#"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg" alt="Apache 2.0"></a>
+
+<!-- markdownlint-enable MD033 -->
+
+[build-badge]: https://github.com/prometheus/client_java/actions/workflows/build.yml/badge.svg
+[build-workflow]: https://github.com/prometheus/client_java/actions/workflows/build.yml
 
 ## Documentation
 
diff --git a/RELEASING.md b/RELEASING.md
index 601034d01..c5ae0ed4b 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,39 +1,79 @@
 # Releasing Instructions for Prometheus Java Client
 
+Releases are automated via
+[release-please](https://github.com/googleapis/release-please).
+
+## How It Works
+
+1. Commits to `main` using
+   [Conventional Commits](https://www.conventionalcommits.org/) are
+   tracked by release-please.
+2. Release-please maintains a release PR that accumulates changes and
+   updates the changelog.
+3. When the release PR is merged, release-please creates a GitHub
+   release and a `vX.Y.Z` tag.
+4. The tag triggers the existing `release.yml` workflow, which deploys
+   to Maven Central.
+5. After tagging, release-please opens a follow-up PR to bump the
+   SNAPSHOT version in all `pom.xml` files.
+
+## Patch Release (default)
+
+Simply merge the release PR — release-please bumps the patch version
+by default (e.g. `1.5.0` -> `1.5.1`).
+
+## Minor or Major Release
+
+Add a `release-as: X.Y.0` footer to any commit on `main`:
+
+```text
+feat: add new feature
+
+release-as: 1.6.0
+```
+
+Alternatively, edit the release PR title to
+`chore(main): release 1.6.0`.
+
 ## Before the Release
 
-If there have been significant changes since the last release, update the
-benchmarks before creating a new release:
+If there have been significant changes since the last release, update
+the benchmarks before merging the release PR:
 
 ```shell
 mise run update-benchmarks
 ```
 
-## Create a Release
+## If the Sonatype Central Token is Invalid
 
-1. Go to <https://github.com/prometheus/client_java/releases/new>
-2. Click on "Choose a tag", enter the tag name (e.g. `v0.1.0`), and click "Create a new tag".
-3. Click on "Generate release notes" to auto-generate the release notes based on the commits since
-   the last release.
-4. Click on "Publish release".
+The release workflow verifies the token before deploy. If it fails:
 
-## Major or minor release
+1. Sign in at <https://central.sonatype.com> and open
+   View Account -> Generate User Token.
+2. Copy the `username` and `password` values from the snippet.
+3. Update the secrets:
+   - <https://github.com/prometheus/client_java/settings/secrets/actions/SONATYPE_MAVEN_REPOSITORY_USERNAME>
+   - <https://github.com/prometheus/client_java/settings/secrets/actions/SONATYPE_MAVEN_REPOSITORY_PASSWORD>
+4. Verify locally:
 
-After the release is created, do a text replace everywhere in the repository to update the
-snapshot version in the `pom.xml` files (and some other files) to the next version.
-For example, if the last release was `1.4.0`, the next snapshot version should be `1.5.0-SNAPSHOT`.
+   ```shell
+   curl -i -u "$USER:$PASS" \
+     "https://central.sonatype.com/api/v1/publisher/status?id=test"
+   ```
 
-Replace `1.4.0-SNAPSHOT` with `1.5.0-SNAPSHOT` in all following files.
+   `{"error":{"message":"Invalid token"}}` means the token is still
+   wrong. Any other response (including 404 for the test id) means the
+   token works.
 
-## If the GPG key expired
+## If the GPG Key Expired
 
 1. Generate a new key:
    <https://central.sonatype.org/publish/requirements/gpg/#generating-a-key-pair>
-2. Distribute the
-   key: <https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key>
-3. use `gpg --armor --export-secret-keys YOUR_ID` to
-   export ([docs](https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#gpg))
-4. Update the
-   passphrase: <https://github.com/prometheus/client_java/settings/secrets/actions/GPG_SIGNING_PASSPHRASE> <!-- editorconfig-checker-disable-line -->
-5. Update the GPG
-   key: <https://github.com/prometheus/client_java/settings/secrets/actions/GPG_SIGNING_KEY>
+2. Distribute the key:
+   <https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key>
+3. Use `gpg --armor --export-secret-keys YOUR_ID` to export
+   ([docs](https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#gpg))
+4. Update the passphrase:
+   <https://github.com/prometheus/client_java/settings/secrets/actions/GPG_SIGNING_PASSPHRASE>
+5. Update the GPG key:
+   <https://github.com/prometheus/client_java/settings/secrets/actions/GPG_SIGNING_KEY>
diff --git a/SECURITY.md b/SECURITY.md
index fed02d85c..5e6f976db 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -3,4 +3,4 @@
 The Prometheus security policy, including how to report vulnerabilities, can be
 found here:
 
-<https://prometheus.io/docs/operating/security/>
+[https://prometheus.io/docs/operating/security/](https://prometheus.io/docs/operating/security/)
diff --git a/benchmarks/README.md b/benchmarks/README.md
index 3bba56422..3859eddea 100644
--- a/benchmarks/README.md
+++ b/benchmarks/README.md
@@ -10,6 +10,17 @@ Run benchmarks and update the results in the Javadoc of the benchmark classes:
 mise run update-benchmarks
 ```
 
+### Different benchmark configurations
+
+The full benchmark suite takes approximately 2 hours with JMH defaults.
+For faster iterations, use these preset configurations:
+
+| Command                       | Duration | Use Case                                 |
+| ----------------------------- | -------- | ---------------------------------------- |
+| `mise run benchmark:quick`    | ~10 min  | Quick smoke test during development      |
+| `mise run benchmark:standard` | ~60 min  | CI/nightly runs with good accuracy       |
+| `mise run benchmark:full`     | ~2 hours | Full JMH defaults for release validation |
+
 ### Running benchmarks manually
 
 ```shell
@@ -22,13 +33,33 @@ Run only one specific benchmark:
 java -jar ./benchmarks/target/benchmarks.jar CounterBenchmark
 ```
 
+### Custom JMH arguments
+
+You can pass custom JMH arguments:
+
+```shell
+# Quick run: 1 fork, 1 warmup iteration, 3 measurement iterations
+mise run update-benchmarks -- --jmh-args "-f 1 -wi 1 -i 3"
+
+# Standard CI: 3 forks, 3 warmup iterations, 5 measurement iterations
+mise run update-benchmarks -- --jmh-args "-f 3 -wi 3 -i 5"
+```
+
+JMH parameter reference:
+
+- `-f N`: Number of forks (JVM restarts)
+- `-wi N`: Number of warmup iterations
+- `-i N`: Number of measurement iterations
+- `-w Ns`: Warmup iteration time (default: 10s)
+- `-r Ns`: Measurement iteration time (default: 10s)
+
 ## Results
 
 See Javadoc of the benchmark classes:
 
-- [CounterBenchmark](https://github.com/prometheus/client_java/blob/main/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java) <!-- editorconfig-checker-disable-line -->
-- [HistogramBenchmark](https://github.com/prometheus/client_java/blob/main/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramBenchmark.java) <!-- editorconfig-checker-disable-line -->
-- [TextFormatUtilBenchmark](https://github.com/prometheus/client_java/blob/main/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java) <!-- editorconfig-checker-disable-line -->
+- [CounterBenchmark](https://github.com/prometheus/client_java/blob/main/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java)
+- [HistogramBenchmark](https://github.com/prometheus/client_java/blob/main/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramBenchmark.java)
+- [TextFormatUtilBenchmark](https://github.com/prometheus/client_java/blob/main/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java)
 
 ## What Prometheus Java client optimizes for
 
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index b2fad5766..6d8c9c5c4 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>benchmarks</artifactId>
@@ -23,6 +20,7 @@
     <simpleclient.version>0.16.0</simpleclient.version>
     <codahale.version>3.0.2</codahale.version>
     <coverage.skip>true</coverage.skip>
+    <javadoc.skip>true</javadoc.skip>
   </properties>
 
   <dependencyManagement>
@@ -85,8 +83,8 @@
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
-          <compilerArgs>
-            <!-- need to add parameters to prevent inheritance -->
+          <compilerArgs combine.self="override">
+            <!-- Override parent to prevent ErrorProne inheritance -->
             <arg>-parameters</arg>
           </compilerArgs>
           <annotationProcessorPaths>
@@ -110,8 +108,7 @@
             <configuration>
               <finalName>benchmarks</finalName>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.benchmarks.BenchmarkRunner
                   </mainClass>
                 </transformer>
diff --git a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java
index f5d0a1a0f..d8b75e437 100644
--- a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java
+++ b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/CounterBenchmark.java
@@ -22,16 +22,16 @@
  *
  * <pre>
  * Benchmark                                             Mode  Cnt       Score       Error  Units
- * CounterBenchmark.codahaleIncNoLabels                 thrpt   25  144632.191 ±  2778.333  ops/s
- * CounterBenchmark.openTelemetryAdd                    thrpt   25    2165.775 ±   168.554  ops/s
- * CounterBenchmark.openTelemetryInc                    thrpt   25    1940.143 ±    86.223  ops/s
- * CounterBenchmark.openTelemetryIncNoLabels            thrpt   25    1880.089 ±   192.395  ops/s
- * CounterBenchmark.prometheusAdd                       thrpt   25  122427.789 ±  1377.485  ops/s
- * CounterBenchmark.prometheusInc                       thrpt   25  183603.131 ±  2812.874  ops/s
- * CounterBenchmark.prometheusNoLabelsInc               thrpt   25  169733.499 ±   670.495  ops/s
- * CounterBenchmark.simpleclientAdd                     thrpt   25   13771.151 ±    77.473  ops/s
- * CounterBenchmark.simpleclientInc                     thrpt   25   14255.342 ±   117.339  ops/s
- * CounterBenchmark.simpleclientNoLabelsInc             thrpt   25   14175.465 ±    56.575  ops/s
+ * CounterBenchmark.codahaleIncNoLabels                 thrpt   25  141585.607 ±  4512.937  ops/s
+ * CounterBenchmark.openTelemetryAdd                    thrpt   25    1734.254 ±    93.992  ops/s
+ * CounterBenchmark.openTelemetryInc                    thrpt   25    1824.626 ±   119.822  ops/s
+ * CounterBenchmark.openTelemetryIncNoLabels            thrpt   25    1875.878 ±   130.215  ops/s
+ * CounterBenchmark.prometheusAdd                       thrpt   25  121522.492 ±  1724.943  ops/s
+ * CounterBenchmark.prometheusInc                       thrpt   25  180139.585 ±  3367.156  ops/s
+ * CounterBenchmark.prometheusNoLabelsInc               thrpt   25  166823.346 ±  2915.374  ops/s
+ * CounterBenchmark.simpleclientAdd                     thrpt   25   13040.009 ±   217.831  ops/s
+ * CounterBenchmark.simpleclientInc                     thrpt   25   14268.840 ±   127.324  ops/s
+ * CounterBenchmark.simpleclientNoLabelsInc             thrpt   25   13804.127 ±   163.815  ops/s
  * </pre>
  *
  * Prometheus counters are faster than counters of other libraries. For example, incrementing a
diff --git a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramBenchmark.java b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramBenchmark.java
index 9ada40f35..41b7097db 100644
--- a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramBenchmark.java
+++ b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramBenchmark.java
@@ -21,11 +21,11 @@
  *
  * <pre>
  * Benchmark                                             Mode  Cnt       Score       Error  Units
- * HistogramBenchmark.openTelemetryClassic              thrpt   25     968.178 ±    28.582  ops/s
- * HistogramBenchmark.openTelemetryExponential          thrpt   25     836.000 ±    17.709  ops/s
- * HistogramBenchmark.prometheusClassic                 thrpt   25    7010.393 ±   683.782  ops/s
- * HistogramBenchmark.prometheusNative                  thrpt   25    5040.572 ±   284.433  ops/s
- * HistogramBenchmark.simpleclient                      thrpt   25   10485.462 ±    41.265  ops/s
+ * HistogramBenchmark.openTelemetryClassic              thrpt   25     966.937 ±    46.984  ops/s
+ * HistogramBenchmark.openTelemetryExponential          thrpt   25     816.254 ±    28.033  ops/s
+ * HistogramBenchmark.prometheusClassic                 thrpt   25   15468.490 ±   828.441  ops/s
+ * HistogramBenchmark.prometheusNative                  thrpt   25    7452.050 ±   282.636  ops/s
+ * HistogramBenchmark.simpleclient                      thrpt   25   10082.382 ±   245.428  ops/s
  * </pre>
  *
  * The simpleclient (i.e. client_java version 0.16.0 and older) histograms perform about the same as
@@ -47,6 +47,16 @@ public PrometheusClassicHistogram() {
     }
   }
 
+  @State(Scope.Thread)
+  public static class PrometheusClassicHistogramPerThread {
+
+    final Histogram noLabels;
+
+    public PrometheusClassicHistogramPerThread() {
+      noLabels = Histogram.builder().name("test").help("help").classicOnly().build();
+    }
+  }
+
   @State(Scope.Benchmark)
   public static class PrometheusNativeHistogram {
 
@@ -143,6 +153,26 @@ public Histogram prometheusClassic(
     return histogram.noLabels;
   }
 
+  @Benchmark
+  @Threads(1)
+  public Histogram prometheusClassicSingleThread(
+      RandomNumbers randomNumbers, PrometheusClassicHistogram histogram) {
+    for (int i = 0; i < randomNumbers.randomNumbers.length; i++) {
+      histogram.noLabels.observe(randomNumbers.randomNumbers[i]);
+    }
+    return histogram.noLabels;
+  }
+
+  @Benchmark
+  @Threads(4)
+  public Histogram prometheusClassicPerThread(
+      RandomNumbers randomNumbers, PrometheusClassicHistogramPerThread histogram) {
+    for (int i = 0; i < randomNumbers.randomNumbers.length; i++) {
+      histogram.noLabels.observe(randomNumbers.randomNumbers[i]);
+    }
+    return histogram.noLabels;
+  }
+
   @Benchmark
   @Threads(4)
   public Histogram prometheusNative(
diff --git a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramTextFormatBenchmark.java b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramTextFormatBenchmark.java
new file mode 100644
index 000000000..47a34ac18
--- /dev/null
+++ b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/HistogramTextFormatBenchmark.java
@@ -0,0 +1,71 @@
+package io.prometheus.metrics.benchmarks;
+
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
+import io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter;
+import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot.HistogramDataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.TimeUnit;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Warmup;
+
+/**
+ * Benchmarks for writing a classic histogram (10 label combinations × 12 buckets) to text formats.
+ * Output goes to /dev/null to isolate pure formatting CPU cost with zero IO overhead.
+ */
+@Fork(3)
+@Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 10, time = 2, timeUnit = TimeUnit.SECONDS)
+public class HistogramTextFormatBenchmark {
+
+  private static final MetricSnapshots SNAPSHOTS;
+
+  static {
+    double[] upperBounds = {
+      .005, .01, .025, .05, .1, .25, .5, 1.0, 2.5, 5.0, 10.0, Double.POSITIVE_INFINITY
+    };
+    Number[] counts = {1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L, 9L, 10L, 11L, 12L};
+    ClassicHistogramBuckets buckets = ClassicHistogramBuckets.of(upperBounds, counts);
+
+    HistogramSnapshot.Builder builder =
+        HistogramSnapshot.builder().name("http_request_duration_seconds");
+
+    for (int i = 0; i < 10; i++) {
+      builder.dataPoint(
+          HistogramDataPointSnapshot.builder()
+              .classicHistogramBuckets(buckets)
+              .labels(Labels.of("status", "value_" + i))
+              .sum(123.456)
+              .createdTimestampMillis(1000L)
+              .build());
+    }
+
+    SNAPSHOTS = MetricSnapshots.of(builder.build());
+  }
+
+  private static final OpenMetricsTextFormatWriter OPEN_METRICS_TEXT_FORMAT_WRITER =
+      OpenMetricsTextFormatWriter.create();
+  private static final PrometheusTextFormatWriter PROMETHEUS_TEXT_FORMAT_WRITER =
+      PrometheusTextFormatWriter.create();
+
+  @Benchmark
+  public OutputStream openMetricsWriteToNull() throws IOException {
+    OutputStream nullOutputStream = TextFormatUtilBenchmark.NullOutputStream.INSTANCE;
+    OPEN_METRICS_TEXT_FORMAT_WRITER.write(nullOutputStream, SNAPSHOTS, EscapingScheme.ALLOW_UTF8);
+    return nullOutputStream;
+  }
+
+  @Benchmark
+  public OutputStream prometheusWriteToNull() throws IOException {
+    OutputStream nullOutputStream = TextFormatUtilBenchmark.NullOutputStream.INSTANCE;
+    PROMETHEUS_TEXT_FORMAT_WRITER.write(nullOutputStream, SNAPSHOTS, EscapingScheme.ALLOW_UTF8);
+    return nullOutputStream;
+  }
+}
diff --git a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java
index ed3ef4246..19fb60bcb 100644
--- a/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java
+++ b/benchmarks/src/main/java/io/prometheus/metrics/benchmarks/TextFormatUtilBenchmark.java
@@ -24,10 +24,10 @@
  *
  * <pre>
  * Benchmark                                             Mode  Cnt       Score       Error  Units
- * TextFormatUtilBenchmark.openMetricsWriteToByteArray  thrpt   25  826847.708 ± 10941.611  ops/s
- * TextFormatUtilBenchmark.openMetricsWriteToNull       thrpt   25  847756.101 ±  5299.128  ops/s
- * TextFormatUtilBenchmark.prometheusWriteToByteArray   thrpt   25  874804.601 ±  9730.060  ops/s
- * TextFormatUtilBenchmark.prometheusWriteToNull        thrpt   25  910782.719 ± 17617.167  ops/s
+ * TextFormatUtilBenchmark.openMetricsWriteToByteArray  thrpt   25  748557.302 ± 22925.735  ops/s
+ * TextFormatUtilBenchmark.openMetricsWriteToNull       thrpt   25  727876.401 ± 31520.283  ops/s
+ * TextFormatUtilBenchmark.prometheusWriteToByteArray   thrpt   25  768419.214 ± 22785.134  ops/s
+ * TextFormatUtilBenchmark.prometheusWriteToNull        thrpt   25  796486.637 ± 11456.297  ops/s
  * </pre>
  */
 public class TextFormatUtilBenchmark {
diff --git a/biome.jsonc b/biome.jsonc
new file mode 100644
index 000000000..d79695a0b
--- /dev/null
+++ b/biome.jsonc
@@ -0,0 +1,8 @@
+// Biome keeps the repo's JSON and JSONC files formatted consistently.
+{
+  // Keep JSON formatting aligned with the repo's two-space style.
+  "formatter": {
+    "indentStyle": "space",
+    "indentWidth": 2
+  }
+}
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 5f632c578..b1b9d6cfe 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -5,5 +5,28 @@
   "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
 <suppressions>
-    <suppress checks="Javadoc" files="."/>
+  <!-- Suppress Javadoc paragraph formatting (empty line before <p> tag) globally. This is a
+       stylistic check that would require fixing hundreds of locations. We still enforce that
+       public APIs have documentation via other Javadoc checks. -->
+  <suppress checks="JavadocParagraph" files="."/>
+
+  <!-- Suppress all Javadoc checks for internal implementation packages -->
+  <suppress checks="Javadoc" files=".*[/\\]internal[/\\].*"/>
+
+  <!-- Suppress all Javadoc checks for example code -->
+  <suppress checks="Javadoc" files=".*[/\\]examples[/\\].*"/>
+
+  <!-- Suppress all Javadoc checks for benchmark code -->
+  <suppress checks="Javadoc" files=".*[/\\]benchmarks[/\\].*"/>
+
+  <!-- Suppress all Javadoc checks for integration tests -->
+  <suppress checks="Javadoc" files=".*[/\\]integration-tests[/\\].*"/>
+
+  <!-- Preserve the repository's main-source-only Checkstyle policy when Flint invokes the
+       standalone CLI with explicit Java files. -->
+  <suppress checks=".*" files=".*[/\\]src[/\\]test[/\\]java[/\\].*"/>
+  <suppress checks=".*" files=".*[/\\]src[/\\]archive[/\\]java[/\\].*"/>
+
+  <!-- Example setup intentionally groups declarations before the simulated work that uses them. -->
+  <suppress checks="VariableDeclarationUsageDistance" files=".*[/\\]examples[/\\].*"/>
 </suppressions>
diff --git a/checkstyle.xml b/checkstyle.xml
index cac6be8d3..bc6375b3f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -48,18 +48,6 @@
   </module>
 
   <module name="TreeWalker">
-    <module name="RegexpSinglelineJava">
-      <property name="format"
-                value="(?&lt;!import static io.opentelemetry.sdk.testing.assertj.)OpenTelemetryAssertions\."/>
-      <property name="message"
-                value="Please statically import methods from OpenTelemetryAssertions"/>
-    </module>
-    <module name="RegexpSinglelineJava">
-      <property name="format"
-                value="(?&lt;!import static org.assertj.core.api.|OpenTelemetry)Assertions.assertThat"/>
-      <property name="message"
-                value="Please statically import methods from Assertions (OpenTelemetryAssertions extends Assertions)"/>
-    </module>
     <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-annotations.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-annotations.txt
new file mode 100644
index 000000000..b2f6a39d8
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-annotations.txt
@@ -0,0 +1,11 @@
+Comparing source compatibility of prometheus-metrics-annotations-1.6.2-SNAPSHOT.jar against 
++++  NEW ANNOTATION: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.annotations.StableApi  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.annotation.Annotation
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW ANNOTATION: java.lang.annotation.Documented
+	+++  NEW ANNOTATION: java.lang.annotation.Target
+		+++  NEW ELEMENT: value=java.lang.annotation.ElementType.TYPE,java.lang.annotation.ElementType.CONSTRUCTOR,java.lang.annotation.ElementType.METHOD,java.lang.annotation.ElementType.FIELD (+)
+	+++  NEW ANNOTATION: java.lang.annotation.Retention
+		+++  NEW ELEMENT: value=java.lang.annotation.RetentionPolicy.CLASS (+)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-config.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-config.txt
new file mode 100644
index 000000000..dd61db431
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-config.txt
@@ -0,0 +1,263 @@
+Comparing source compatibility of prometheus-metrics-config-1.6.2-SNAPSHOT.jar against prometheus-metrics-config-1.6.1.jar
++++  NEW ENUM: PUBLIC(+) FINAL(+) io.prometheus.metrics.config.EscapingScheme  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.constant.Constable
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: java.lang.Enum
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.config.EscapingScheme DOTS_ESCAPING
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.config.EscapingScheme ALLOW_UTF8
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.config.EscapingScheme UNDERSCORE_ESCAPING
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.config.EscapingScheme VALUE_ENCODING_ESCAPING
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.config.EscapingScheme DEFAULT
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.EscapingScheme fromAcceptHeader(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) FINAL(+) java.lang.String getValue()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toHeaderFormat()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.EscapingScheme valueOf(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.EscapingScheme[] values()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.ExemplarsProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExemplarsProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getMaxRetentionPeriodSeconds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getMinRetentionPeriodSeconds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getSampleIntervalMilliseconds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExemplarsProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExemplarsProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExemplarsProperties$Builder maxRetentionPeriodSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExemplarsProperties$Builder minRetentionPeriodSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExemplarsProperties$Builder sampleIntervalMilliseconds(int)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String METRIC_NAME_MUST_NOT_BE_EQUAL_TO
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String METRIC_NAME_MUST_START_WITH
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String METRIC_NAME_MUST_NOT_START_WITH
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String METRIC_NAME_MUST_BE_EQUAL_TO
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterFilterProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getAllowedMetricNamePrefixes()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getAllowedMetricNames()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getExcludedMetricNamePrefixes()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getExcludedMetricNames()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterFilterProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties$Builder allowedNames(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties$Builder allowedPrefixes(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties$Builder excludedNames(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties$Builder excludedPrefixes(java.lang.String[])
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getPort()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) boolean isPreferUncompressedResponse()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties$Builder port(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties$Builder preferUncompressedResponse(boolean)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getEndpoint()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.Map<java.lang.String,java.lang.String> getHeaders()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getInterval()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Boolean getPreserveNames()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getProtocol()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.Map<java.lang.String,java.lang.String> getResourceAttributes()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getServiceInstanceId()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getServiceName()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getServiceNamespace()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getServiceVersion()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getTimeout()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder endpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder header(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder intervalSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder preserveNames(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder protocol(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder resourceAttribute(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder serviceInstanceId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder serviceName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder serviceNamespace(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder serviceVersion(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties$Builder timeoutSeconds(int)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.ExporterProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) boolean getExemplarsOnAllMetricTypes()
+	+++  NEW METHOD: PUBLIC(+) boolean getIncludeCreatedTimestamps()
+	+++  NEW METHOD: PUBLIC(+) boolean getPrometheusTimestampsInMs()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterProperties$Builder exemplarsOnAllMetricTypes(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterProperties$Builder includeCreatedTimestamps(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterProperties$Builder prometheusTimestampsInMs(boolean)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getAddress()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.time.Duration getConnectTimeout()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.EscapingScheme getEscapingScheme()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getJob()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.time.Duration getReadTimeout()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getScheme()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder address(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder connectTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder escapingScheme(io.prometheus.metrics.config.EscapingScheme)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder job(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder readTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties$Builder scheme(java.lang.String)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricsProperties(java.lang.Boolean, java.lang.Boolean, java.lang.Boolean, java.util.List<java.lang.Double>, java.lang.Integer, java.lang.Double, java.lang.Double, java.lang.Integer, java.lang.Long, java.util.List<java.lang.Double>, java.util.List<java.lang.Double>, java.lang.Long, java.lang.Integer)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.MetricsProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.lang.Boolean getExemplarsEnabled()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Boolean getHistogramClassicOnly()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.Double> getHistogramClassicUpperBounds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getHistogramNativeInitialSchema()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getHistogramNativeMaxNumberOfBuckets()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Double getHistogramNativeMaxZeroThreshold()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Double getHistogramNativeMinZeroThreshold()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Boolean getHistogramNativeOnly()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Long getHistogramNativeResetDurationSeconds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Long getSummaryMaxAgeSeconds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.Integer getSummaryNumberOfAgeBuckets()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.Double> getSummaryQuantileErrors()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.Double> getSummaryQuantiles()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.MetricsProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder exemplarsEnabled(java.lang.Boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramClassicOnly(java.lang.Boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramClassicUpperBounds(double[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramNativeInitialSchema(java.lang.Integer)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramNativeMaxNumberOfBuckets(java.lang.Integer)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramNativeMaxZeroThreshold(java.lang.Double)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramNativeMinZeroThreshold(java.lang.Double)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramNativeOnly(java.lang.Boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder histogramNativeResetDurationSeconds(java.lang.Long)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder summaryMaxAgeSeconds(java.lang.Long)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder summaryNumberOfAgeBuckets(java.lang.Integer)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder summaryQuantileErrors(double[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties$Builder summaryQuantiles(double[])
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) boolean getCompositeValues()
+	+++  NEW METHOD: PUBLIC(+) boolean getContentNegotiation()
+	+++  NEW METHOD: PUBLIC(+) boolean getEnabled()
+	+++  NEW METHOD: PUBLIC(+) boolean getExemplarCompliance()
+	+++  NEW METHOD: PUBLIC(+) boolean getNativeHistograms()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder compositeValues(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder contentNegotiation(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder enableAll()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder enabled(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder exemplarCompliance(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties$Builder nativeHistograms(boolean)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.PrometheusProperties get()
+		+++  NEW EXCEPTION: io.prometheus.metrics.config.PrometheusPropertiesException
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties getDefaultMetricProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExemplarsProperties getExemplarProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterFilterProperties getExporterFilterProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterHttpServerProperties getExporterHttpServerProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterOpenTelemetryProperties getExporterOpenTelemetryProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterProperties getExporterProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.ExporterPushgatewayProperties getExporterPushgatewayProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties getMetricProperties(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties getOpenMetrics2Properties()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder defaultMetricsProperties(io.prometheus.metrics.config.MetricsProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder enableOpenMetrics2(java.util.function.Consumer<io.prometheus.metrics.config.OpenMetrics2Properties$Builder>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder exemplarProperties(io.prometheus.metrics.config.ExemplarsProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder exporterFilterProperties(io.prometheus.metrics.config.ExporterFilterProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder exporterHttpServerProperties(io.prometheus.metrics.config.ExporterHttpServerProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder exporterOpenTelemetryProperties(io.prometheus.metrics.config.ExporterOpenTelemetryProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder exporterProperties(io.prometheus.metrics.config.ExporterProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder metricProperties(java.util.Map<java.lang.String,io.prometheus.metrics.config.MetricsProperties>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder openMetrics2Properties(io.prometheus.metrics.config.OpenMetrics2Properties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder pushgatewayProperties(io.prometheus.metrics.config.ExporterPushgatewayProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.PrometheusProperties$Builder putMetricProperty(java.lang.String, io.prometheus.metrics.config.MetricsProperties)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.PrometheusPropertiesException  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: java.lang.RuntimeException
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusPropertiesException(java.lang.String)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusPropertiesException(java.lang.String, java.lang.Exception)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.config.PrometheusPropertiesLoader  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusPropertiesLoader()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.PrometheusProperties load()
+		+++  NEW EXCEPTION: io.prometheus.metrics.config.PrometheusPropertiesException
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.config.PrometheusProperties load(java.util.Map<java.lang.Object,java.lang.Object>)
+		+++  NEW EXCEPTION: io.prometheus.metrics.config.PrometheusPropertiesException
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-core.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-core.txt
new file mode 100644
index 000000000..f6b1e9a9c
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-core.txt
@@ -0,0 +1,353 @@
+Comparing source compatibility of prometheus-metrics-core-1.6.2-SNAPSHOT.jar against prometheus-metrics-core-1.6.1.jar
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.CounterDataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) double get()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) long getLongValue()
+	+++  NEW METHOD: PUBLIC(+) void inc()
+	+++  NEW METHOD: PUBLIC(+) void inc(long)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void inc(double)
+	+++  NEW METHOD: PUBLIC(+) void incWithExemplar(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void incWithExemplar(long, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void incWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.DataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.DistributionDataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) double getSum()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void observe(double)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void observeWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.datapoints.Timer startTimer()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.GaugeDataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) void dec()
+	+++  NEW METHOD: PUBLIC(+) void dec(double)
+	+++  NEW METHOD: PUBLIC(+) void decWithExemplar(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void decWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) double get()
+	+++  NEW METHOD: PUBLIC(+) void inc()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void inc(double)
+	+++  NEW METHOD: PUBLIC(+) void incWithExemplar(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void incWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void set(double)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void setWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.datapoints.Timer startTimer()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.StateSetDataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void setFalse(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) void setFalse(java.lang.Enum<?>)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void setTrue(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) void setTrue(java.lang.Enum<?>)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.datapoints.Timer  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.io.Closeable
+	+++  NEW INTERFACE: java.lang.AutoCloseable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) void close()
+	+++  NEW METHOD: PUBLIC(+) double observeDuration()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.TimerApi  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.datapoints.Timer startTimer()
+	+++  NEW METHOD: PUBLIC(+) void time(java.lang.Runnable)
+	+++  NEW METHOD: PUBLIC(+) java.lang.Object time(java.util.function.Supplier<T>)
+		GENERIC TEMPLATES: +++ T:java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) java.lang.Object timeChecked(java.util.concurrent.Callable<T>)
+		+++  NEW EXCEPTION: java.lang.Exception
+		GENERIC TEMPLATES: +++ T:java.lang.Object
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.exemplars.ExemplarSampler  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) ExemplarSampler(io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig, io.prometheus.metrics.tracer.common.SpanContext)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) ExemplarSampler(io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplars collect()
+	+++  NEW METHOD: PUBLIC(+) void observe(double)
+	+++  NEW METHOD: PUBLIC(+) void observeWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void reset()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) int DEFAULT_MIN_RETENTION_PERIOD_SECONDS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) int DEFAULT_MAX_RETENTION_PERIOD_SECONDS
+	+++  NEW CONSTRUCTOR: PUBLIC(+) ExemplarSamplerConfig(io.prometheus.metrics.config.ExemplarsProperties, int)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) ExemplarSamplerConfig(io.prometheus.metrics.config.ExemplarsProperties, double[])
+	+++  NEW METHOD: PUBLIC(+) double[] getHistogramClassicUpperBounds()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) long getMaxRetentionPeriodMillis()
+	+++  NEW METHOD: PUBLIC(+) long getMinRetentionPeriodMillis()
+	+++  NEW METHOD: PUBLIC(+) int getNumberOfExemplars()
+	+++  NEW METHOD: PUBLIC(+) long getSampleIntervalMillis()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Counter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.CounterDataPoint
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Counter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Counter$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) double get()
+	+++  NEW METHOD: PUBLIC(+) long getLongValue()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) void inc(long)
+	+++  NEW METHOD: PUBLIC(+) void inc(double)
+	+++  NEW METHOD: PUBLIC(+) void incWithExemplar(long, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void incWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Counter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Counter build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Counter$Builder name(java.lang.String)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.CallbackMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.CallbackMetric$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback$Builder callback(java.util.function.Consumer<io.prometheus.metrics.core.metrics.CounterWithCallback$Callback>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback$Builder name(java.lang.String)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.core.metrics.CounterWithCallback$Callback  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void call(double, java.lang.String[])
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Gauge  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.GaugeDataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Gauge$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Gauge$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) double get()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) void inc(double)
+	+++  NEW METHOD: PUBLIC(+) void incWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void set(double)
+	+++  NEW METHOD: PUBLIC(+) void setWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Gauge$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Gauge build()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.CallbackMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.CallbackMetric$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback$Builder callback(java.util.function.Consumer<io.prometheus.metrics.core.metrics.GaugeWithCallback$Callback>)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.core.metrics.GaugeWithCallback$Callback  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void call(double, java.lang.String[])
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DistributionDataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) double getSum()
+	+++  NEW METHOD: PUBLIC(+) void observe(double)
+	+++  NEW METHOD: PUBLIC(+) void observeWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric$Builder
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) double[] DEFAULT_CLASSIC_UPPER_BOUNDS
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder classicExponentialUpperBounds(double, double, int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder classicLinearUpperBounds(double, double, int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder classicOnly()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder classicUpperBounds(double[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties getDefaultProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder nativeInitialSchema(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder nativeMaxNumberOfBuckets(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder nativeMaxZeroThreshold(double)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder nativeMinZeroThreshold(double)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder nativeOnly()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$Builder nativeResetDuration(long, java.util.concurrent.TimeUnit)
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Histogram$DataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DistributionDataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) double getSum()
+	+++  NEW METHOD: PUBLIC(+) void observe(double)
+	+++  NEW METHOD: PUBLIC(+) void observeWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Info  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.MetricWithFixedMetadata
+	+++  NEW METHOD: PUBLIC(+) void addLabelValues(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Info$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Info$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) void remove(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) void setLabelValues(java.lang.String[])
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Info$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Info build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Info$Builder name(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Info$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.metrics.Metric  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.MetricSnapshot collect()
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.Metric
+	+++  NEW METHOD: PUBLIC(+) java.util.Set<java.lang.String> getLabelNames()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata getMetadata()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor getMetricFamilyDescriptor()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getPrometheusName()
+		+++  NEW ANNOTATION: java.lang.Deprecated
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	GENERIC TEMPLATES: +++ B:io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder<B,M>, +++ M:io.prometheus.metrics.core.metrics.MetricWithFixedMetadata
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.Metric$Builder
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder help(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder labelNames(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder name(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.MetricWithFixedMetadata$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.SlidingWindow  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	GENERIC TEMPLATES: +++ T:java.lang.Object
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) SlidingWindow(java.lang.Class<T>, java.util.function.Supplier<T>, java.util.function.ObjDoubleConsumer<T>, long, int)
+	+++  NEW METHOD: PUBLIC(+) java.lang.Object current()
+	+++  NEW METHOD: PUBLIC(+) void observe(double)
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.core.metrics.StatefulMetric  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	GENERIC TEMPLATES: +++ D:io.prometheus.metrics.core.datapoints.DataPoint, +++ T:D
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.MetricWithFixedMetadata
+	+++  NEW METHOD: PUBLIC(+) void clear()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) void initLabelValues(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.datapoints.DataPoint labelValues(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) void remove(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) void removeIf(java.util.function.Function<java.util.List<java.lang.String>,java.lang.Boolean>)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.StateSet  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.StateSetDataPoint
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.StateSet$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.StateSet$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) void setFalse(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) void setTrue(java.lang.String)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.StateSet$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.StateSet build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.StateSet$Builder states(java.lang.Class<? extends java.lang.Enum<? extends ?>>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.StateSet$Builder states(java.lang.String[])
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DistributionDataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Summary$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Summary$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) double getSum()
+	+++  NEW METHOD: PUBLIC(+) void observe(double)
+	+++  NEW METHOD: PUBLIC(+) void observeWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.Summary$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.StatefulMetric$Builder
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) long DEFAULT_MAX_AGE_SECONDS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) int DEFAULT_NUMBER_OF_AGE_BUCKETS
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.MetricsProperties getDefaultProperties()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary$Builder maxAgeSeconds(long)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary$Builder numberOfAgeBuckets(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary$Builder quantile(double)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary$Builder quantile(double, double)
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.Summary$DataPoint  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DistributionDataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.DataPoint
+	+++  NEW INTERFACE: io.prometheus.metrics.core.datapoints.TimerApi
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) double getSum()
+	+++  NEW METHOD: PUBLIC(+) void observe(double)
+	+++  NEW METHOD: PUBLIC(+) void observeWithExemplar(double, io.prometheus.metrics.model.snapshots.Labels)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.Collector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.CallbackMetric
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.core.metrics.CallbackMetric$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback$Builder callback(java.util.function.Consumer<io.prometheus.metrics.core.metrics.SummaryWithCallback$Callback>)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.core.metrics.SummaryWithCallback$Callback  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void call(long, double, io.prometheus.metrics.model.snapshots.Quantiles, java.lang.String[])
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-common.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-common.txt
new file mode 100644
index 000000000..d2ba333af
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-common.txt
@@ -0,0 +1,40 @@
+Comparing source compatibility of prometheus-metrics-exporter-common-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-common-1.6.1.jar
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.exporter.common.PrometheusHttpExchange  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.AutoCloseable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void close()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.exporter.common.PrometheusHttpRequest getRequest()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.exporter.common.PrometheusHttpResponse getResponse()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void handleException(java.io.IOException)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void handleException(java.lang.RuntimeException)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.exporter.common.PrometheusHttpRequest  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.PrometheusScrapeRequest
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getHeader(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.Enumeration<java.lang.String> getHeaders(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getMethod()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getParameter(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String[] getParameterValues(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getQueryString()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.exporter.common.PrometheusHttpResponse  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.io.OutputStream sendHeadersAndGetBody(int, int)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void setHeader(java.lang.String, java.lang.String)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.common.PrometheusScrapeHandler  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusScrapeHandler()
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusScrapeHandler(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusScrapeHandler(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusScrapeHandler(io.prometheus.metrics.config.PrometheusProperties, io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW METHOD: PUBLIC(+) void handleRequest(io.prometheus.metrics.exporter.common.PrometheusHttpExchange)
+		+++  NEW EXCEPTION: java.io.IOException
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-httpserver.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-httpserver.txt
new file mode 100644
index 000000000..decc352f5
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-httpserver.txt
@@ -0,0 +1,52 @@
+Comparing source compatibility of prometheus-metrics-exporter-httpserver-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-httpserver-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.DefaultHandler  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: com.sun.net.httpserver.HttpHandler
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DefaultHandler(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) void handle(com.sun.net.httpserver.HttpExchange)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HealthyHandler  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: com.sun.net.httpserver.HttpHandler
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HealthyHandler()
+	+++  NEW METHOD: PUBLIC(+) void handle(com.sun.net.httpserver.HttpExchange)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.io.Closeable
+	+++  NEW INTERFACE: java.lang.AutoCloseable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) void close()
+	+++  NEW METHOD: PUBLIC(+) int getPort()
+	+++  NEW METHOD: PUBLIC(+) void stop()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder authenticatedSubjectAttributeName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder authenticator(com.sun.net.httpserver.Authenticator)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer buildAndStart()
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder defaultHandler(com.sun.net.httpserver.HttpHandler)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder executorService(java.util.concurrent.ExecutorService)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder hostname(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder httpsConfigurator(com.sun.net.httpserver.HttpsConfigurator)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder inetAddress(java.net.InetAddress)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder metricsHandlerPath(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder port(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder registerHealthHandler(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.HTTPServer$Builder registry(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.httpserver.MetricsHandler  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: com.sun.net.httpserver.HttpHandler
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricsHandler(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricsHandler(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricsHandler(io.prometheus.metrics.config.PrometheusProperties, io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricsHandler()
+	+++  NEW METHOD: PUBLIC(+) void handle(com.sun.net.httpserver.HttpExchange)
+		+++  NEW EXCEPTION: java.io.IOException
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt
new file mode 100644
index 000000000..e5d128dd6
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-otel-agent-resources-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-otel-agent-resources-1.6.1.jar
+No changes.
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry-shaded.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry-shaded.txt
new file mode 100644
index 000000000..8bc4f87f6
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry-shaded.txt
@@ -0,0 +1,26 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.AutoCloseable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) OpenTelemetryExporter(io.prometheus.metrics.shaded.io_opentelemetry_2_28_1_alpha.sdk.metrics.export.MetricReader)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) void close()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter buildAndStart()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder endpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder header(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder intervalSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder preserveNames(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder protocol(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder registry(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder resourceAttribute(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceInstanceId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceNamespace(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceVersion(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder timeoutSeconds(int)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry.txt
new file mode 100644
index 000000000..19d112b08
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-opentelemetry.txt
@@ -0,0 +1,26 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-no-otel-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-no-otel-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.AutoCloseable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) OpenTelemetryExporter(io.opentelemetry.sdk.metrics.export.MetricReader)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) void close()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter buildAndStart()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder endpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder header(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder intervalSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder preserveNames(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder protocol(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder registry(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder resourceAttribute(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceInstanceId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceNamespace(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceVersion(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder timeoutSeconds(int)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-pushgateway.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-pushgateway.txt
new file mode 100644
index 000000000..82cd98d0e
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-pushgateway.txt
@@ -0,0 +1,75 @@
+Comparing source compatibility of prometheus-metrics-exporter-pushgateway-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-pushgateway-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.DefaultHttpConnectionFactory  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.exporter.pushgateway.HttpConnectionFactory
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DefaultHttpConnectionFactory()
+	+++  NEW METHOD: PUBLIC(+) java.net.HttpURLConnection create(java.net.URL)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW ENUM: PUBLIC(+) FINAL(+) io.prometheus.metrics.exporter.pushgateway.Format  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.constant.Constable
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: java.lang.Enum
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.exporter.pushgateway.Format PROMETHEUS_PROTOBUF
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.exporter.pushgateway.Format PROMETHEUS_TEXT
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.Format valueOf(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.Format[] values()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.exporter.pushgateway.HttpConnectionFactory  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.net.HttpURLConnection create(java.net.URL)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) void delete()
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void push()
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void push(io.prometheus.metrics.model.registry.Collector)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void push(io.prometheus.metrics.model.registry.MultiCollector)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void pushAdd()
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void pushAdd(io.prometheus.metrics.model.registry.Collector)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void pushAdd(io.prometheus.metrics.model.registry.MultiCollector)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder address(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder basicAuth(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder bearerToken(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder connectionFactory(io.prometheus.metrics.exporter.pushgateway.HttpConnectionFactory)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder connectionTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder escapingScheme(io.prometheus.metrics.config.EscapingScheme)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder format(io.prometheus.metrics.exporter.pushgateway.Format)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder groupingKey(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder instanceIpGroupingKey()
+		+++  NEW EXCEPTION: java.net.UnknownHostException
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder job(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder prometheusTimestampsInMs(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder readTimeout(java.time.Duration)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder registry(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.pushgateway.PushGateway$Builder scheme(io.prometheus.metrics.exporter.pushgateway.Scheme)
++++  NEW ENUM: PUBLIC(+) FINAL(+) io.prometheus.metrics.exporter.pushgateway.Scheme  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.constant.Constable
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: java.lang.Enum
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.exporter.pushgateway.Scheme HTTPS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.exporter.pushgateway.Scheme HTTP
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.Scheme fromString(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.Scheme valueOf(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.exporter.pushgateway.Scheme[] values()
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-servlet-jakarta.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-servlet-jakarta.txt
new file mode 100644
index 000000000..61372aa39
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-servlet-jakarta.txt
@@ -0,0 +1,12 @@
+Comparing source compatibility of prometheus-metrics-exporter-servlet-jakarta-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-servlet-jakarta-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.servlet.jakarta.PrometheusMetricsServlet  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 61.0 <- n.a.
+	+++  NEW INTERFACE: jakarta.servlet.ServletConfig
+	+++  NEW INTERFACE: jakarta.servlet.Servlet
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: jakarta.servlet.http.HttpServlet
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet(io.prometheus.metrics.config.PrometheusProperties, io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet()
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet(io.prometheus.metrics.model.registry.PrometheusRegistry)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-servlet-javax.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-servlet-javax.txt
new file mode 100644
index 000000000..434cfaf65
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exporter-servlet-javax.txt
@@ -0,0 +1,12 @@
+Comparing source compatibility of prometheus-metrics-exporter-servlet-javax-1.6.2-SNAPSHOT.jar against prometheus-metrics-exporter-servlet-javax-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.exporter.servlet.javax.PrometheusMetricsServlet  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: javax.servlet.ServletConfig
+	+++  NEW INTERFACE: javax.servlet.Servlet
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: javax.servlet.http.HttpServlet
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet(io.prometheus.metrics.config.PrometheusProperties, io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusMetricsServlet()
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-formats-shaded.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-formats-shaded.txt
new file mode 100644
index 000000000..2523aafc1
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-formats-shaded.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-formats-1.6.2-SNAPSHOT.jar against prometheus-metrics-exposition-formats-1.6.1.jar
+No changes.
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-formats.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-formats.txt
new file mode 100644
index 000000000..0f04c0d1e
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-formats.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-formats-no-protobuf-1.6.2-SNAPSHOT.jar against prometheus-metrics-exposition-formats-no-protobuf-1.6.1.jar
+No changes.
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-textformats.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-textformats.txt
new file mode 100644
index 000000000..fd61bb649
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-exposition-textformats.txt
@@ -0,0 +1,98 @@
+Comparing source compatibility of prometheus-metrics-exposition-textformats-1.6.2-SNAPSHOT.jar against prometheus-metrics-exposition-textformats-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.expositionformats.ExpositionFormats  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.ExpositionFormatWriter findWriter(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter getOpenMetrics2TextFormatWriter()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter getOpenMetricsTextFormatWriter()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusProtobufWriter getPrometheusProtobufWriter()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter getPrometheusTextFormatWriter()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.ExpositionFormats init()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.ExpositionFormats init(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.ExpositionFormats init(io.prometheus.metrics.config.ExporterProperties)
+		+++  NEW ANNOTATION: java.lang.Deprecated
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.expositionformats.ExpositionFormatWriter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean accepts(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getContentType()
+	+++  NEW METHOD: PUBLIC(+) boolean isAvailable()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toDebugString(io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toDebugString(io.prometheus.metrics.model.snapshots.MetricSnapshots)
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void write(java.io.OutputStream, io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void write(java.io.OutputStream, io.prometheus.metrics.model.snapshots.MetricSnapshots)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.expositionformats.ExpositionFormatWriter
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String CONTENT_TYPE
+	+++  NEW CONSTRUCTOR: PUBLIC(+) OpenMetrics2TextFormatWriter(io.prometheus.metrics.config.OpenMetrics2Properties, boolean, boolean)
+	+++  NEW METHOD: PUBLIC(+) boolean accepts(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter create()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getContentType()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.config.OpenMetrics2Properties getOpenMetrics2Properties()
+	+++  NEW METHOD: PUBLIC(+) void write(java.io.OutputStream, io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter$Builder setCreatedTimestampsEnabled(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter$Builder setExemplarsOnAllMetricTypesEnabled(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter$Builder setOpenMetrics2Properties(io.prometheus.metrics.config.OpenMetrics2Properties)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.expositionformats.ExpositionFormatWriter
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String CONTENT_TYPE
+	+++  NEW CONSTRUCTOR: PUBLIC(+) OpenMetricsTextFormatWriter(boolean, boolean)
+	+++  NEW METHOD: PUBLIC(+) boolean accepts(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter create()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getContentType()
+	+++  NEW METHOD: PUBLIC(+) void write(java.io.OutputStream, io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter$Builder setCreatedTimestampsEnabled(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter$Builder setExemplarsOnAllMetricTypesEnabled(boolean)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusProtobufWriter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.expositionformats.ExpositionFormatWriter
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String CONTENT_TYPE
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusProtobufWriter()
+	+++  NEW METHOD: PUBLIC(+) boolean accepts(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getContentType()
+	+++  NEW METHOD: PUBLIC(+) boolean isAvailable()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toDebugString(io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+	+++  NEW METHOD: PUBLIC(+) void write(java.io.OutputStream, io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.expositionformats.ExpositionFormatWriter
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String CONTENT_TYPE
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusTextFormatWriter(boolean)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) boolean accepts(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter create()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getContentType()
+	+++  NEW METHOD: PUBLIC(+) void write(java.io.OutputStream, io.prometheus.metrics.model.snapshots.MetricSnapshots, io.prometheus.metrics.config.EscapingScheme)
+		+++  NEW EXCEPTION: java.io.IOException
+	+++  NEW METHOD: PUBLIC(+) void writeCreated(java.io.Writer, io.prometheus.metrics.model.snapshots.MetricSnapshot, io.prometheus.metrics.config.EscapingScheme)
+		+++  NEW EXCEPTION: java.io.IOException
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter$Builder setIncludeCreatedTimestamps(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.expositionformats.PrometheusTextFormatWriter$Builder setTimestampsInMs(boolean)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-caffeine.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-caffeine.txt
new file mode 100644
index 000000000..f804dc9ca
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-caffeine.txt
@@ -0,0 +1,23 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-caffeine-1.6.2-SNAPSHOT.jar against prometheus-metrics-instrumentation-caffeine-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.MultiCollector
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CacheMetricsCollector()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) void addCache(java.lang.String, com.github.benmanes.caffeine.cache.Cache<?,?>)
+	+++  NEW METHOD: PUBLIC(+) void addCache(java.lang.String, com.github.benmanes.caffeine.cache.AsyncCache<?,?>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) void clear()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getPrometheusNames()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) com.github.benmanes.caffeine.cache.Cache<?,?> removeCache(java.lang.String)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CacheMetricsCollector$Builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector$Builder collectEvictionWeightAsCounter(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector$Builder collectWeightedSize(boolean)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-dropwizard.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-dropwizard.txt
new file mode 100644
index 000000000..a95df8aae
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-dropwizard.txt
@@ -0,0 +1,19 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-dropwizard-1.6.2-SNAPSHOT.jar against prometheus-metrics-instrumentation-dropwizard-1.6.1.jar
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.MultiCollector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.instrumentation.dropwizard5.internal.AbstractDropwizardExports
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DropwizardExports(com.codahale.metrics.MetricRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DropwizardExports(com.codahale.metrics.MetricRegistry, com.codahale.metrics.MetricFilter)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DropwizardExports(com.codahale.metrics.MetricRegistry, com.codahale.metrics.MetricFilter, io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports$Builder builder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports$Builder customLabelMapper(io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports$Builder dropwizardRegistry(com.codahale.metrics.MetricRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports$Builder invalidMetricHandler(io.prometheus.metrics.instrumentation.dropwizard5.InvalidMetricHandler)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard.DropwizardExports$Builder metricFilter(com.codahale.metrics.MetricFilter)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-dropwizard5.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-dropwizard5.txt
new file mode 100644
index 000000000..e9c13ab17
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-dropwizard5.txt
@@ -0,0 +1,47 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-dropwizard5-1.6.2-SNAPSHOT.jar against prometheus-metrics-instrumentation-dropwizard5-1.6.1.jar
++++* NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.MultiCollector
+	+++  NEW SUPERCLASS: io.prometheus.metrics.instrumentation.dropwizard5.internal.AbstractDropwizardExports
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DropwizardExports(io.dropwizard.metrics5.MetricRegistry, io.dropwizard.metrics5.MetricFilter, io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DropwizardExports(io.dropwizard.metrics5.MetricRegistry)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DropwizardExports(io.dropwizard.metrics5.MetricRegistry, io.dropwizard.metrics5.MetricFilter)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports$Builder builder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports$Builder customLabelMapper(io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports$Builder dropwizardRegistry(io.dropwizard.metrics5.MetricRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports$Builder invalidMetricHandler(io.prometheus.metrics.instrumentation.dropwizard5.InvalidMetricHandler)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard5.DropwizardExports$Builder metricFilter(io.dropwizard.metrics5.MetricFilter)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.instrumentation.dropwizard5.InvalidMetricHandler  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.instrumentation.dropwizard5.InvalidMetricHandler ALWAYS_THROW
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean suppressException(java.lang.String, java.lang.Exception)
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CustomLabelMapper(java.util.List<io.prometheus.metrics.instrumentation.dropwizard5.labels.MapperConfig>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels getLabels(java.lang.String, java.util.List<java.lang.String>, java.util.List<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName(java.lang.String)
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.instrumentation.dropwizard5.labels.MapperConfig  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MapperConfig()
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MapperConfig(java.lang.String, java.lang.String, java.util.Map<java.lang.String,java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object)
+	+++  NEW METHOD: PUBLIC(+) java.util.Map<java.lang.String,java.lang.String> getLabels()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getMatch()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) int hashCode()
+	+++  NEW METHOD: PUBLIC(+) void setLabels(java.util.Map<java.lang.String,java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) void setMatch(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) void setName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-guava.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-guava.txt
new file mode 100644
index 000000000..815196d0e
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-guava.txt
@@ -0,0 +1,13 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-guava-1.6.2-SNAPSHOT.jar against prometheus-metrics-instrumentation-guava-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.guava.CacheMetricsCollector  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.MultiCollector
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CacheMetricsCollector()
+	+++  NEW METHOD: PUBLIC(+) void addCache(java.lang.String, com.google.common.cache.Cache<?,?>)
+	+++  NEW METHOD: PUBLIC(+) void clear()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getPrometheusNames()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) com.google.common.cache.Cache<?,?> removeCache(java.lang.String)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-jvm.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-jvm.txt
new file mode 100644
index 000000000..391bae997
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-instrumentation-jvm.txt
@@ -0,0 +1,124 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-jvm-1.6.2-SNAPSHOT.jar against prometheus-metrics-instrumentation-jvm-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmBufferPoolMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmBufferPoolMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmBufferPoolMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmBufferPoolMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmBufferPoolMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmClassLoadingMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmClassLoadingMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmClassLoadingMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmClassLoadingMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmClassLoadingMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmCompilationMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmCompilationMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmCompilationMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmCompilationMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmCompilationMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmGarbageCollectorMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmGarbageCollectorMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmGarbageCollectorMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmGarbageCollectorMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmGarbageCollectorMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryPoolAllocationMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryPoolAllocationMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryPoolAllocationMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryPoolAllocationMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMemoryPoolAllocationMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) JvmMetrics()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmNativeMemoryMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmNativeMemoryMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmNativeMemoryMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmNativeMemoryMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmNativeMemoryMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmRuntimeInfoMetric  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmRuntimeInfoMetric$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmRuntimeInfoMetric$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmRuntimeInfoMetric$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmRuntimeInfoMetric$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmThreadsMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmThreadsMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmThreadsMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.JvmThreadsMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.JvmThreadsMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.ProcessMetrics  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.ProcessMetrics$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.ProcessMetrics$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.instrumentation.jvm.ProcessMetrics$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.instrumentation.jvm.ProcessMetrics$Builder constLabels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) void register()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.PrometheusRegistry)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-model.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-model.txt
new file mode 100644
index 000000000..98a3e2b0d
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-model.txt
@@ -0,0 +1,600 @@
+Comparing source compatibility of prometheus-metrics-model-1.6.2-SNAPSHOT.jar against prometheus-metrics-model-1.6.1.jar
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.registry.Collector  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.MetricSnapshot collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot collect(io.prometheus.metrics.model.registry.PrometheusScrapeRequest)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot collect(java.util.function.Predicate<java.lang.String>)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot collect(java.util.function.Predicate<java.lang.String>, io.prometheus.metrics.model.registry.PrometheusScrapeRequest)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.Set<java.lang.String> getLabelNames()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata getMetadata()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor getMetricFamilyDescriptor()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getPrometheusName()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.util.function.Predicate
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.util.function.Predicate<java.lang.String> ALLOW_ALL
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) boolean test(java.lang.String)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustBeEqualTo(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustBeEqualTo(java.util.Collection<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustNotBeEqualTo(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustNotBeEqualTo(java.util.Collection<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustNotStartWith(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustNotStartWith(java.util.Collection<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustStartWith(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricNameFilter$Builder nameMustStartWith(java.util.Collection<java.lang.String>)
++++  NEW ENUM: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.constant.Constable
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: java.lang.Enum
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType SUMMARY
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType HISTOGRAM
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType STATESET
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType UNKNOWN
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType INFO
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType COUNTER
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.MetricType GAUGE
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.registry.MetricType valueOf(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.registry.MetricType[] values()
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.registry.MultiCollector  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect(io.prometheus.metrics.model.registry.PrometheusScrapeRequest)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect(java.util.function.Predicate<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect(java.util.function.Predicate<java.lang.String>, io.prometheus.metrics.model.registry.PrometheusScrapeRequest)
+	+++  NEW METHOD: PUBLIC(+) java.util.Set<java.lang.String> getLabelNames(java.lang.String)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata getMetadata(java.lang.String)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor> getMetricFamilyDescriptors()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getMetricType(java.lang.String)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.List<java.lang.String> getPrometheusNames()
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW ANNOTATION: java.lang.FunctionalInterface
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.registry.PrometheusRegistry  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.registry.PrometheusRegistry defaultRegistry
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusRegistry()
+	+++  NEW METHOD: PUBLIC(+) void clear()
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.Collector)
+	+++  NEW METHOD: PUBLIC(+) void register(io.prometheus.metrics.model.registry.MultiCollector)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots scrape()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots scrape(io.prometheus.metrics.model.registry.PrometheusScrapeRequest)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots scrape(java.util.function.Predicate<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots scrape(java.util.function.Predicate<java.lang.String>, io.prometheus.metrics.model.registry.PrometheusScrapeRequest)
+	+++  NEW METHOD: PUBLIC(+) void unregister(io.prometheus.metrics.model.registry.Collector)
+	+++  NEW METHOD: PUBLIC(+) void unregister(io.prometheus.metrics.model.registry.MultiCollector)
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.registry.PrometheusScrapeRequest  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String[] getParameterValues(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getRequestPath()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBucket  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) ClassicHistogramBucket(double, long)
+	+++  NEW METHOD: PUBLIC(+) int compareTo(io.prometheus.metrics.model.snapshots.ClassicHistogramBucket)
+	+++  NEW METHOD: PUBLIC(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) double getUpperBound()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets EMPTY
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) long getCount(int)
+	+++  NEW METHOD: PUBLIC(+) double getUpperBound(int)
+	+++  NEW METHOD: PUBLIC(+) boolean isEmpty()
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.ClassicHistogramBucket> iterator()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets of(java.util.List<java.lang.Double>, java.util.List<? extends java.lang.Number>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets of(double[], java.lang.Number[])
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets of(double[], long[])
+	+++  NEW METHOD: PUBLIC(+) int size()
+	+++  NEW METHOD: PUBLIC(+) java.util.stream.Stream<io.prometheus.metrics.model.snapshots.ClassicHistogramBucket> stream()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets$Builder bucket(double, long)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets build()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CounterSnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.CounterSnapshot$CounterDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.CounterSnapshot$CounterDataPointSnapshot> getDataPoints()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.CounterSnapshot$CounterDataPointSnapshot)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot$CounterDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CounterSnapshot$CounterDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CounterSnapshot$CounterDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar, long, long, boolean)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) CounterSnapshot$CounterDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar, long, long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.CounterSnapshot$CounterDataPointSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar getExemplar()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) double getValue()
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.DataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) long getCreatedTimestampMillis()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels getLabels()
+	+++  NEW METHOD: PUBLIC(+) long getScrapeTimestampMillis()
+	+++  NEW METHOD: PUBLIC(+) boolean hasCreatedTimestamp()
+	+++  NEW METHOD: PUBLIC(+) boolean hasScrapeTimestamp()
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.model.snapshots.DataPointSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	GENERIC TEMPLATES: +++ T:io.prometheus.metrics.model.snapshots.DataPointSnapshot$Builder<T>
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DataPointSnapshot$Builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.DataPointSnapshot$Builder labels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.DataPointSnapshot$Builder scrapeTimestampMillis(long)
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.DistributionDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DataPointSnapshot
+	+++  NEW METHOD: PUBLIC(+) long getCount()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplars getExemplars()
+	+++  NEW METHOD: PUBLIC(+) double getSum()
+	+++  NEW METHOD: PUBLIC(+) boolean hasCount()
+	+++  NEW METHOD: PUBLIC(+) boolean hasSum()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.DuplicateLabelsException  (compatible)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.io.Serializable
+	+++  NEW SUPERCLASS: java.lang.IllegalArgumentException
+	+++  NEW CONSTRUCTOR: PUBLIC(+) DuplicateLabelsException(io.prometheus.metrics.model.snapshots.MetricMetadata, io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels getLabels()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata getMetadata()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String SPAN_ID
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String TRACE_ID
+	+++  NEW CONSTRUCTOR: PUBLIC(+) Exemplar(double, io.prometheus.metrics.model.snapshots.Labels, long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels getLabels()
+	+++  NEW METHOD: PUBLIC(+) long getTimestampMillis()
+	+++  NEW METHOD: PUBLIC(+) double getValue()
+	+++  NEW METHOD: PUBLIC(+) boolean hasTimestamp()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder labels(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder spanId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder timestampMillis(long)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder traceId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar$Builder value(double)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplars  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Exemplars EMPTY
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Exemplars$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar get(int)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar get(double, double)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar getLatest()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.Exemplar> iterator()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Exemplars of(java.util.Collection<io.prometheus.metrics.model.snapshots.Exemplar>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Exemplars of(io.prometheus.metrics.model.snapshots.Exemplar[])
+	+++  NEW METHOD: PUBLIC(+) int size()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Exemplars$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplars build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplars$Builder exemplar(io.prometheus.metrics.model.snapshots.Exemplar)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplars$Builder exemplars(java.util.Collection<io.prometheus.metrics.model.snapshots.Exemplar>)
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) GaugeSnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.GaugeSnapshot$GaugeDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.GaugeSnapshot$GaugeDataPointSnapshot> getDataPoints()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.GaugeSnapshot$GaugeDataPointSnapshot)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot$GaugeDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) GaugeSnapshot$GaugeDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) GaugeSnapshot$GaugeDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.GaugeSnapshot$GaugeDataPointSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar getExemplar()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) double getValue()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) int CLASSIC_HISTOGRAM
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HistogramSnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.HistogramSnapshot$HistogramDataPointSnapshot>)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HistogramSnapshot(boolean, io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.HistogramSnapshot$HistogramDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.HistogramSnapshot$HistogramDataPointSnapshot> getDataPoints()
+	+++  NEW METHOD: PUBLIC(+) boolean isGaugeHistogram()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.HistogramSnapshot$HistogramDataPointSnapshot)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot$Builder gaugeHistogram(boolean)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot$HistogramDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DistributionDataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HistogramSnapshot$HistogramDataPointSnapshot(int, long, double, io.prometheus.metrics.model.snapshots.NativeHistogramBuckets, io.prometheus.metrics.model.snapshots.NativeHistogramBuckets, double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplars, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HistogramSnapshot$HistogramDataPointSnapshot(io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets, int, long, double, io.prometheus.metrics.model.snapshots.NativeHistogramBuckets, io.prometheus.metrics.model.snapshots.NativeHistogramBuckets, double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplars, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HistogramSnapshot$HistogramDataPointSnapshot(io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets, int, long, double, io.prometheus.metrics.model.snapshots.NativeHistogramBuckets, io.prometheus.metrics.model.snapshots.NativeHistogramBuckets, double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplars, long, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) HistogramSnapshot$HistogramDataPointSnapshot(io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets, double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplars, long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.HistogramSnapshot$HistogramDataPointSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets getClassicBuckets()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets getNativeBucketsForNegativeValues()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets getNativeBucketsForPositiveValues()
+	+++  NEW METHOD: PUBLIC(+) int getNativeSchema()
+	+++  NEW METHOD: PUBLIC(+) long getNativeZeroCount()
+	+++  NEW METHOD: PUBLIC(+) double getNativeZeroThreshold()
+	+++  NEW METHOD: PUBLIC(+) boolean hasClassicHistogramData()
+	+++  NEW METHOD: PUBLIC(+) boolean hasNativeHistogramData()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.InfoSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) InfoSnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.InfoSnapshot$InfoDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.InfoSnapshot$InfoDataPointSnapshot> getDataPoints()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.InfoSnapshot$InfoDataPointSnapshot)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot$InfoDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) InfoSnapshot$InfoDataPointSnapshot(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) InfoSnapshot$InfoDataPointSnapshot(io.prometheus.metrics.model.snapshots.Labels, long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.InfoSnapshot$InfoDataPointSnapshot$Builder builder()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Label  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) Label(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) int compareTo(io.prometheus.metrics.model.snapshots.Label)
+	+++  NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getValue()
+	+++  NEW METHOD: PUBLIC(+) int hashCode()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Labels  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Comparable
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Labels EMPTY
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels add(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Labels$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) int compareTo(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) boolean contains(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String get(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName(int)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getPrometheusName(int)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getValue(int)
+	+++  NEW METHOD: PUBLIC(+) int hashCode()
+	+++  NEW METHOD: PUBLIC(+) boolean hasSameNames(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) boolean hasSameValues(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) boolean isEmpty()
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.Label> iterator()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels merge(io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels merge(java.lang.String[], java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Labels of(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Labels of(java.util.List<java.lang.String>, java.util.List<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Labels of(java.lang.String[], java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) int size()
+	+++  NEW METHOD: PUBLIC(+) java.util.stream.Stream<io.prometheus.metrics.model.snapshots.Label> stream()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Labels$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Labels$Builder label(java.lang.String, java.lang.String)
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$CounterBuilder counter(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$GaugeBuilder gauge(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) java.util.Set<java.lang.String> getLabelNames()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata getMetadata()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getPrometheusName()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.registry.MetricType getType()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$HistogramBuilder histogram(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$InfoBuilder info(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor of(io.prometheus.metrics.model.registry.MetricType, io.prometheus.metrics.model.snapshots.MetricMetadata)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor of(io.prometheus.metrics.model.registry.MetricType, io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder<?> of(io.prometheus.metrics.model.registry.MetricType, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$StateSetBuilder stateSet(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$SummaryBuilder summary(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$UnknownBuilder unknown(java.lang.String)
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	GENERIC TEMPLATES: +++ T:io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder<T>
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$Builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder help(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder labelName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder labelNames(java.lang.String[])
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder labelNames(java.util.Collection<java.lang.String>)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder name(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$CounterBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$CounterBuilder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$GaugeBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$GaugeBuilder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$HistogramBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$HistogramBuilder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$InfoBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$InfoBuilder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$InfoBuilder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$StateSetBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$StateSetBuilder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$StateSetBuilder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$SummaryBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$SummaryBuilder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$UnknownBuilder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor$Builder
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricFamilyDescriptor$UnknownBuilder()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricMetadata  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricMetadata(java.lang.String, java.lang.String, java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricMetadata(java.lang.String)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricMetadata(java.lang.String, java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricMetadata(java.lang.String, java.lang.String, java.lang.String, java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricMetadata(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getExpositionBaseName()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getExpositionBasePrometheusName()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getHelp()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getOriginalName()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getPrometheusName()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Unit getUnit()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) boolean hasUnit()
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.MetricSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.util.List<? extends io.prometheus.metrics.model.snapshots.DataPointSnapshot> getDataPoints()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata getMetadata()
++++  NEW CLASS: PUBLIC(+) ABSTRACT(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	GENERIC TEMPLATES: +++ T:io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder<T>
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricSnapshot$Builder()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.model.snapshots.MetricSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder help(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder name(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricSnapshots(java.util.Collection<io.prometheus.metrics.model.snapshots.MetricSnapshot>)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) MetricSnapshots(io.prometheus.metrics.model.snapshots.MetricSnapshot[])
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshot get(int)
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.MetricSnapshot> iterator()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots of(io.prometheus.metrics.model.snapshots.MetricSnapshot[])
+	+++  NEW METHOD: PUBLIC(+) int size()
+	+++  NEW METHOD: PUBLIC(+) java.util.stream.Stream<io.prometheus.metrics.model.snapshots.MetricSnapshot> stream()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots build()
+	+++  NEW METHOD: PUBLIC(+) boolean containsMetricName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots$Builder metricSnapshot(io.prometheus.metrics.model.snapshots.MetricSnapshot)
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBucket  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) NativeHistogramBucket(int, long)
+	+++  NEW METHOD: PUBLIC(+) int getBucketIndex()
+	+++  NEW METHOD: PUBLIC(+) long getCount()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets EMPTY
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) int getBucketIndex(int)
+	+++  NEW METHOD: PUBLIC(+) long getCount(int)
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.NativeHistogramBucket> iterator()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets of(int[], long[])
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets of(java.util.List<java.lang.Integer>, java.util.List<java.lang.Long>)
+	+++  NEW METHOD: PUBLIC(+) int size()
+	+++  NEW METHOD: PUBLIC(+) java.util.stream.Stream<io.prometheus.metrics.model.snapshots.NativeHistogramBucket> stream()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets$Builder bucket(int, long)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.NativeHistogramBuckets build()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.PrometheusNaming  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) PrometheusNaming()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String escapeName(java.lang.String, io.prometheus.metrics.config.EscapingScheme)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) boolean isValidLabelName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) boolean isValidLegacyLabelName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) boolean isValidLegacyMetricName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) boolean isValidMetricName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) boolean isValidUnitName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) boolean needsEscaping(java.lang.String, io.prometheus.metrics.config.EscapingScheme)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String normalizeMetricName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String normalizeMetricName(java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String prometheusName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String sanitizeLabelName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String sanitizeMetricName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String sanitizeMetricName(java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String sanitizeUnitName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String validateMetricName(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.lang.String validateUnitName(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantile  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW CONSTRUCTOR: PUBLIC(+) Quantile(double, double)
+	+++  NEW METHOD: PUBLIC(+) double getQuantile()
+	+++  NEW METHOD: PUBLIC(+) double getValue()
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantiles  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Quantiles EMPTY
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Quantiles$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantile get(int)
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.Quantile> iterator()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Quantiles of(java.util.List<io.prometheus.metrics.model.snapshots.Quantile>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Quantiles of(io.prometheus.metrics.model.snapshots.Quantile[])
+	+++  NEW METHOD: PUBLIC(+) int size()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.Quantiles$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantiles build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantiles$Builder quantile(io.prometheus.metrics.model.snapshots.Quantile)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantiles$Builder quantile(double, double)
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) StateSetSnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.StateSetSnapshot$StateSetDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.StateSetSnapshot$StateSetDataPointSnapshot> getDataPoints()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.StateSetSnapshot$StateSetDataPointSnapshot)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$State  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName()
+	+++  NEW METHOD: PUBLIC(+) boolean isTrue()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$StateSetDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: java.lang.Iterable
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) StateSetSnapshot$StateSetDataPointSnapshot(java.lang.String[], boolean[], io.prometheus.metrics.model.snapshots.Labels, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) StateSetSnapshot$StateSetDataPointSnapshot(java.lang.String[], boolean[], io.prometheus.metrics.model.snapshots.Labels)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.StateSetSnapshot$StateSetDataPointSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.lang.String getName(int)
+	+++  NEW METHOD: PUBLIC(+) boolean isTrue(int)
+	+++  NEW METHOD: PUBLIC(+) java.util.Iterator<io.prometheus.metrics.model.snapshots.StateSetSnapshot$State> iterator()
+	+++  NEW METHOD: PUBLIC(+) int size()
+	+++  NEW METHOD: PUBLIC(+) java.util.stream.Stream<io.prometheus.metrics.model.snapshots.StateSetSnapshot$State> stream()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.SummarySnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) SummarySnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.SummarySnapshot$SummaryDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.SummarySnapshot$SummaryDataPointSnapshot> getDataPoints()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.SummarySnapshot$SummaryDataPointSnapshot)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.SummarySnapshot$SummaryDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DistributionDataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) SummarySnapshot$SummaryDataPointSnapshot(long, double, io.prometheus.metrics.model.snapshots.Quantiles, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplars, long, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) SummarySnapshot$SummaryDataPointSnapshot(long, double, io.prometheus.metrics.model.snapshots.Quantiles, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplars, long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.SummarySnapshot$SummaryDataPointSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Quantiles getQuantiles()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit BYTES
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit GRAMS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit METERS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit VOLTS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit SECONDS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit RATIO
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit CELSIUS
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit JOULES
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.Unit AMPERES
+	+++  NEW CONSTRUCTOR: PUBLIC(+) Unit(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) boolean equals(java.lang.Object)
+	+++  NEW METHOD: PUBLIC(+) int hashCode()
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) double kiloBytesToBytes(double)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) double millisToSeconds(long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) double nanosToSeconds(long)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) double secondsToMillis(double)
+	+++  NEW METHOD: PUBLIC(+) java.lang.String toString()
++++  NEW CLASS: PUBLIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) UnknownSnapshot(io.prometheus.metrics.model.snapshots.MetricMetadata, java.util.Collection<io.prometheus.metrics.model.snapshots.UnknownSnapshot$UnknownDataPointSnapshot>)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) java.util.List<io.prometheus.metrics.model.snapshots.UnknownSnapshot$UnknownDataPointSnapshot> getDataPoints()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.MetricSnapshot$Builder
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot$Builder dataPoint(io.prometheus.metrics.model.snapshots.UnknownSnapshot$UnknownDataPointSnapshot)
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot$UnknownDataPointSnapshot  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: io.prometheus.metrics.model.snapshots.DataPointSnapshot
+	+++  NEW CONSTRUCTOR: PUBLIC(+) UnknownSnapshot$UnknownDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar, long)
+	+++  NEW CONSTRUCTOR: PUBLIC(+) UnknownSnapshot$UnknownDataPointSnapshot(double, io.prometheus.metrics.model.snapshots.Labels, io.prometheus.metrics.model.snapshots.Exemplar)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.UnknownSnapshot$UnknownDataPointSnapshot$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.Exemplar getExemplar()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) double getValue()
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-simpleclient-bridge.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-simpleclient-bridge.txt
new file mode 100644
index 000000000..bb1fb6594
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-simpleclient-bridge.txt
@@ -0,0 +1,16 @@
+Comparing source compatibility of prometheus-metrics-simpleclient-bridge-1.6.2-SNAPSHOT.jar against prometheus-metrics-simpleclient-bridge-1.6.1.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW INTERFACE: io.prometheus.metrics.model.registry.MultiCollector
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector$Builder builder(io.prometheus.metrics.config.PrometheusProperties)
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector$Builder builder()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricSnapshots collect()
++++  NEW CLASS: PUBLIC(+) STATIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector$Builder collectorRegistry(io.prometheus.client.CollectorRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector register()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.simpleclient.bridge.SimpleclientCollector register(io.prometheus.metrics.model.registry.PrometheusRegistry)
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-common.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-common.txt
new file mode 100644
index 000000000..6782f73f2
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-common.txt
@@ -0,0 +1,13 @@
+Comparing source compatibility of prometheus-metrics-tracer-common-1.6.2-SNAPSHOT.jar against prometheus-metrics-tracer-common-1.6.1.jar
++++  NEW INTERFACE: PUBLIC(+) ABSTRACT(+) io.prometheus.metrics.tracer.common.SpanContext  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String EXEMPLAR_ATTRIBUTE_NAME
+	+++  NEW FIELD: PUBLIC(+) STATIC(+) FINAL(+) java.lang.String EXEMPLAR_ATTRIBUTE_VALUE
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getCurrentSpanId()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) java.lang.String getCurrentTraceId()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) boolean isCurrentSpanSampled()
+	+++  NEW METHOD: PUBLIC(+) ABSTRACT(+) void markCurrentSpanAsExemplar()
+
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-initializer.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-initializer.txt
new file mode 100644
index 000000000..2d9b9b09d
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-initializer.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-initializer-1.6.2-SNAPSHOT.jar against prometheus-metrics-tracer-initializer-1.6.1.jar
+No changes.
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-otel-agent.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-otel-agent.txt
new file mode 100644
index 000000000..c44f14c31
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-otel-agent.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-otel-agent-1.6.2-SNAPSHOT.jar against prometheus-metrics-tracer-otel-agent-1.6.1.jar
+No changes.
diff --git a/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-otel.txt b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-otel.txt
new file mode 100644
index 000000000..b6419eebe
--- /dev/null
+++ b/docs/apidiffs/1.7.0_vs_1.6.1/prometheus-metrics-tracer-otel.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-otel-1.6.2-SNAPSHOT.jar against prometheus-metrics-tracer-otel-1.6.1.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-annotations.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-annotations.txt
new file mode 100644
index 000000000..36053089a
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-annotations.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-annotations-1.7.1-SNAPSHOT.jar against prometheus-metrics-annotations-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-config.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-config.txt
new file mode 100644
index 000000000..516d53a00
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-config.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-config-1.7.1-SNAPSHOT.jar against prometheus-metrics-config-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-core.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-core.txt
new file mode 100644
index 000000000..fa164a17e
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-core.txt
@@ -0,0 +1,19 @@
+Comparing source compatibility of prometheus-metrics-core-1.7.1-SNAPSHOT.jar against prometheus-metrics-core-1.7.0.jar
++++  NEW CLASS: PUBLIC(+) io.prometheus.metrics.core.exemplars.ExemplarLabelsSupplier  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) java.util.function.Supplier<io.prometheus.metrics.model.snapshots.Labels> getExemplarLabelsSupplier()
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) void setExemplarLabelsSupplier(java.util.function.Supplier<io.prometheus.metrics.model.snapshots.Labels>)
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.core.exemplars.ExemplarSampler  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW CONSTRUCTOR: PUBLIC(+) ExemplarSampler(io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig, io.prometheus.metrics.tracer.common.SpanContext, java.util.function.Supplier<io.prometheus.metrics.model.snapshots.Labels>)
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.core.metrics.Counter  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.core.metrics.Gauge  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.core.metrics.Histogram  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.core.metrics.Summary  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-common.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-common.txt
new file mode 100644
index 000000000..b88c7d665
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-common.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-common-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-common-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-httpserver.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-httpserver.txt
new file mode 100644
index 000000000..805828aef
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-httpserver.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-httpserver-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-httpserver-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt
new file mode 100644
index 000000000..7f7163856
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-otel-agent-resources-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-otel-agent-resources-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry-shaded.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry-shaded.txt
new file mode 100644
index 000000000..543c8e67e
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry-shaded.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry.txt
new file mode 100644
index 000000000..764881093
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-opentelemetry.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-no-otel-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-no-otel-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-pushgateway.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-pushgateway.txt
new file mode 100644
index 000000000..4a4595d9c
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-pushgateway.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-pushgateway-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-pushgateway-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-servlet-jakarta.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-servlet-jakarta.txt
new file mode 100644
index 000000000..5c8102616
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-servlet-jakarta.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-servlet-jakarta-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-servlet-jakarta-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-servlet-javax.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-servlet-javax.txt
new file mode 100644
index 000000000..397f97388
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exporter-servlet-javax.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-servlet-javax-1.7.1-SNAPSHOT.jar against prometheus-metrics-exporter-servlet-javax-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-formats-shaded.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-formats-shaded.txt
new file mode 100644
index 000000000..379ca0c42
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-formats-shaded.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-formats-1.7.1-SNAPSHOT.jar against prometheus-metrics-exposition-formats-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-formats.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-formats.txt
new file mode 100644
index 000000000..c8a2300d8
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-formats.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-formats-no-protobuf-1.7.1-SNAPSHOT.jar against prometheus-metrics-exposition-formats-no-protobuf-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-textformats.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-textformats.txt
new file mode 100644
index 000000000..df03a5870
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-exposition-textformats.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-textformats-1.7.1-SNAPSHOT.jar against prometheus-metrics-exposition-textformats-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-caffeine.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-caffeine.txt
new file mode 100644
index 000000000..7eb8a50a8
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-caffeine.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-caffeine-1.7.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-caffeine-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-dropwizard.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-dropwizard.txt
new file mode 100644
index 000000000..9c01af3a8
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-dropwizard.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-dropwizard-1.7.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-dropwizard-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-dropwizard5.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-dropwizard5.txt
new file mode 100644
index 000000000..a2b6ad468
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-dropwizard5.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-dropwizard5-1.7.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-dropwizard5-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-guava.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-guava.txt
new file mode 100644
index 000000000..371d0cb3b
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-guava.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-guava-1.7.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-guava-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-jvm.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-jvm.txt
new file mode 100644
index 000000000..bc37dda75
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-instrumentation-jvm.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-jvm-1.7.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-jvm-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-model.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-model.txt
new file mode 100644
index 000000000..f0ba4c4e8
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-model.txt
@@ -0,0 +1,17 @@
+Comparing source compatibility of prometheus-metrics-model-1.7.1-SNAPSHOT.jar against prometheus-metrics-model-1.7.0.jar
+***  MODIFIED CLASS: PUBLIC FINAL io.prometheus.metrics.model.snapshots.MetricMetadata  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	===  UNCHANGED CONSTRUCTOR: PUBLIC MetricMetadata(java.lang.String, java.lang.String, java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	===  UNCHANGED CONSTRUCTOR: PUBLIC MetricMetadata(java.lang.String, java.lang.String, java.lang.String, java.lang.String, io.prometheus.metrics.model.snapshots.Unit)
+		+++  NEW ANNOTATION: java.lang.Deprecated
+	+++  NEW METHOD: PUBLIC(+) STATIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata$Builder builder()
++++  NEW CLASS: PUBLIC(+) STATIC(+) FINAL(+) io.prometheus.metrics.model.snapshots.MetricMetadata$Builder  (not serializable)
+	+++  CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+	+++  NEW SUPERCLASS: java.lang.Object
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata build()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata$Builder counterSuffix(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata$Builder help(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata$Builder name(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.model.snapshots.MetricMetadata$Builder unit(io.prometheus.metrics.model.snapshots.Unit)
+
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-simpleclient-bridge.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-simpleclient-bridge.txt
new file mode 100644
index 000000000..9c2f8993d
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-simpleclient-bridge.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-simpleclient-bridge-1.7.1-SNAPSHOT.jar against prometheus-metrics-simpleclient-bridge-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-common.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-common.txt
new file mode 100644
index 000000000..260b1e4fb
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-common.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-common-1.7.1-SNAPSHOT.jar against prometheus-metrics-tracer-common-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-initializer.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-initializer.txt
new file mode 100644
index 000000000..7ffd7032c
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-initializer.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-initializer-1.7.1-SNAPSHOT.jar against prometheus-metrics-tracer-initializer-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-otel-agent.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-otel-agent.txt
new file mode 100644
index 000000000..a29c989fb
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-otel-agent.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-otel-agent-1.7.1-SNAPSHOT.jar against prometheus-metrics-tracer-otel-agent-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-otel.txt b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-otel.txt
new file mode 100644
index 000000000..3e6d87392
--- /dev/null
+++ b/docs/apidiffs/1.8.0_vs_1.7.0/prometheus-metrics-tracer-otel.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-otel-1.7.1-SNAPSHOT.jar against prometheus-metrics-tracer-otel-1.7.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-annotations.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-annotations.txt
new file mode 100644
index 000000000..a7fe17c13
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-annotations.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-annotations-1.8.1-SNAPSHOT.jar against prometheus-metrics-annotations-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-config.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-config.txt
new file mode 100644
index 000000000..60dad6c1f
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-config.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-config-1.8.1-SNAPSHOT.jar against prometheus-metrics-config-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-core.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-core.txt
new file mode 100644
index 000000000..ffb4a1d52
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-core.txt
@@ -0,0 +1,4 @@
+Comparing source compatibility of prometheus-metrics-core-1.8.1-SNAPSHOT.jar against prometheus-metrics-core-1.8.0.jar
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.core.exemplars.ExemplarSampler  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-common.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-common.txt
new file mode 100644
index 000000000..daa5ef822
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-common.txt
@@ -0,0 +1,4 @@
+Comparing source compatibility of prometheus-metrics-exporter-common-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-common-1.8.0.jar
+***  MODIFIED CLASS: PUBLIC io.prometheus.metrics.exporter.common.PrometheusScrapeHandler  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-httpserver.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-httpserver.txt
new file mode 100644
index 000000000..17fccaa45
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-httpserver.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-httpserver-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-httpserver-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt
new file mode 100644
index 000000000..10f0cbe92
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry-otel-agent-resources.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-otel-agent-resources-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-otel-agent-resources-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry-shaded.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry-shaded.txt
new file mode 100644
index 000000000..1b6d81f72
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry-shaded.txt
@@ -0,0 +1,20 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-1.8.0.jar
+***! MODIFIED CLASS: PUBLIC io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	---! REMOVED CONSTRUCTOR: PUBLIC(-) OpenTelemetryExporter(io.prometheus.metrics.shaded.io_opentelemetry_2_28_1_alpha.sdk.metrics.export.MetricReader)
+***  MODIFIED CLASS: PUBLIC STATIC io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter buildAndStart()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder endpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder header(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder intervalSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder preserveNames(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder protocol(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder registry(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder resourceAttribute(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceInstanceId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceNamespace(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceVersion(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder timeoutSeconds(int)
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry.txt
new file mode 100644
index 000000000..d0177b813
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-opentelemetry.txt
@@ -0,0 +1,20 @@
+Comparing source compatibility of prometheus-metrics-exporter-opentelemetry-no-otel-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-opentelemetry-no-otel-1.8.0.jar
+***! MODIFIED CLASS: PUBLIC io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	---! REMOVED CONSTRUCTOR: PUBLIC(-) OpenTelemetryExporter(io.opentelemetry.sdk.metrics.export.MetricReader)
+***  MODIFIED CLASS: PUBLIC STATIC io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter buildAndStart()
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder endpoint(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder header(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder intervalSeconds(int)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder preserveNames(boolean)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder protocol(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder registry(io.prometheus.metrics.model.registry.PrometheusRegistry)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder resourceAttribute(java.lang.String, java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceInstanceId(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceName(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceNamespace(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder serviceVersion(java.lang.String)
+	+++  NEW METHOD: PUBLIC(+) io.prometheus.metrics.exporter.opentelemetry.OpenTelemetryExporter$Builder timeoutSeconds(int)
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-pushgateway.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-pushgateway.txt
new file mode 100644
index 000000000..9d500f981
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-pushgateway.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-pushgateway-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-pushgateway-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-servlet-jakarta.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-servlet-jakarta.txt
new file mode 100644
index 000000000..324db2bc5
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-servlet-jakarta.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-servlet-jakarta-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-servlet-jakarta-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-servlet-javax.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-servlet-javax.txt
new file mode 100644
index 000000000..38e76eeb4
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exporter-servlet-javax.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exporter-servlet-javax-1.8.1-SNAPSHOT.jar against prometheus-metrics-exporter-servlet-javax-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-formats-shaded.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-formats-shaded.txt
new file mode 100644
index 000000000..a2c9bee8f
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-formats-shaded.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-formats-1.8.1-SNAPSHOT.jar against prometheus-metrics-exposition-formats-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-formats.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-formats.txt
new file mode 100644
index 000000000..8dcdc54e9
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-formats.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-formats-no-protobuf-1.8.1-SNAPSHOT.jar against prometheus-metrics-exposition-formats-no-protobuf-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-textformats.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-textformats.txt
new file mode 100644
index 000000000..d3e0a2581
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-exposition-textformats.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-exposition-textformats-1.8.1-SNAPSHOT.jar against prometheus-metrics-exposition-textformats-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-caffeine.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-caffeine.txt
new file mode 100644
index 000000000..2745dbce5
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-caffeine.txt
@@ -0,0 +1,6 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-caffeine-1.8.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-caffeine-1.8.0.jar
+===  UNCHANGED CLASS: PUBLIC io.prometheus.metrics.instrumentation.caffeine.CacheMetricsCollector  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	===  UNCHANGED METHOD: PUBLIC com.github.benmanes.caffeine.cache.Cache<?,?><?,?> removeCache(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-dropwizard.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-dropwizard.txt
new file mode 100644
index 000000000..f995c7443
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-dropwizard.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-dropwizard-1.8.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-dropwizard-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-dropwizard5.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-dropwizard5.txt
new file mode 100644
index 000000000..ebd5b7f56
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-dropwizard5.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-dropwizard5-1.8.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-dropwizard5-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-guava.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-guava.txt
new file mode 100644
index 000000000..bb87fbec9
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-guava.txt
@@ -0,0 +1,6 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-guava-1.8.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-guava-1.8.0.jar
+===  UNCHANGED CLASS: PUBLIC io.prometheus.metrics.instrumentation.guava.CacheMetricsCollector  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+	===  UNCHANGED METHOD: PUBLIC com.google.common.cache.Cache<?,?><?,?> removeCache(java.lang.String)
+		+++  NEW ANNOTATION: javax.annotation.Nullable
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-jvm.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-jvm.txt
new file mode 100644
index 000000000..9160a6312
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-instrumentation-jvm.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-instrumentation-jvm-1.8.1-SNAPSHOT.jar against prometheus-metrics-instrumentation-jvm-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-model.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-model.txt
new file mode 100644
index 000000000..d298829ca
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-model.txt
@@ -0,0 +1,4 @@
+Comparing source compatibility of prometheus-metrics-model-1.8.1-SNAPSHOT.jar against prometheus-metrics-model-1.8.0.jar
+***  MODIFIED CLASS: PUBLIC FINAL io.prometheus.metrics.model.snapshots.Labels  (not serializable)
+	===  CLASS FILE FORMAT VERSION: 52.0 <- 52.0
+
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-simpleclient-bridge.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-simpleclient-bridge.txt
new file mode 100644
index 000000000..28f5e87ab
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-simpleclient-bridge.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-simpleclient-bridge-1.8.1-SNAPSHOT.jar against prometheus-metrics-simpleclient-bridge-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-common.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-common.txt
new file mode 100644
index 000000000..720c4c2c8
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-common.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-common-1.8.1-SNAPSHOT.jar against prometheus-metrics-tracer-common-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-initializer.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-initializer.txt
new file mode 100644
index 000000000..82cd884d7
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-initializer.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-initializer-1.8.1-SNAPSHOT.jar against prometheus-metrics-tracer-initializer-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-otel-agent.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-otel-agent.txt
new file mode 100644
index 000000000..c1ac9275d
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-otel-agent.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-otel-agent-1.8.1-SNAPSHOT.jar against prometheus-metrics-tracer-otel-agent-1.8.0.jar
+No changes.
diff --git a/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-otel.txt b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-otel.txt
new file mode 100644
index 000000000..a95f29ea4
--- /dev/null
+++ b/docs/apidiffs/current_vs_latest/prometheus-metrics-tracer-otel.txt
@@ -0,0 +1,2 @@
+Comparing source compatibility of prometheus-metrics-tracer-otel-1.8.1-SNAPSHOT.jar against prometheus-metrics-tracer-otel-1.8.0.jar
+No changes.
diff --git a/docs/content/_index.md b/docs/content/_index.md
index 3b8966cf3..c449482f3 100644
--- a/docs/content/_index.md
+++ b/docs/content/_index.md
@@ -13,6 +13,8 @@ The main new features of the 1.0.0 release are:
 - **Runtime configuration:** Configure metrics, exporters, and more at runtime using a properties
   file or system properties.
 
+<!-- markdownlint-disable MD036 -->
+
 **Documentation and Examples**
 
 In addition to this documentation page we created an
@@ -30,7 +32,7 @@ synchronization. See Javadoc comments in
 **More Info**
 
 The Grafana Labs Blog has a post
-[Introducing the Prometheus Java Client 1.0.0](https://grafana.com/blog/2023/09/27/introducing-the-prometheus-java-client-1.0.0/) <!-- editorconfig-checker-disable-line -->
+[Introducing the Prometheus Java Client 1.0.0](https://grafana.com/blog/2023/09/27/introducing-the-prometheus-java-client-1-0-0/)
 with a good overview of the release.
 
 There will also be a presentation at the [PromCon](https://promcon.io) conference on 29 Sep 2023.
@@ -39,6 +41,8 @@ or watch the recording on YouTube.
 
 **For users of the 0.16.0 version and older**
 
+<!-- markdownlint-enable MD036 -->
+
 Updating to the 1.0.0 version is a breaking change. However, there's a
 `prometheus-metrics-simpleclient-bridge` module available that allows you to use your existing
 simpleclient 0.16.0 metrics with the new 1.0.0 `PrometheusRegistry`.
diff --git a/docs/content/config/config.md b/docs/content/config/config.md
index deceae000..d3110939f 100644
--- a/docs/content/config/config.md
+++ b/docs/content/config/config.md
@@ -9,21 +9,21 @@ The Prometheus metrics library provides multiple options how to override configu
 
 - Properties file
 - System properties
-
-Future releases will add more options, like configuration via environment variables.
+- Environment variables
 
 Example:
 
 ```properties
-io.prometheus.exporter.httpServer.port=9401
+io.prometheus.exporter.http_server.port=9401
 ```
 
 The property above changes the port for the
 [HTTPServer exporter]({{< relref "/exporters/httpserver.md" >}}) to _9401_.
 
-- Properties file: Add the line above to the properties file.
-- System properties: Use the command line parameter `-Dio.prometheus.exporter.httpServer.port=9401`
-- when starting your application.
+- **Properties file**: Add the line above to the properties file.
+- **System properties**: Use the command line parameter
+  `-Dio.prometheus.exporter.http_server.port=9401` when starting your application.
+- **Environment variables**: Set `IO_PROMETHEUS_EXPORTER_HTTP_SERVER_PORT=9401`
 
 ## Location of the Properties File
 
@@ -34,29 +34,63 @@ The properties file is searched in the following locations:
 - System property `-Dprometheus.config=/path/to/prometheus.properties`.
 - Environment variable `PROMETHEUS_CONFIG=/path/to/prometheus.properties`.
 
-## Metrics Properties
+## Property Naming Conventions
+
+Properties use **snake_case** format with underscores separating words
+(e.g., `http_server`, `exemplars_enabled`).
+
+For backward compatibility, camelCase property names are also supported in
+properties files and system properties, but snake_case is the preferred format.
+
+### Environment Variables
+
+Environment variables follow standard conventions:
+
+- All uppercase letters: `IO_PROMETHEUS_EXPORTER_HTTP_SERVER_PORT`
+- Underscores for all separators (both package and word boundaries)
+- Prefix must be `IO_PROMETHEUS`
 
-<!-- editorconfig-checker-disable -->
+The library automatically converts environment variables to the correct property format.
 
-| Name                                                      | Javadoc                                                                                                                                                                         | Note    |
-| --------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| io.prometheus.metrics.exemplarsEnabled                    | [Counter.Builder.withExemplars()](</client_java/api/io/prometheus/metrics/core/metrics/Counter.Builder.html#withExemplars()>)                                                   | (1) (2) |
-| io.prometheus.metrics.histogramNativeOnly                 | [Histogram.Builder.nativeOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeOnly()>)                                                     | (2)     |
-| io.prometheus.metrics.histogramClassicOnly                | [Histogram.Builder.classicOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#classicOnly()>)                                                   | (2)     |
-| io.prometheus.metrics.histogramClassicUpperBounds         | [Histogram.Builder.classicUpperBounds()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#classicUpperBounds(double...)>)                            | (3)     |
-| io.prometheus.metrics.histogramNativeInitialSchema        | [Histogram.Builder.nativeInitialSchema()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeInitialSchema(int)>)                                |         |
-| io.prometheus.metrics.histogramNativeMinZeroThreshold     | [Histogram.Builder.nativeMinZeroThreshold()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeMinZeroThreshold(double)>)                       |         |
-| io.prometheus.metrics.histogramNativeMaxZeroThreshold     | [Histogram.Builder.nativeMaxZeroThreshold()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeMaxZeroThreshold(double)>)                       |         |
-| io.prometheus.metrics.histogramNativeMaxNumberOfBuckets   | [Histogram.Builder.nativeMaxNumberOfBuckets()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeMaxNumberOfBuckets(int)>)                      |         |
-| io.prometheus.metrics.histogramNativeResetDurationSeconds | [Histogram.Builder.nativeResetDuration()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeResetDuration(long,java.util.concurrent.TimeUnit)>) |         |
-| io.prometheus.metrics.summaryQuantiles                    | [Summary.Builder.quantile(double)](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#quantile(double)>)                                                 | (4)     |
-| io.prometheus.metrics.summaryQuantileErrors               | [Summary.Builder.quantile(double, double)](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#quantile(double,double)>)                                  | (5)     |
-| io.prometheus.metrics.summaryMaxAgeSeconds                | [Summary.Builder.maxAgeSeconds()](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#maxAgeSeconds(long)>)                                               |         |
-| io.prometheus.metrics.summaryNumberOfAgeBuckets           | [Summary.Builder.numberOfAgeBuckets()](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#numberOfAgeBuckets(int)>)                                      |         |
+**Examples:**
 
-<!-- editorconfig-checker-enable -->
+| Environment Variable                          | Property Equivalent                           |
+| --------------------------------------------- | --------------------------------------------- |
+| `IO_PROMETHEUS_METRICS_EXEMPLARS_ENABLED`     | `io.prometheus.metrics.exemplars_enabled`     |
+| `IO_PROMETHEUS_EXPORTER_HTTP_SERVER_PORT`     | `io.prometheus.exporter.http_server.port`     |
+| `IO_PROMETHEUS_METRICS_HISTOGRAM_NATIVE_ONLY` | `io.prometheus.metrics.histogram_native_only` |
 
-**Notes**
+### Property Precedence
+
+When the same property is defined in multiple sources, the following precedence order applies
+(highest to lowest):
+
+1. **External properties** (passed explicitly via API)
+2. **Environment variables**
+3. **System properties** (command line `-D` flags)
+4. **Properties file** (from file or classpath)
+
+## Metrics Properties
+
+| Name                                                          | Javadoc                                                                                                                                                                         | Note    |
+| ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| io.prometheus.metrics.exemplars_enabled                       | [Counter.Builder.withExemplars()](</client_java/api/io/prometheus/metrics/core/metrics/Counter.Builder.html#withExemplars()>)                                                   | (1) (2) |
+| io.prometheus.metrics.histogram_native_only                   | [Histogram.Builder.nativeOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeOnly()>)                                                     | (2)     |
+| io.prometheus.metrics.histogram_classic_only                  | [Histogram.Builder.classicOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#classicOnly()>)                                                   | (2)     |
+| io.prometheus.metrics.histogram_classic_upper_bounds          | [Histogram.Builder.classicUpperBounds()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#classicUpperBounds(double...)>)                            | (3)     |
+| io.prometheus.metrics.histogram_native_initial_schema         | [Histogram.Builder.nativeInitialSchema()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeInitialSchema(int)>)                                |         |
+| io.prometheus.metrics.histogram_native_min_zero_threshold     | [Histogram.Builder.nativeMinZeroThreshold()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeMinZeroThreshold(double)>)                       |         |
+| io.prometheus.metrics.histogram_native_max_zero_threshold     | [Histogram.Builder.nativeMaxZeroThreshold()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeMaxZeroThreshold(double)>)                       |         |
+| io.prometheus.metrics.histogram_native_max_number_of_buckets  | [Histogram.Builder.nativeMaxNumberOfBuckets()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeMaxNumberOfBuckets(int)>)                      |         |
+| io.prometheus.metrics.histogram_native_reset_duration_seconds | [Histogram.Builder.nativeResetDuration()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeResetDuration(long,java.util.concurrent.TimeUnit)>) |         |
+| io.prometheus.metrics.summary_quantiles                       | [Summary.Builder.quantile(double)](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#quantile(double)>)                                                 | (4)     |
+| io.prometheus.metrics.summary_quantile_errors                 | [Summary.Builder.quantile(double, double)](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#quantile(double,double)>)                                  | (5)     |
+| io.prometheus.metrics.summary_max_age_seconds                 | [Summary.Builder.maxAgeSeconds()](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#maxAgeSeconds(long)>)                                               |         |
+| io.prometheus.metrics.summary_number_of_age_buckets           | [Summary.Builder.numberOfAgeBuckets()](</client_java/api/io/prometheus/metrics/core/metrics/Summary.Builder.html#numberOfAgeBuckets(int)>)                                      |         |
+
+### Notes
+
+<!-- markdownlint-disable MD033 -->
 
 (1) _withExemplars()_ and _withoutExemplars()_ are available for all metric types,
 not just for counters<br>
@@ -64,20 +98,22 @@ not just for counters<br>
 (3) Comma-separated list. Example: `.005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10`.<br>
 (4) Comma-separated list. Example: `0.5, 0.95, 0.99`.<br>
 (5) Comma-separated list. If specified, the list must have the same length as
-`io.prometheus.metrics.summaryQuantiles`. Example: `0.01, 0.005, 0.005`.
+`io.prometheus.metrics.summary_quantiles`. Example: `0.01, 0.005, 0.005`.
+
+<!-- markdownlint-enable MD033 -->
 
 There's one special feature about metric properties: You can set a property for one specific
 metric only by specifying the metric name. Example:
 Let's say you have a histogram named `latency_seconds`.
 
 ```properties
-io.prometheus.metrics.histogramClassicUpperBounds=0.2, 0.4, 0.8, 1.0
+io.prometheus.metrics.histogram_classic_upper_bounds=0.2, 0.4, 0.8, 1.0
 ```
 
 The line above sets histogram buckets for all histograms. However:
 
 ```properties
-io.prometheus.metrics.latency_seconds.histogramClassicUpperBounds=0.2, 0.4, 0.8, 1.0
+io.prometheus.metrics.latency_seconds.histogram_classic_upper_bounds=0.2, 0.4, 0.8, 1.0
 ```
 
 The line above sets histogram buckets only for the histogram named `latency_seconds`.
@@ -86,41 +122,45 @@ This works for all Metrics properties.
 
 ## Exemplar Properties
 
-<!-- editorconfig-checker-disable -->
-
-| Name                                               | Javadoc                                                                                                                                                         | Note |
-| -------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
-| io.prometheus.exemplars.minRetentionPeriodSeconds  | [ExemplarsProperties.getMinRetentionPeriodSeconds()](</client_java/api/io/prometheus/metrics/config/ExemplarsProperties.html#getMinRetentionPeriodSeconds()>)   |      |
-| io.prometheus.exemplars.maxRetentionPeriodSeconds  | [ExemplarsProperties.getMaxRetentionPeriodSeconds()](</client_java/api/io/prometheus/metrics/config/ExemplarsProperties.html#getMaxRetentionPeriodSeconds()>)   |      |
-| io.prometheus.exemplars.sampleIntervalMilliseconds | [ExemplarsProperties.getSampleIntervalMilliseconds()](</client_java/api/io/prometheus/metrics/config/ExemplarsProperties.html#getSampleIntervalMilliseconds()>) |      |
-
-<!-- editorconfig-checker-enable -->
+| Name                                                 | Javadoc                                                                                                                                                         | Note |
+| ---------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
+| io.prometheus.exemplars.min_retention_period_seconds | [ExemplarsProperties.getMinRetentionPeriodSeconds()](</client_java/api/io/prometheus/metrics/config/ExemplarsProperties.html#getMinRetentionPeriodSeconds()>)   |      |
+| io.prometheus.exemplars.max_retention_period_seconds | [ExemplarsProperties.getMaxRetentionPeriodSeconds()](</client_java/api/io/prometheus/metrics/config/ExemplarsProperties.html#getMaxRetentionPeriodSeconds()>)   |      |
+| io.prometheus.exemplars.sample_interval_milliseconds | [ExemplarsProperties.getSampleIntervalMilliseconds()](</client_java/api/io/prometheus/metrics/config/ExemplarsProperties.html#getSampleIntervalMilliseconds()>) |      |
 
 ## Exporter Properties
 
-<!-- editorconfig-checker-disable -->
+| Name                                                 | Javadoc                                                                                                                                                     | Note |
+| ---------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
+| io.prometheus.exporter.include_created_timestamps    | [ExporterProperties.getIncludeCreatedTimestamps()](</client_java/api/io/prometheus/metrics/config/ExporterProperties.html#getIncludeCreatedTimestamps()>)   | (1)  |
+| io.prometheus.exporter.exemplars_on_all_metric_types | [ExporterProperties.getExemplarsOnAllMetricTypes()](</client_java/api/io/prometheus/metrics/config/ExporterProperties.html#getExemplarsOnAllMetricTypes()>) | (1)  |
 
-| Name                                             | Javadoc                                                                                                                                                     | Note |
-| ------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
-| io.prometheus.exporter.includeCreatedTimestamps  | [ExporterProperties.getIncludeCreatedTimestamps()](</client_java/api/io/prometheus/metrics/config/ExporterProperties.html#getIncludeCreatedTimestamps()>)   | (1)  |
-| io.prometheus.exporter.exemplarsOnAllMetricTypes | [ExporterProperties.getExemplarsOnAllMetricTypes()](</client_java/api/io/prometheus/metrics/config/ExporterProperties.html#getExemplarsOnAllMetricTypes()>) | (1)  |
+(1) Boolean value, `true` or `false`. Default see Javadoc.
 
-<!-- editorconfig-checker-enable -->
+## OpenMetrics 2.0 Properties
 
-(1) Boolean value, `true` or `false`. Default see Javadoc.
+| Name                                           | Javadoc                                                                                                                                               | Note |
+| ---------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
+| io.prometheus.openmetrics2.enabled             | [OpenMetrics2Properties.getEnabled()](</client_java/api/io/prometheus/metrics/config/OpenMetrics2Properties.html#getEnabled()>)                       | (1)  |
+| io.prometheus.openmetrics2.content_negotiation | [OpenMetrics2Properties.getContentNegotiation()](</client_java/api/io/prometheus/metrics/config/OpenMetrics2Properties.html#getContentNegotiation()>) | (1)  |
+| io.prometheus.openmetrics2.composite_values    | [OpenMetrics2Properties.getCompositeValues()](</client_java/api/io/prometheus/metrics/config/OpenMetrics2Properties.html#getCompositeValues()>)       | (1)  |
+| io.prometheus.openmetrics2.exemplar_compliance | [OpenMetrics2Properties.getExemplarCompliance()](</client_java/api/io/prometheus/metrics/config/OpenMetrics2Properties.html#getExemplarCompliance()>) | (1)  |
+| io.prometheus.openmetrics2.native_histograms   | [OpenMetrics2Properties.getNativeHistograms()](</client_java/api/io/prometheus/metrics/config/OpenMetrics2Properties.html#getNativeHistograms()>)     | (1)  |
 
-## Exporter Filter Properties
+(1) Boolean value, `true` or `false`. `enabled=true` switches OpenMetrics responses to the OM2
+writer, preserving metric names as written by the application. The other OM2 properties remain
+opt-in. All OpenMetrics 2.0 flags are experimental and default to `false`.
 
-<!-- editorconfig-checker-disable -->
+## Exporter Filter Properties
 
-| Name                                                     | Javadoc                                                                                                                                                                   | Note |
-| -------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
-| io.prometheus.exporter.filter.metricNameMustBeEqualTo    | [ExporterFilterProperties.getAllowedMetricNames()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getAllowedMetricNames()>)                 | (1)  |
-| io.prometheus.exporter.filter.metricNameMustNotBeEqualTo | [ExporterFilterProperties.getExcludedMetricNames()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getExcludedMetricNames()>)               | (2)  |
-| io.prometheus.exporter.filter.metricNameMustStartWith    | [ExporterFilterProperties.getAllowedMetricNamePrefixes()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getAllowedMetricNamePrefixes()>)   | (3)  |
-| io.prometheus.exporter.filter.metricNameMustNotStartWith | [ExporterFilterProperties.getExcludedMetricNamePrefixes()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getExcludedMetricNamePrefixes()>) | (4)  |
+| Name                                                           | Javadoc                                                                                                                                                                   | Note |
+| -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
+| io.prometheus.exporter.filter.metric_name_must_be_equal_to     | [ExporterFilterProperties.getAllowedMetricNames()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getAllowedMetricNames()>)                 | (1)  |
+| io.prometheus.exporter.filter.metric_name_must_not_be_equal_to | [ExporterFilterProperties.getExcludedMetricNames()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getExcludedMetricNames()>)               | (2)  |
+| io.prometheus.exporter.filter.metric_name_must_start_with      | [ExporterFilterProperties.getAllowedMetricNamePrefixes()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getAllowedMetricNamePrefixes()>)   | (3)  |
+| io.prometheus.exporter.filter.metric_name_must_not_start_with  | [ExporterFilterProperties.getExcludedMetricNamePrefixes()](</client_java/api/io/prometheus/metrics/config/ExporterFilterProperties.html#getExcludedMetricNamePrefixes()>) | (4)  |
 
-<!-- editorconfig-checker-enable -->
+<!-- markdownlint-disable MD033 -->
 
 (1) Comma separated list of allowed metric names. Only these metrics will be exposed.<br/>
 (2) Comma separated list of excluded metric names. These metrics will not be exposed.<br/>
@@ -128,38 +168,38 @@ This works for all Metrics properties.
 Only metrics starting with these prefixes will be exposed.<br/>
 (4) Comma separated list of prefixes. Metrics starting with these prefixes will not be exposed.<br/>
 
-## Exporter HTTPServer Properties
-
-<!-- editorconfig-checker-disable -->
+<!-- markdownlint-enable MD033 -->
 
-| Name                                   | Javadoc                                                                                                                     | Note |
-| -------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ---- |
-| io.prometheus.exporter.httpServer.port | [HTTPServer.Builder.port()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#port(int)>) |      |
+## Exporter HTTPServer Properties
 
-<!-- editorconfig-checker-enable -->
+| Name                                    | Javadoc                                                                                                                     | Note |
+| --------------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ---- |
+| io.prometheus.exporter.http_server.port | [HTTPServer.Builder.port()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#port(int)>) |      |
 
 ## Exporter OpenTelemetry Properties
 
-<!-- editorconfig-checker-disable -->
-
-| Name                                                    | Javadoc                                                                                                                                                                                                       | Note |
-| ------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
-| io.prometheus.exporter.opentelemetry.protocol           | [OpenTelemetryExporter.Builder.protocol()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#protocol(java.lang.String)>)                                     | (1)  |
-| io.prometheus.exporter.opentelemetry.endpoint           | [OpenTelemetryExporter.Builder.endpoint()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#endpoint(java.lang.String)>)                                     |      |
-| io.prometheus.exporter.opentelemetry.headers            | [OpenTelemetryExporter.Builder.headers()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#header(java.lang.String,java.lang.String)>)                       | (2)  |
-| io.prometheus.exporter.opentelemetry.intervalSeconds    | [OpenTelemetryExporter.Builder.intervalSeconds()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#intervalSeconds(int)>)                                    |      |
-| io.prometheus.exporter.opentelemetry.timeoutSeconds     | [OpenTelemetryExporter.Builder.timeoutSeconds()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#timeoutSeconds(int)>)                                      |      |
-| io.prometheus.exporter.opentelemetry.serviceName        | [OpenTelemetryExporter.Builder.serviceName()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceName(java.lang.String)>)                               |      |
-| io.prometheus.exporter.opentelemetry.serviceNamespace   | [OpenTelemetryExporter.Builder.serviceNamespace()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceNamespace(java.lang.String)>)                     |      |
-| io.prometheus.exporter.opentelemetry.serviceInstanceId  | [OpenTelemetryExporter.Builder.serviceInstanceId()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceInstanceId(java.lang.String)>)                   |      |
-| io.prometheus.exporter.opentelemetry.serviceVersion     | [OpenTelemetryExporter.Builder.serviceVersion()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceVersion(java.lang.String)>)                         |      |
-| io.prometheus.exporter.opentelemetry.resourceAttributes | [OpenTelemetryExporter.Builder.resourceAttributes()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#resourceAttribute(java.lang.String,java.lang.String)>) | (3)  |
-
-<!-- editorconfig-checker-enable -->
+| Name                                                     | Javadoc                                                                                                                                                                                                       | Note |
+| -------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---- |
+| io.prometheus.exporter.opentelemetry.protocol            | [OpenTelemetryExporter.Builder.protocol()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#protocol(java.lang.String)>)                                     | (1)  |
+| io.prometheus.exporter.opentelemetry.endpoint            | [OpenTelemetryExporter.Builder.endpoint()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#endpoint(java.lang.String)>)                                     |      |
+| io.prometheus.exporter.opentelemetry.headers             | [OpenTelemetryExporter.Builder.headers()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#header(java.lang.String,java.lang.String)>)                       | (2)  |
+| io.prometheus.exporter.opentelemetry.interval_seconds    | [OpenTelemetryExporter.Builder.intervalSeconds()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#intervalSeconds(int)>)                                    |      |
+| io.prometheus.exporter.opentelemetry.timeout_seconds     | [OpenTelemetryExporter.Builder.timeoutSeconds()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#timeoutSeconds(int)>)                                      |      |
+| io.prometheus.exporter.opentelemetry.service_name        | [OpenTelemetryExporter.Builder.serviceName()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceName(java.lang.String)>)                               |      |
+| io.prometheus.exporter.opentelemetry.service_namespace   | [OpenTelemetryExporter.Builder.serviceNamespace()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceNamespace(java.lang.String)>)                     |      |
+| io.prometheus.exporter.opentelemetry.service_instance_id | [OpenTelemetryExporter.Builder.serviceInstanceId()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceInstanceId(java.lang.String)>)                   |      |
+| io.prometheus.exporter.opentelemetry.service_version     | [OpenTelemetryExporter.Builder.serviceVersion()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#serviceVersion(java.lang.String)>)                         |      |
+| io.prometheus.exporter.opentelemetry.resource_attributes | [OpenTelemetryExporter.Builder.resourceAttributes()](</client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html#resourceAttribute(java.lang.String,java.lang.String)>) | (3)  |
+| io.prometheus.exporter.opentelemetry.preserve_names      | [ExporterOpenTelemetryProperties.getPreserveNames()](</client_java/api/io/prometheus/metrics/config/ExporterOpenTelemetryProperties.html#getPreserveNames()>)                                                 | (4)  |
+
+<!-- markdownlint-disable MD033 -->
 
 (1) Protocol can be `grpc` or `http/protobuf`.<br>
 (2) Format: `key1=value1,key2=value2`<br>
-(3) Format: `key1=value1,key2=value2`
+(3) Format: `key1=value1,key2=value2`<br>
+(4) Boolean value, `true` or `false`. Default is `false` for backward compatibility.
+
+<!-- markdownlint-enable MD033 -->
 
 Many of these attributes can alternatively be configured via OpenTelemetry environment variables,
 like `OTEL_EXPORTER_OTLP_ENDPOINT`.
@@ -168,17 +208,13 @@ See Javadoc for details.
 
 ## Exporter PushGateway Properties
 
-<!-- editorconfig-checker-disable -->
-
-| Name                                              | Javadoc                                                                                                                                                                                    | Note |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---- |
-| io.prometheus.exporter.pushgateway.address        | [PushGateway.Builder.address()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#address(java.lang.String)>)                                          |      |
-| io.prometheus.exporter.pushgateway.scheme         | [PushGateway.Builder.scheme()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#scheme(java.lang.String)>)                                            |      |
-| io.prometheus.exporter.pushgateway.job            | [PushGateway.Builder.job()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#job(java.lang.String)>)                                                  |      |
-| io.prometheus.exporter.pushgateway.escapingScheme | [PushGateway.Builder.escapingScheme()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#escapingScheme(io.prometheus.metrics.config.EscapingScheme)>) | (1)  |
-
-<!-- editorconfig-checker-enable -->
+| Name                                               | Javadoc                                                                                                                                                                                    | Note |
+| -------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---- |
+| io.prometheus.exporter.pushgateway.address         | [PushGateway.Builder.address()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#address(java.lang.String)>)                                          |      |
+| io.prometheus.exporter.pushgateway.scheme          | [PushGateway.Builder.scheme()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#scheme(java.lang.String)>)                                            |      |
+| io.prometheus.exporter.pushgateway.job             | [PushGateway.Builder.job()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#job(java.lang.String)>)                                                  |      |
+| io.prometheus.exporter.pushgateway.escaping_scheme | [PushGateway.Builder.escapingScheme()](</client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.Builder.html#escapingScheme(io.prometheus.metrics.config.EscapingScheme)>) | (1)  |
 
 (1) Escaping scheme can be `allow-utf-8`, `underscores`, `dots`, or `values` as described in
-[escaping schemes](https://github.com/prometheus/docs/blob/main/docs/instrumenting/escaping_schemes.md#escaping-schemes) <!-- editorconfig-checker-disable-line -->
+[escaping schemes](https://github.com/prometheus/docs/blob/main/docs/instrumenting/escaping_schemes.md#escaping-schemes)
 and in the [Unicode documentation]({{< relref "../exporters/unicode.md" >}}).
diff --git a/docs/content/exporters/filter.md b/docs/content/exporters/filter.md
index ae7ad9564..7d3e71d0e 100644
--- a/docs/content/exporters/filter.md
+++ b/docs/content/exporters/filter.md
@@ -18,3 +18,13 @@ params:
     - jvm_threads_current
     - jvm_threads_daemon
 ```
+
+## Query parameter limits
+
+For safety, exporters limit the query string to 65,536 characters and accept at most 1,024
+query parameters. The parameter limit counts every `&`-separated pair, including repeated
+parameters and empty pairs. These are fixed implementation limits and cannot be changed through
+runtime configuration.
+
+If a request exceeds either limit or contains invalid percent-encoding, the `/metrics` endpoint
+returns HTTP `400 Bad Request` with the plain-text response `Invalid query parameters`.
diff --git a/docs/content/exporters/formats.md b/docs/content/exporters/formats.md
index a6485c84c..b84222033 100644
--- a/docs/content/exporters/formats.md
+++ b/docs/content/exporters/formats.md
@@ -11,6 +11,11 @@ All exporters the following exposition formats:
 
 Moreover, gzip encoding is supported for each of these formats.
 
+## OpenMetrics 2.0 Preview
+
+The library also includes an experimental OpenMetrics 2.0 writer. It is disabled by default and
+must be enabled explicitly. See [OpenMetrics 2.0 Preview]({{< relref "./openmetrics2.md" >}}).
+
 ## Scraping with a Prometheus server
 
 The Prometheus server sends an `Accept` header to specify which format is requested. By default, the
@@ -61,6 +66,12 @@ You can exclude the shaded protobuf classes including the
 `prometheus-metrics-exposition-formats-no-protobuf` module and excluding the
 `prometheus-metrics-exposition-formats` module in your build file.
 
+If you are using the PushGateway in a shaded jar with `minimizeJar=true`, do not exclude the protobuf classes.
+The PushGateway loads the protobuf writer implementation via reflection, so the full
+`prometheus-metrics-exposition-formats` artifact must stay on the classpath and the relevant
+packages must be preserved during shading. See the [PushGateway docs]({{< relref
+"./pushgateway.md" >}}) for the recommended Maven Shade configuration.
+
 For example, in Maven:
 
 ```xml
diff --git a/docs/content/exporters/httpserver.md b/docs/content/exporters/httpserver.md
index 801ad60eb..c0db181c9 100644
--- a/docs/content/exporters/httpserver.md
+++ b/docs/content/exporters/httpserver.md
@@ -14,8 +14,8 @@ HTTPServer server = HTTPServer.builder()
 ```
 
 By default, `HTTPServer` binds to any IP address, you can change this with
-[hostname()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#hostname(java.lang.String)>) <!-- editorconfig-checker-disable-line -->
-or [inetAddress()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#inetAddress(java.net.InetAddress)>). <!-- editorconfig-checker-disable-line -->
+[hostname()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#hostname(java.lang.String)>)
+or [inetAddress()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#inetAddress(java.net.InetAddress)>).
 
 `HTTPServer` is configured with three endpoints:
 
@@ -24,13 +24,13 @@ or [inetAddress()](</client_java/api/io/prometheus/metrics/exporter/httpserver/H
 - `/` the default handler is a static HTML page.
 
 The default handler can be changed
-with [defaultHandler()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#defaultHandler(com.sun.net.httpserver.HttpHandler)>). <!-- editorconfig-checker-disable-line -->
+with [defaultHandler()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#defaultHandler(com.sun.net.httpserver.HttpHandler)>).
 
 ## Authentication and HTTPS
 
-- [authenticator()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#authenticator(com.sun.net.httpserver.Authenticator)>) <!-- editorconfig-checker-disable-line -->
+- [authenticator()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#authenticator(com.sun.net.httpserver.Authenticator)>)
   is for configuring authentication.
-- [httpsConfigurator()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#httpsConfigurator(com.sun.net.httpserver.HttpsConfigurator)>) <!-- editorconfig-checker-disable-line -->
+- [httpsConfigurator()](</client_java/api/io/prometheus/metrics/exporter/httpserver/HTTPServer.Builder.html#httpsConfigurator(com.sun.net.httpserver.HttpsConfigurator)>)
   is for configuring HTTPS.
 
 You can find an example of authentication and SSL in the
@@ -40,4 +40,4 @@ You can find an example of authentication and SSL in the
 
 See _config_ section (_todo_) on runtime configuration options.
 
-- `io.prometheus.exporter.httpServer.port`: The port to bind to.
+- `io.prometheus.exporter.http_server.port`: The port to bind to.
diff --git a/docs/content/exporters/openmetrics2.md b/docs/content/exporters/openmetrics2.md
new file mode 100644
index 000000000..607273881
--- /dev/null
+++ b/docs/content/exporters/openmetrics2.md
@@ -0,0 +1,129 @@
+---
+title: OpenMetrics 2.0 Preview
+weight: 2
+---
+
+The Prometheus Java client library includes experimental support for the OpenMetrics 2.0 text
+format.
+
+{{< hint type=warning >}}
+OpenMetrics 2.0 support is opt-in, experimental, and subject to change while the specification is
+still in draft.
+{{< /hint >}}
+
+{{< toc >}}
+
+## Enable OpenMetrics 2.0
+
+To switch OpenMetrics responses from the legacy OM1 writer to the OM2 writer, set:
+
+```properties
+io.prometheus.openmetrics2.enabled=true
+```
+
+Programmatic configuration:
+
+```java
+PrometheusProperties properties = PrometheusProperties.builder()
+    .enableOpenMetrics2(om2 -> {})
+    .build();
+```
+
+Enabling `enableOpenMetrics2(...)` also enables the top-level `enabled` flag automatically, so you
+only need to configure the sub-flags you want.
+
+With `enabled=true` alone:
+
+- OpenMetrics requests use the OM2 writer.
+- Metric names are preserved as written by the application.
+- Optional OM2 features such as `composite_values`, `exemplar_compliance`, and
+  `native_histograms` remain off.
+
+To enable OM2 only when the scraper explicitly requests `version=2.0.0`, set:
+
+```properties
+io.prometheus.openmetrics2.enabled=true
+io.prometheus.openmetrics2.content_negotiation=true
+```
+
+Programmatic equivalent:
+
+```java
+PrometheusProperties properties = PrometheusProperties.builder()
+    .enableOpenMetrics2(om2 -> om2.contentNegotiation(true))
+    .build();
+```
+
+## Naming Behavior
+
+OpenMetrics 2.0 removes OM1 suffix rewriting.
+
+- Counters do not get `_total` appended automatically.
+- Units do not get appended automatically.
+- Info metrics still end in `_info` because that is required by the spec.
+
+Examples:
+
+| Metric builder input               | OM1 output        | OM2 output     |
+| ---------------------------------- | ----------------- | -------------- |
+| `Counter("events")`                | `events_total`    | `events`       |
+| `Counter("events_total")`          | `events_total`    | `events_total` |
+| `Counter("req").unit(BYTES)`       | `req_bytes_total` | `req`          |
+| `Counter("req_bytes").unit(BYTES)` | `req_bytes_total` | `req_bytes`    |
+| `Info("target")`                   | `target_info`     | `target_info`  |
+
+This means OpenMetrics 2.0 does not apply OM1 suffix behavior such as appending `_total` or unit
+suffixes, while the legacy OpenMetrics 1.0 and Prometheus text formats keep that existing suffix
+behavior.
+
+## Feature Flags
+
+All OpenMetrics 2.0 flags default to `false`.
+
+| Property                                         | Effect                                                                                 |
+| ------------------------------------------------ | -------------------------------------------------------------------------------------- |
+| `io.prometheus.openmetrics2.enabled`             | Metric names are preserved as written by the application.                              |
+| `io.prometheus.openmetrics2.content_negotiation` | Apply OM2 behavior only when the scraper requests `version=2.0.0`.                     |
+| `io.prometheus.openmetrics2.composite_values`    | Emit histograms, summaries, and gauge histograms as single composite lines with `st@`. |
+| `io.prometheus.openmetrics2.exemplar_compliance` | Emit only OM2-compliant exemplars with timestamps.                                     |
+| `io.prometheus.openmetrics2.native_histograms`   | Emit OM2 native histogram text fields.                                                 |
+
+Enable all flags at once:
+
+```java
+PrometheusProperties properties = PrometheusProperties.builder()
+    .enableOpenMetrics2(om2 -> om2.enableAll())
+    .build();
+```
+
+Equivalent properties:
+
+```properties
+io.prometheus.openmetrics2.enabled=true
+io.prometheus.openmetrics2.content_negotiation=true
+io.prometheus.openmetrics2.composite_values=true
+io.prometheus.openmetrics2.exemplar_compliance=true
+io.prometheus.openmetrics2.native_histograms=true
+```
+
+## Content Negotiation
+
+If `content_negotiation=false`, OpenMetrics 2.0 behavior is applied to OpenMetrics responses even
+if the scraper requested OpenMetrics 1.0.
+
+If `content_negotiation=true`, OpenMetrics 2.0 behavior is only used when the scraper explicitly
+requests `version=2.0.0`. Otherwise the legacy OpenMetrics 1.0 response is returned.
+
+## Native Histograms
+
+With `io.prometheus.openmetrics2.native_histograms=true`, the OpenMetrics 2.0 writer emits native
+histogram fields such as:
+
+- `schema`
+- `zero_threshold`
+- `zero_count`
+- positive and negative spans
+- positive and negative buckets
+
+OM2 native histogram output can coexist with classic histogram buckets. When both are present, the
+native histogram sample is written first.
diff --git a/docs/content/exporters/pushgateway.md b/docs/content/exporters/pushgateway.md
index 497aa9b57..755525dd9 100644
--- a/docs/content/exporters/pushgateway.md
+++ b/docs/content/exporters/pushgateway.md
@@ -115,7 +115,8 @@ PushGateway pushGateway = PushGateway.builder()
 However, this requires that the JVM can validate the server certificate.
 
 If you want to skip certificate verification, you need to provide your own
-[HttpConnectionFactory](/client_java/api/io/prometheus/metrics/exporter/pushgateway/HttpConnectionFactory.html). <!-- editorconfig-checker-disable-line -->
+`HttpConnectionFactory`. See the
+[API docs](/client_java/api/io/prometheus/metrics/exporter/pushgateway/HttpConnectionFactory.html).
 The `PushGatewayTestApp` in `integration-tests/it-pushgateway` has a complete example of this.
 
 ## Configuration Properties
@@ -123,3 +124,34 @@ The `PushGatewayTestApp` in `integration-tests/it-pushgateway` has a complete ex
 The [PushGateway](/client_java/api/io/prometheus/metrics/exporter/pushgateway/PushGateway.html)
 supports a couple of properties that can be configured at runtime.
 See [config]({{< relref "../config/config.md" >}}).
+
+## Troubleshooting shaded jars
+
+If you build a shaded jar with the Maven Shade Plugin and `minimizeJar=true`, the PushGateway may
+fail at runtime with an error like this:
+
+```text
+java.lang.RuntimeException: class
+io.prometheus.metrics.expositionformats.PrometheusProtobufWriter is not available
+```
+
+This happens because the PushGateway loads the protobuf writer implementation via reflection. The
+Maven Shade Plugin does not detect that reflective usage during minimization, so it may strip the
+required classes from the final jar.
+
+To avoid this, keep the `prometheus-metrics-exposition-formats` artifact on the classpath and
+preserve the protobuf-related packages in your shade configuration:
+
+```xml
+<filters>
+  <filter>
+    <artifact>io.prometheus:prometheus-metrics-exposition-formats</artifact>
+    <includes>
+      <include>io/prometheus/metrics/expositionformats/**</include>
+      <include>io/prometheus/metrics/shaded/**</include>
+    </includes>
+  </filter>
+</filters>
+```
+
+Alternatively, disable jar minimization for the shaded build.
diff --git a/docs/content/exporters/servlet.md b/docs/content/exporters/servlet.md
index 2b0873b70..8ddf3c13e 100644
--- a/docs/content/exporters/servlet.md
+++ b/docs/content/exporters/servlet.md
@@ -4,15 +4,13 @@ weight: 5
 ---
 
 The
-[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html) <!-- editorconfig-checker-disable-line -->
+[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html)
 is a [Jakarta Servlet](https://jakarta.ee/specifications/servlet/) for exposing a metric endpoint.
 
 ## web.xml
 
 The old-school way of configuring a servlet is in a `web.xml` file:
 
-<!-- editorconfig-checker-disable -->
-
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
@@ -30,8 +28,6 @@ The old-school way of configuring a servlet is in a `web.xml` file:
 </web-app>
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## Programmatic
 
 Today, most Servlet applications use an embedded Servlet container and configure Servlets
@@ -40,12 +36,12 @@ The API for that depends on the Servlet container.
 The [examples](https://github.com/prometheus/client_java/tree/1.0.x/examples) directory has an
 example of an embedded
 [Tomcat](https://tomcat.apache.org/) container with the
-[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html) <!-- editorconfig-checker-disable-line -->
+[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html)
 configured.
 
 ## Spring
 
 You can use
-the [PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html) <!-- editorconfig-checker-disable-line -->
+the [PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html)
 in Spring applications.
 See [our Spring doc]({{< relref "spring.md" >}}).
diff --git a/docs/content/exporters/spring.md b/docs/content/exporters/spring.md
index 45df21431..80a7739fa 100644
--- a/docs/content/exporters/spring.md
+++ b/docs/content/exporters/spring.md
@@ -26,7 +26,7 @@ Spring anyway. Maybe you want full support for all Prometheus metric types,
 or you want to use the new Prometheus native histograms.
 
 The easiest way to use the Prometheus metrics library in Spring is to configure the
-[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html) <!-- editorconfig-checker-disable-line -->
+[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html)
 to expose metrics.
 
 Dependencies:
@@ -76,7 +76,7 @@ public class DemoApplication {
 ```
 
 The important part are the last three lines: They configure the
-[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html) <!-- editorconfig-checker-disable-line -->
+[PrometheusMetricsServlet](/client_java/api/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.html)
 to expose metrics on `/metrics`:
 
 ```java
diff --git a/docs/content/exporters/unicode.md b/docs/content/exporters/unicode.md
index 3c03428e5..026292c39 100644
--- a/docs/content/exporters/unicode.md
+++ b/docs/content/exporters/unicode.md
@@ -12,7 +12,7 @@ The Prometheus Java client library allows all Unicode characters, that can be en
 
 At scrape time, some characters are replaced based on the `encoding` header according
 to
-the [Escaping scheme](https://github.com/prometheus/docs/blob/main/docs/instrumenting/escaping_schemes.md). <!-- editorconfig-checker-disable-line -->
+the [Escaping scheme](https://github.com/prometheus/docs/blob/main/docs/instrumenting/escaping_schemes.md).
 
 For example, if you use the `underscores` escaping scheme, dots in metric and label names are
 replaced with underscores, so that the metric name `http.server.duration` becomes
@@ -28,7 +28,7 @@ other UTF-8 characters, without any replacements.
 
 ## PushGateway
 
-When using the [Pushgateway](/exporters/pushgateway/), Unicode support has to be enabled
+When using the [Pushgateway]({{< relref "pushgateway.md" >}}), Unicode support has to be enabled
 explicitly by setting `io.prometheus.exporter.pushgateway.escapingScheme` to `allow-utf-8` in the
 Pushgateway configuration file - see
 [Pushgateway configuration]({{< relref "/config/config.md#exporter-pushgateway-properties" >}})
diff --git a/docs/content/getting-started/labels.md b/docs/content/getting-started/labels.md
index d056a6ce6..1cbae13d7 100644
--- a/docs/content/getting-started/labels.md
+++ b/docs/content/getting-started/labels.md
@@ -150,4 +150,4 @@ Counter counter = Counter.builder()
 However, most use cases for `constLabels()` are better covered by target labels set by the scraping
 Prometheus server,
 or by one specific metric (e.g. a `build_info` or a `machine_role` metric). See also
-[target labels, not static scraped labels](https://prometheus.io/docs/instrumenting/writing_exporters/#target-labels-not-static-scraped-labels). <!-- editorconfig-checker-disable-line -->
+[target labels, not static scraped labels](https://prometheus.io/docs/instrumenting/writing_exporters/#target-labels-not-static-scraped-labels).
diff --git a/docs/content/getting-started/metric-types.md b/docs/content/getting-started/metric-types.md
index 46d53ece1..752205107 100644
--- a/docs/content/getting-started/metric-types.md
+++ b/docs/content/getting-started/metric-types.md
@@ -37,9 +37,13 @@ serviceTimeSeconds.inc(Unit.millisToSeconds(200));
 The resulting counter has the value `0.2`. As `SECONDS` is the standard time unit in Prometheus, the
 `Unit` utility class has methods to convert other time units to seconds.
 
-As defined in [OpenMetrics](https://openmetrics.io/), counter metric names must have the `_total`
-suffix. If you create a counter without the `_total` suffix the suffix will be appended
-automatically.
+For the default OpenMetrics 1.0 and Prometheus text formats, counters are exposed with the
+`_total` suffix. You can name a counter either `service_time_seconds` or
+`service_time_seconds_total`; the exposed name will be `service_time_seconds_total` in both cases.
+
+The experimental OpenMetrics 2.0 writer behaves differently: It preserves metric names instead of
+appending `_total` or unit suffixes automatically. In OpenMetrics 2.0, `_total` is recommended for
+counters, but not enforced by the Java client.
 
 ## Gauge
 
@@ -84,7 +88,7 @@ the Prometheus server.
   format and ingest both, the classic and the native flavor. This is great for migrating from
   classic histograms to native histograms.
 
-See [examples/example-native-histogram](https://github.com/prometheus/client_java/tree/1.0.x/examples/example-native-histogram) <!-- editorconfig-checker-disable-line -->
+See [examples/example-native-histogram](https://github.com/prometheus/client_java/tree/1.0.x/examples/example-native-histogram)
 for an example.
 
 ```java
@@ -121,6 +125,98 @@ for [Histogram.Builder](/client_java/api/io/prometheus/metrics/core/metrics/Hist
 for a complete list of options. Some options can be configured at runtime,
 see [config]({{< relref "../config/config.md" >}}).
 
+### Custom Bucket Boundaries
+
+The default bucket boundaries are designed for measuring request durations in seconds. For other
+use cases, you may want to define custom bucket boundaries. The histogram builder provides three
+methods for this:
+
+<!-- markdownlint-disable MD036 -->
+
+**1. Arbitrary Custom Boundaries**
+
+Use `classicUpperBounds(...)` to specify arbitrary bucket boundaries:
+
+```java
+Histogram responseSize = Histogram.builder()
+    .name("http_response_size_bytes")
+    .help("HTTP response size in bytes")
+    .classicUpperBounds(100, 1000, 10000, 100000, 1000000) // bytes
+    .register();
+```
+
+**2. Linear Boundaries**
+
+Use `classicLinearUpperBounds(start, width, count)` for equal-width buckets:
+
+```java
+Histogram queueSize = Histogram.builder()
+    .name("queue_size")
+    .help("Number of items in queue")
+    .classicLinearUpperBounds(10, 10, 10) // 10, 20, 30, ..., 100
+    .register();
+```
+
+**3. Exponential Boundaries**
+
+<!-- markdownlint-enable MD036 -->
+
+Use `classicExponentialUpperBounds(start, factor, count)` for exponential growth:
+
+```java
+Histogram dataSize = Histogram.builder()
+    .name("data_size_bytes")
+    .help("Data size in bytes")
+    .classicExponentialUpperBounds(100, 10, 5) // 100, 1k, 10k, 100k, 1M
+    .register();
+```
+
+### Native Histograms with Custom Buckets (NHCB)
+
+Prometheus supports a special mode called Native Histograms with Custom Buckets (NHCB) that uses
+schema -53. In this mode, custom bucket boundaries from classic histograms are preserved when
+converting to native histograms.
+
+The Java client library automatically supports NHCB:
+
+1. By default, histograms maintain both classic (with custom buckets) and native representations
+2. The classic representation with custom buckets is exposed to Prometheus
+3. Prometheus servers can convert these to NHCB upon ingestion when configured with the
+   `convert_classic_histograms_to_nhcb` scrape option
+
+Example:
+
+```java
+// This histogram will work seamlessly with NHCB
+Histogram apiLatency = Histogram.builder()
+    .name("api_request_duration_seconds")
+    .help("API request duration")
+    .classicUpperBounds(0.01, 0.05, 0.1, 0.5, 1.0, 5.0, 10.0) // custom boundaries
+    .register();
+```
+
+On the Prometheus side, configure the scrape job:
+
+```yaml
+scrape_configs:
+  - job_name: "my-app"
+    scrape_protocols: ["PrometheusProto"]
+    convert_classic_histograms_to_nhcb: true
+    static_configs:
+      - targets: ["localhost:9400"]
+```
+
+{{< hint type=note >}}
+NHCB is useful when:
+
+- You need precise bucket boundaries for your specific use case
+- You're migrating from classic histograms and want to preserve bucket boundaries
+- Exponential bucketing from standard native histograms isn't a good fit for your distribution
+  {{< /hint >}}
+
+See [examples/example-custom-buckets](https://github.com/prometheus/client_java/tree/main/examples/example-custom-buckets)
+for a complete example with Prometheus and Grafana.
+
 Histograms and summaries are both used for observing distributions. Therefore, the both implement
 the `DistributionDataPoint` interface. Using the `DistributionDataPoint` interface directly gives
 you the option to switch between histograms and summaries later with minimal code changes.
@@ -200,7 +296,7 @@ be changed with `maxAgeSeconds()` and `numberOfAgeBuckets()`.
 Some options can be configured at runtime, see [config]({{< relref "../config/config.md" >}}).
 
 In general you should prefer histograms over summaries. The Prometheus query language has a
-function [histogram_quantile()](https://prometheus.io/docs/prometheus/latest/querying/functions/#histogram_quantile) <!-- editorconfig-checker-disable-line -->
+function [histogram_quantile()](https://prometheus.io/docs/prometheus/latest/querying/functions/#histogram_quantile)
 for calculating quantiles from histograms. The advantage of query-time quantile calculation is that
 you can aggregate histograms before calculating the quantile. With summaries you must use the
 quantile with all its labels as it is.
@@ -226,16 +322,12 @@ info.setLabelValues(version, vendor, runtime);
 
 The info above looks as follows in OpenMetrics text format:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # TYPE jvm_runtime info
 # HELP jvm_runtime JVM runtime info
 jvm_runtime_info{runtime="OpenJDK Runtime Environment",vendor="Oracle Corporation",version="1.8.0_382-b05"} 1
 ```
 
-<!-- editorconfig-checker-enable -->
-
 The example is taken from the `prometheus-metrics-instrumentation-jvm` module, so if you have
 `JvmMetrics` registered you should have a `jvm_runtime_info` metric out-of-the-box.
 
@@ -276,3 +368,6 @@ in the `prometheus-metrics-core` API.
 However, `prometheus-metrics-model` implements the underlying data model for these types.
 To use these types, you need to implement your own `Collector` where the `collect()` method returns
 an `UnknownSnapshot` or a `HistogramSnapshot` with `.gaugeHistogram(true)`.
+If your custom collector does not implement `getMetricType()` and `getLabelNames()`, ensure it does
+not produce the same metric name and label set as another collector, or the exposition may contain
+duplicate time series.
diff --git a/docs/content/getting-started/multi-target.md b/docs/content/getting-started/multi-target.md
index 16f85ac40..cfa0b841f 100644
--- a/docs/content/getting-started/multi-target.md
+++ b/docs/content/getting-started/multi-target.md
@@ -11,8 +11,6 @@ To support multi-target pattern you can create a custom collector overriding the
 method in ExtendedMultiCollector
 see SampleExtendedMultiCollector in io.prometheus.metrics.examples.httpserver
 
-<!-- editorconfig-checker-disable -->
-
 ```java
 public class SampleExtendedMultiCollector extends ExtendedMultiCollector {
 
@@ -80,8 +78,6 @@ public class SampleExtendedMultiCollector extends ExtendedMultiCollector {
 
 ```
 
-<!-- editorconfig-checker-enable -->
-
 `PrometheusScrapeRequest` provides methods to access http-related infos from the request originally
 received by the endpoint
 
diff --git a/docs/content/getting-started/performance.md b/docs/content/getting-started/performance.md
index 31b8de162..42b2a0a48 100644
--- a/docs/content/getting-started/performance.md
+++ b/docs/content/getting-started/performance.md
@@ -53,20 +53,20 @@ In performance critical applications we recommend to use either the classic repr
 native representation, but not both.
 
 You can either configure this in code for each histogram by
-calling [classicOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#classicOnly()>) <!-- editorconfig-checker-disable-line -->
-or [nativeOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeOnly()>), <!-- editorconfig-checker-disable-line -->
+calling [classicOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#classicOnly()>)
+or [nativeOnly()](</client_java/api/io/prometheus/metrics/core/metrics/Histogram.Builder.html#nativeOnly()>),
 or you use the corresponding [config options]({{< relref "../config/config.md" >}}).
 
 One way to do this is with system properties in the command line when you start your application
 
 ```sh
-java -Dio.prometheus.metrics.histogramClassicOnly=true my-app.jar
+java -Dio.prometheus.metrics.histogram_classic_only=true my-app.jar
 ```
 
 or
 
 ```sh
-java -Dio.prometheus.metrics.histogramNativeOnly=true my-app.jar
+java -Dio.prometheus.metrics.histogram_native_only=true my-app.jar
 ```
 
 If you don't want to add a command line parameter every time you start your application, you can add
@@ -75,13 +75,13 @@ that it gets packed into your JAR file). The `prometheus.properties` file should
 line:
 
 ```properties
-io.prometheus.metrics.histogramClassicOnly=true
+io.prometheus.metrics.histogram_classic_only=true
 ```
 
 or
 
 ```properties
-io.prometheus.metrics.histogramNativeOnly=true
+io.prometheus.metrics.histogram_native_only=true
 ```
 
 Future releases will add more configuration options, like support for configuration via environment
diff --git a/docs/content/getting-started/quickstart.md b/docs/content/getting-started/quickstart.md
index 920d89b7f..635c63be0 100644
--- a/docs/content/getting-started/quickstart.md
+++ b/docs/content/getting-started/quickstart.md
@@ -63,7 +63,7 @@ it from the dependencies.
 ## Dependency management
 
 A Bill of Material
-([BOM](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#bill-of-materials-bom-poms)) <!-- editorconfig-checker-disable-line -->
+([BOM](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#bill-of-materials-bom-poms))
 ensures that versions of dependencies (including transitive ones) are aligned.
 This is especially important when using Spring Boot, which manages some of the dependencies of the
 project.
diff --git a/docs/content/getting-started/registry.md b/docs/content/getting-started/registry.md
index afebbb304..de437be23 100644
--- a/docs/content/getting-started/registry.md
+++ b/docs/content/getting-started/registry.md
@@ -6,7 +6,7 @@ weight: 2
 In order to expose metrics, you need to register them with a `PrometheusRegistry`. We are using a
 counter as an example here, but the `register()` method is the same for all metric types.
 
-## Registering a Metrics with the Default Registry
+## Registering a Metric with the Default Registry
 
 ```java
 Counter eventsTotal = Counter.builder()
@@ -18,7 +18,7 @@ Counter eventsTotal = Counter.builder()
 The `register()` call above builds the counter and registers it with the global static
 `PrometheusRegistry.defaultRegistry`. Using the default registry is recommended.
 
-## Registering a Metrics with a Custom Registry
+## Registering a Metric with a Custom Registry
 
 You can also register your metric with a custom registry:
 
@@ -78,12 +78,72 @@ Counter eventsTotal2 = Counter.builder()
     .register(); // IllegalArgumentException, because a metric with that name is already registered
 ```
 
+## Suffix-Based Name Validation
+
+Suffix handling happens at scrape time. This makes metric names more flexible while keeping the
+exposed output unambiguous.
+
+The registry now tracks not only the metric names you register, but also the exposition names they
+would claim in OpenMetrics 1.x and Prometheus text format, such as `_total`, `_count`, `_sum`,
+`_bucket`, `_created`, and `_info`.
+
+This means names are accepted when they are safe, and combinations are rejected when they would
+collide at scrape time. The table below also shows the pre-1.6.0 behavior for comparison.
+
+| Example                                       | Before 1.6.0 | Current behavior | Why                                                                                               |
+| --------------------------------------------- | ------------ | ---------------- | ------------------------------------------------------------------------------------------------- |
+| `Gauge("foo_total")`                          | Rejected     | Allowed          | Safe because `_total` suffix expansion applies to counters, not gauges.                           |
+| `Counter("events_total")`                     | Rejected     | Allowed          | Safe because the OM1 output is `events_total`; the writer avoids double-appending `_total`.       |
+| `Gauge("foo_total")` + `Histogram("foo")`     | Rejected     | Allowed          | Safe because the exposed names do not overlap: `foo_total` vs `foo_bucket`/`foo_count`/`foo_sum`. |
+| `Gauge("events_total")` + `Counter("events")` | Rejected     | Rejected         | Rejected because both would expose `events_total` in OM1.                                         |
+| `Gauge("foo_count")` + `Histogram("foo")`     | Allowed      | Rejected         | Rejected because both would claim `foo_count` at scrape time.                                     |
+
+## Validation at registration only
+
+Validation of duplicate metric names and label schemas happens at registration time only.
+Built-in metrics (Counter, Gauge, Histogram, etc.) participate in this validation.
+
+Custom collectors that implement the `Collector` or `MultiCollector` interface can optionally
+expose their registration-time metadata so the registry can enforce consistency. The recommended
+way is to override `getMetricFamilyDescriptor()` (or `getMetricFamilyDescriptors()` on
+`MultiCollector`) and return a `MetricFamilyDescriptor` describing the metric name, type, label
+names, and metadata (help, unit) the collector will emit at scrape time.
+
+```java
+@Override
+public MetricFamilyDescriptor getMetricFamilyDescriptor() {
+  return MetricFamilyDescriptor.gauge("my_metric")
+      .help("Example metric")
+      .labelNames("region")
+      .build();
+}
+```
+
+The fragmented `getPrometheusName()`, `getMetricType()`, `getLabelNames()`, and `getMetadata()`
+methods (and their `MultiCollector` per-name variants) are deprecated. They remain bridged by a
+default implementation of `getMetricFamilyDescriptor()` for compatibility, so existing
+collectors keep working unchanged.
+
+**Validation is skipped when registration-time metadata is unavailable:** if
+`getMetricFamilyDescriptor()` returns `null` (the default when name or type is missing), the
+registry does not validate that collector. If two such collectors produce the same metric name and
+same label set at scrape time, the exposition output may contain duplicate time series and be
+invalid for Prometheus.
+
+This is also relevant for downstream adapter libraries that bridge to this registry. If an adapter
+implements `MultiCollector`, its registration-time metadata must match the metric families it will
+actually emit at scrape time. In practice, the `MetricFamilyDescriptor`s returned from
+`getMetricFamilyDescriptors()` need to describe the same names, types, labels, and suffix behavior
+as the eventual `MetricSnapshot` output. Otherwise an adapter may pass or fail collision checks
+differently after upgrading to a newer client_java release, even if its scrape output logic did not
+change.
+
 ## Unregistering a Metric
 
 There is no automatic expiry of unused metrics (yet), once a metric is registered it will remain
 registered forever.
 
-However, you can programmatically unregistered an obsolete metric like this:
+However, you can programmatically unregister an obsolete metric like this:
 
 ```java
 PrometheusRegistry.defaultRegistry.unregister(eventsTotal);
diff --git a/docs/content/instrumentation/caffeine.md b/docs/content/instrumentation/caffeine.md
index 104a9b9fa..90a88c05f 100644
--- a/docs/content/instrumentation/caffeine.md
+++ b/docs/content/instrumentation/caffeine.md
@@ -99,7 +99,7 @@ Two metrics exist for observability specifically of caches that define a `weighe
 
 ```text
 # TYPE caffeine_cache_eviction_weight counter
-# HELP caffeine_cache_eviction_weight Weight of evicted cache entries, doesn't include manually removed entries // editorconfig-checker-disable-line
+# HELP caffeine_cache_eviction_weight Weight of evicted cache entries, doesn't include manually removed entries
 
 caffeine_cache_eviction_weight_total{cache="mycache"} 5.0
 # TYPE caffeine_cache_weighted_size gauge
diff --git a/docs/content/instrumentation/jvm.md b/docs/content/instrumentation/jvm.md
index 804c1b09b..3a658c05b 100644
--- a/docs/content/instrumentation/jvm.md
+++ b/docs/content/instrumentation/jvm.md
@@ -3,6 +3,16 @@ title: JVM
 weight: 1
 ---
 
+{{< hint type=note >}}
+
+Looking for JVM metrics that follow OTel semantic
+conventions? See
+[OTel JVM Runtime Metrics]({{< relref "../otel/jvm-runtime-metrics.md" >}})
+for an alternative based on OpenTelemetry's
+runtime-telemetry module.
+
+{{< /hint >}}
+
 The JVM instrumentation module provides a variety of out-of-the-box JVM and process metrics. To use
 it, add the following dependency:
 
@@ -44,9 +54,9 @@ register all JVM metrics, you can register each of these classes individually ra
 ## JVM Buffer Pool Metrics
 
 JVM buffer pool metrics are provided by
-the [JvmBufferPoolMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmBufferPoolMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetrics.html)
 class. The data is coming from
-the [BufferPoolMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/BufferPoolMXBean.html). <!-- editorconfig-checker-disable-line -->
+the [BufferPoolMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/BufferPoolMXBean.html).
 Example metrics:
 
 ```text
@@ -67,13 +77,11 @@ jvm_buffer_pool_used_bytes{pool="mapped"} 0.0
 ## JVM Class Loading Metrics
 
 JVM class loading metrics are provided by
-the [JvmClassLoadingMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmClassLoadingMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetrics.html)
 class. The data is coming from
-the [ClassLoadingMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/ClassLoadingMXBean.html). <!-- editorconfig-checker-disable-line -->
+the [ClassLoadingMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/ClassLoadingMXBean.html).
 Example metrics:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # HELP jvm_classes_currently_loaded The number of classes that are currently loaded in the JVM
 # TYPE jvm_classes_currently_loaded gauge
@@ -86,32 +94,26 @@ jvm_classes_loaded_total 1109.0
 jvm_classes_unloaded_total 0.0
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## JVM Compilation Metrics
 
 JVM compilation metrics are provided by
-the [JvmCompilationMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmCompilationMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetrics.html)
 class. The data is coming from
-the [CompilationMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/CompilationMXBean.html). <!-- editorconfig-checker-disable-line -->
+the [CompilationMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/CompilationMXBean.html).
 Example metrics:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # HELP jvm_compilation_time_seconds_total The total time in seconds taken for HotSpot class compilation
 # TYPE jvm_compilation_time_seconds_total counter
 jvm_compilation_time_seconds_total 0.152
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## JVM Garbage Collector Metrics
 
 JVM garbage collector metrics are provided by
-the [JvmGarbageCollectorMetric](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmGarbageCollectorMetric](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.html)
 class. The data is coming from
-the [GarbageCollectorMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/GarbageCollectorMXBean.html). <!-- editorconfig-checker-disable-line -->
+the [GarbageCollectorMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/GarbageCollectorMXBean.html).
 Example metrics:
 
 ```text
@@ -126,14 +128,12 @@ jvm_gc_collection_seconds_sum{gc="PS Scavenge"} 0.0
 ## JVM Memory Metrics
 
 JVM memory metrics are provided by
-the [JvmMemoryMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmMemoryMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetrics.html)
 class. The data is coming from
-the [MemoryMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/MemoryMXBean.html) <!-- editorconfig-checker-disable-line -->
-and the [MemoryPoolMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html). <!-- editorconfig-checker-disable-line -->
+the [MemoryMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/MemoryMXBean.html)
+and the [MemoryPoolMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/MemoryPoolMXBean.html).
 Example metrics:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # HELP jvm_memory_committed_bytes Committed (bytes) of a given JVM memory area.
 # TYPE jvm_memory_committed_bytes gauge
@@ -208,19 +208,15 @@ jvm_memory_used_bytes{area="heap"} 9051232.0
 jvm_memory_used_bytes{area="nonheap"} 1.1490688E7
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## JVM Memory Pool Allocation Metrics
 
 JVM memory pool allocation metrics are provided by
-the [JvmMemoryPoolAllocationMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmMemoryPoolAllocationMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetrics.html)
 class. The data is obtained by adding
-a [NotificationListener](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/javax/management/NotificationListener.html) <!-- editorconfig-checker-disable-line -->
-to the [GarbageCollectorMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/GarbageCollectorMXBean.html). <!-- editorconfig-checker-disable-line -->
+a [NotificationListener](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/javax/management/NotificationListener.html)
+to the [GarbageCollectorMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/GarbageCollectorMXBean.html).
 Example metrics:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # HELP jvm_memory_pool_allocated_bytes_total Total bytes allocated in a given JVM memory pool. Only updated after GC, not continuously.
 # TYPE jvm_memory_pool_allocated_bytes_total counter
@@ -232,35 +228,27 @@ jvm_memory_pool_allocated_bytes_total{pool="PS Old Gen"} 1428888.0
 jvm_memory_pool_allocated_bytes_total{pool="PS Survivor Space"} 4115280.0
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## JVM Runtime Info Metric
 
 The JVM runtime info metric is provided by
-the [JvmRuntimeInfoMetric](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetric.html) <!-- editorconfig-checker-disable-line -->
+the [JvmRuntimeInfoMetric](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetric.html)
 class. The data is obtained via system properties and will not change throughout the lifetime of the
 application. Example metric:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # TYPE jvm_runtime info
 # HELP jvm_runtime JVM runtime info
 jvm_runtime_info{runtime="OpenJDK Runtime Environment",vendor="Oracle Corporation",version="1.8.0_382-b05"} 1
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## JVM Thread Metrics
 
 JVM thread metrics are provided by
-the [JvmThreadsMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetrics.html) <!-- editorconfig-checker-disable-line -->
+the [JvmThreadsMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetrics.html)
 class. The data is coming from
-the [ThreadMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/ThreadMXBean.html). <!-- editorconfig-checker-disable-line -->
+the [ThreadMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/ThreadMXBean.html).
 Example metrics:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # HELP jvm_threads_current Current thread count of a JVM
 # TYPE jvm_threads_current gauge
@@ -291,20 +279,18 @@ jvm_threads_state{state="UNKNOWN"} 0.0
 jvm_threads_state{state="WAITING"} 3.0
 ```
 
-<!-- editorconfig-checker-enable -->
-
 ## Process Metrics
 
 Process metrics are provided by
 the [ProcessMetrics](/client_java/api/io/prometheus/metrics/instrumentation/jvm/ProcessMetrics.html)
 class. The data is coming from
-the [OperatingSystemMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/OperatingSystemMXBean.html), <!-- editorconfig-checker-disable-line -->
-the [RuntimeMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/RuntimeMXBean.html), <!-- editorconfig-checker-disable-line -->
+the [OperatingSystemMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/OperatingSystemMXBean.html),
+the [RuntimeMXBean](https://docs.oracle.com/en/java/javase/21/docs/api/java.management/java/lang/management/RuntimeMXBean.html),
 and from the `/proc/self/status` file on Linux. The metrics with prefix `process_` are not specific
 to Java, but should be provided by every Prometheus client library,
 see [Process Metrics](https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics)
 in the
-Prometheus [writing client libraries](https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics) <!-- editorconfig-checker-disable-line -->
+Prometheus [writing client libraries](https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics)
 documentation. Example metrics:
 
 ```text
diff --git a/docs/content/internals/model.md b/docs/content/internals/model.md
index c54e79ee3..629e87bf0 100644
--- a/docs/content/internals/model.md
+++ b/docs/content/internals/model.md
@@ -19,13 +19,16 @@ All metric types implement
 the [Collector](/client_java/api/io/prometheus/metrics/model/registry/Collector.html) interface,
 i.e. they provide
 a [collect()](</client_java/api/io/prometheus/metrics/model/registry/Collector.html#collect()>)
-method to produce snapshots.
+method to produce snapshots. Implementers expose their registration-time metadata via
+`getMetricFamilyDescriptor()` (or `getMetricFamilyDescriptors()` on `MultiCollector`). When that
+returns `null`, the collector is not validated at registration and must avoid producing the same
+metric name and label schema as another collector, or exposition may be invalid.
 
 ## prometheus-metrics-model
 
 The model is an internal library, implementing read-only immutable snapshots. These snapshots are
 returned by
-the [Collector.collect()](</client_java/api/io/prometheus/metrics/model/registry/Collector.html#collect()>) <!-- editorconfig-checker-disable-line -->
+the [Collector.collect()](</client_java/api/io/prometheus/metrics/model/registry/Collector.html#collect()>)
 method.
 
 There is no need for users to use `prometheus-metrics-model` directly. Users should use the API
diff --git a/docs/content/internals/stability.md b/docs/content/internals/stability.md
new file mode 100644
index 000000000..d960c7ffa
--- /dev/null
+++ b/docs/content/internals/stability.md
@@ -0,0 +1,33 @@
+---
+title: API stability
+weight: 2
+---
+
+The published Java API surface is marked with the
+[`@StableApi`](/client_java/api/io/prometheus/metrics/annotations/StableApi.html) annotation. The
+annotation is opt-in: only annotated types and members are part of the stable, published API and
+follow semantic versioning — backwards-incompatible changes happen only in a major version bump.
+Unannotated public types are not part of the stability contract and may change in any release.
+
+`@StableApi` can be applied to a type to publish the type and its members, or to individual
+constructors, methods, and fields when only part of a public type is stable.
+
+## API diff check
+
+CI runs [japicmp](https://siom79.github.io/japicmp/) against a pinned baseline release and writes
+the published API diffs under `docs/apidiffs/current_vs_latest/`. Pull requests must keep those
+checked-in diffs up to date. Run it locally with:
+
+```bash
+mise run api-diff
+```
+
+Raw reports are written to `**/target/japicmp/*`.
+
+The baseline version is tracked in `pom.xml` and updated by Renovate; the published baseline diffs
+are stored under `docs/apidiffs/`.
+
+Pull requests that change `docs/apidiffs/current_vs_latest/` are automatically labeled
+`api-change` for additional maintainer review. If the committed API diff contains breaking-change
+markers such as `***!`, `---!`, or `+++!`, the pull request is also labeled
+`breaking-api-change`.
diff --git a/docs/content/otel/jvm-runtime-metrics.md b/docs/content/otel/jvm-runtime-metrics.md
new file mode 100644
index 000000000..f8206be15
--- /dev/null
+++ b/docs/content/otel/jvm-runtime-metrics.md
@@ -0,0 +1,241 @@
+---
+title: JVM Runtime Metrics
+weight: 4
+---
+
+OpenTelemetry's
+[runtime-telemetry](https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/runtime-telemetry)
+module is an alternative to
+[prometheus-metrics-instrumentation-jvm]({{< relref "../instrumentation/jvm.md" >}})
+for users who want JVM metrics following OTel semantic conventions.
+
+Key advantages:
+
+- Metric names follow
+  [OTel semantic conventions](https://opentelemetry.io/docs/specs/semconv/runtime/jvm-metrics/)
+- Java 17+ JFR support (context switches, network I/O,
+  lock contention, memory allocation)
+- Alignment with the broader OTel ecosystem
+
+Since OpenTelemetry's `opentelemetry-exporter-prometheus`
+already depends on this library's `PrometheusRegistry`,
+no additional code is needed in this library — only the
+OTel SDK wiring shown below.
+
+## Dependencies
+
+Use the [OTel Support]({{< relref "support.md" >}}) module
+to pull in the OTel SDK and Prometheus exporter, then add
+the runtime-telemetry instrumentation:
+
+{{< tabs "jvm-runtime-deps" >}}
+{{< tab "Gradle" >}}
+
+```groovy
+implementation 'io.prometheus:prometheus-metrics-otel-support:$version'
+
+// Use opentelemetry-runtime-telemetry-java8 (Java 8+)
+// or opentelemetry-runtime-telemetry-java17 (Java 17+, JFR-based)
+implementation(
+    'io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:$otelVersion-alpha'
+)
+```
+
+{{< /tab >}}
+{{< tab "Maven" >}}
+
+```xml
+<dependency>
+    <groupId>io.prometheus</groupId>
+    <artifactId>prometheus-metrics-otel-support</artifactId>
+    <version>$version</version>
+    <type>pom</type>
+</dependency>
+
+<!-- Pick ONE of the following -->
+<!-- Java 8+ -->
+<dependency>
+    <groupId>io.opentelemetry.instrumentation</groupId>
+    <artifactId>opentelemetry-runtime-telemetry-java8</artifactId>
+    <version>$otelVersion-alpha</version>
+</dependency>
+<!-- Java 17+ (adds JFR-based metrics) -->
+<!--
+<dependency>
+    <groupId>io.opentelemetry.instrumentation</groupId>
+    <artifactId>opentelemetry-runtime-telemetry-java17</artifactId>
+    <version>$otelVersion-alpha</version>
+</dependency>
+-->
+```
+
+{{< /tab >}}
+{{< /tabs >}}
+
+## Standalone Setup
+
+If you **only** want OTel runtime metrics exposed as
+Prometheus, without any Prometheus Java client metrics:
+
+```java
+import io.opentelemetry.exporter.prometheus.PrometheusHttpServer;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+
+PrometheusHttpServer prometheusServer =
+    PrometheusHttpServer.builder()
+        .setPort(9464)
+        .build();
+
+OpenTelemetrySdk openTelemetry =
+    OpenTelemetrySdk.builder()
+        .setMeterProvider(
+            SdkMeterProvider.builder()
+                .registerMetricReader(prometheusServer)
+                .build())
+        .build();
+
+RuntimeMetrics runtimeMetrics =
+    RuntimeMetrics.builder(openTelemetry).build();
+
+// Close on shutdown to stop metric collection and server
+Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+  runtimeMetrics.close();
+  prometheusServer.close();
+}));
+
+// Scrape at http://localhost:9464/metrics
+```
+
+## Combined with Prometheus Java Client Metrics
+
+If you already have Prometheus Java client metrics and want to
+add OTel runtime metrics to the **same** `/metrics`
+endpoint, use `PrometheusMetricReader` to bridge OTel
+metrics into a `PrometheusRegistry`:
+
+```java
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.exporter.httpserver.HTTPServer;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
+import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+
+PrometheusRegistry registry =
+    new PrometheusRegistry();
+
+// Register Prometheus metrics as usual
+Counter myCounter = Counter.builder()
+    .name("my_requests_total")
+    .register(registry);
+
+// Bridge OTel metrics into the same registry
+PrometheusMetricReader reader =
+    PrometheusMetricReader.create();
+registry.register(reader);
+
+OpenTelemetrySdk openTelemetry =
+    OpenTelemetrySdk.builder()
+        .setMeterProvider(
+            SdkMeterProvider.builder()
+                .registerMetricReader(reader)
+                .build())
+        .build();
+
+RuntimeMetrics runtimeMetrics =
+    RuntimeMetrics.builder(openTelemetry).build();
+Runtime.getRuntime()
+    .addShutdownHook(new Thread(runtimeMetrics::close));
+
+// Expose everything on one endpoint
+HTTPServer.builder()
+    .port(9400)
+    .registry(registry)
+    .buildAndStart();
+```
+
+The [examples/example-otel-jvm-runtime-metrics](https://github.com/prometheus/client_java/tree/main/examples/example-otel-jvm-runtime-metrics)
+directory has a complete runnable example.
+
+## Configuration
+
+The `RuntimeMetricsBuilder` supports two configuration
+options:
+
+### `captureGcCause()`
+
+Adds a `jvm.gc.cause` attribute to the `jvm.gc.duration`
+metric, indicating why the garbage collection occurred
+(e.g. `G1 Evacuation Pause`, `System.gc()`):
+
+```java
+RuntimeMetrics.builder(openTelemetry)
+    .captureGcCause()
+    .build();
+```
+
+### `emitExperimentalTelemetry()`
+
+Enables additional experimental metrics beyond the stable
+set. These are not yet part of the OTel semantic conventions
+and may change in future releases:
+
+- Buffer pool metrics (direct and mapped byte buffers)
+- Extended CPU metrics
+- Extended memory pool metrics
+- File descriptor metrics
+
+```java
+RuntimeMetrics.builder(openTelemetry)
+    .emitExperimentalTelemetry()
+    .build();
+```
+
+Both options can be combined:
+
+```java
+RuntimeMetrics.builder(openTelemetry)
+    .captureGcCause()
+    .emitExperimentalTelemetry()
+    .build();
+```
+
+Selective per-metric registration is not supported by the
+runtime-telemetry API — it is all-or-nothing with these
+two toggles.
+
+## Java 17 JFR Support
+
+The `opentelemetry-runtime-telemetry-java17` variant adds
+JFR-based metrics. You can selectively enable features:
+
+```java
+import io.opentelemetry.instrumentation.runtimemetrics.java17.JfrFeature;
+import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics;
+
+RuntimeMetrics.builder(openTelemetry)
+    .enableFeature(JfrFeature.BUFFER_METRICS)
+    .enableFeature(JfrFeature.NETWORK_IO_METRICS)
+    .enableFeature(JfrFeature.LOCK_METRICS)
+    .enableFeature(JfrFeature.CONTEXT_SWITCH_METRICS)
+    .build();
+```
+
+## Metric Names
+
+OTel metric names are converted to Prometheus format by
+the exporter. Examples:
+
+| OTel name                    | Prometheus name                    |
+| ---------------------------- | ---------------------------------- |
+| `jvm.memory.used`            | `jvm_memory_used_bytes`            |
+| `jvm.gc.duration`            | `jvm_gc_duration_seconds`          |
+| `jvm.thread.count`           | `jvm_thread_count`                 |
+| `jvm.class.loaded`           | `jvm_class_loaded`                 |
+| `jvm.cpu.recent_utilization` | `jvm_cpu_recent_utilization_ratio` |
+
+See [Names]({{< relref "names.md" >}}) for full details on
+how OTel names map to Prometheus names.
diff --git a/docs/content/otel/names.md b/docs/content/otel/names.md
index a5425e07f..66e40f7e2 100644
--- a/docs/content/otel/names.md
+++ b/docs/content/otel/names.md
@@ -5,15 +5,16 @@ weight: 3
 
 OpenTelemetry naming conventions are different from Prometheus naming conventions. The mapping from
 OpenTelemetry metric names to Prometheus metric names is well defined in
-OpenTelemetry's [Prometheus and OpenMetrics Compatibility](https://opentelemetry.io/docs/specs/otel/compatibility/prometheus_and_openmetrics/) <!-- editorconfig-checker-disable-line -->
+OpenTelemetry's [Prometheus and OpenMetrics Compatibility](https://opentelemetry.io/docs/specs/otel/compatibility/prometheus_and_openmetrics/)
 spec, and
-the [OpenTelemetryExporter](/client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.html) <!-- editorconfig-checker-disable-line -->
+the [OpenTelemetryExporter](/client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.html)
 implements that specification.
 
-The goal is, if you set up a pipeline as illustrated below, you will see the same metric names in
-the Prometheus server as if you had exposed Prometheus metrics directly.
+The goal is, if you set up a pipeline as illustrated below, you will see the same
+metric names in the Prometheus server as if you had exposed Prometheus metrics
+directly.
 
-![Image of a with the Prometheus client library pushing metrics to an OpenTelemetry collector](/client_java/images/otel-pipeline.png) <!-- editorconfig-checker-disable-line -->
+![Image of a with the Prometheus client library pushing metrics to an OpenTelemetry collector][otel-pipeline]
 
 The main steps when converting OpenTelemetry metric names to Prometheus metric names are:
 
@@ -21,11 +22,31 @@ The main steps when converting OpenTelemetry metric names to Prometheus metric n
 - If the metric has a unit, append the unit to the metric name, like `_seconds`.
 - If the metric type has a suffix, append it, like `_total` for counters.
 
+## `preserve_names`
+
+The Prometheus Java client library can also export its own metrics to OpenTelemetry using the
+[OpenTelemetryExporter](/client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.html).
+
+For that exporter, `io.prometheus.exporter.opentelemetry.preserve_names=true` preserves metric
+names exactly as they were written in the Prometheus Java client.
+
+Examples:
+
+| Prometheus Java metric             | Default OTel export   | With `preserve_names=true`  |
+| ---------------------------------- | --------------------- | --------------------------- |
+| `Counter("events")`                | `events`              | `events`                    |
+| `Counter("events_total")`          | `events`              | `events_total`              |
+| `Counter("req").unit(BYTES)`       | name `req`, unit `By` | name `req`, unit `By`       |
+| `Counter("req_bytes").unit(BYTES)` | name `req`, unit `By` | name `req_bytes`, unit `By` |
+
+Today the default is `false` for backward compatibility. It is planned to change to `true` in the
+next major release.
+
 ## Dots in Metric and Label Names
 
 OpenTelemetry defines not only a line protocol, but also _semantic conventions_, i.e. standardized
 metric and label names. For example,
-OpenTelemetry's [Semantic Conventions for HTTP Metrics](https://opentelemetry.io/docs/specs/otel/metrics/semantic_conventions/http-metrics/) <!-- editorconfig-checker-disable-line -->
+OpenTelemetry's [Semantic Conventions for HTTP Metrics](https://opentelemetry.io/docs/specs/otel/metrics/semantic_conventions/http-metrics/)
 say that if you instrument an HTTP server with OpenTelemetry, you must have a histogram named
 `http.server.duration`.
 
@@ -34,3 +55,4 @@ Dots in metric and label names are now supported in the Prometheus Java client l
 described in [Unicode support].
 
 [Unicode support]: {{< relref "../exporters/unicode.md" >}}
+[otel-pipeline]: /client_java/images/otel-pipeline.png
diff --git a/docs/content/otel/otlp.md b/docs/content/otel/otlp.md
index 568219dd0..e2ea987dd 100644
--- a/docs/content/otel/otlp.md
+++ b/docs/content/otel/otlp.md
@@ -3,10 +3,10 @@ title: OTLP
 weight: 1
 ---
 
-The Prometheus Java client library allows you to push metrics to an OpenTelemetry endpoint using the
-OTLP protocol.
+The Prometheus Java client library allows you to push metrics to an
+OpenTelemetry endpoint using the OTLP protocol.
 
-![Image of a with the Prometheus client library pushing metrics to an OpenTelemetry collector](/client_java/images/otel-pipeline.png) <!-- editorconfig-checker-disable-line -->
+![Image of a with the Prometheus client library pushing metrics to an OpenTelemetry collector][otel-pipeline]
 
 To implement this, you need to include `prometheus-metrics-exporter` as a dependency
 
@@ -39,23 +39,31 @@ OpenTelemetryExporter.builder()
     .buildAndStart();
 ```
 
-By default, the `OpenTelemetryExporter` will push metrics every 60 seconds to `localhost:4317` using
-`grpc` protocol. You can configure this in code using
-the [OpenTelemetryExporter.Builder](/client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html), <!-- editorconfig-checker-disable-line -->
-or at runtime via [`io.prometheus.exporter.opentelemetry.*`]({{< relref "../config/config.md#exporter-opentelemetry-properties" >}}) <!-- editorconfig-checker-disable-line -->
-properties.
+By default, the `OpenTelemetryExporter` will push metrics every 60 seconds to
+`localhost:4317` using `grpc` protocol. You can configure this in code using
+the [OpenTelemetryExporter.Builder][builder-javadoc], or at runtime via
+[`io.prometheus.exporter.opentelemetry.*`][otel-properties] properties.
+
+The OpenTelemetry exporter also honors the shared [`io.prometheus.exporter.filter.*`][exporter-filter-properties] metric-name
+filter properties.
 
 In addition to the Prometheus Java client configuration, the exporter also recognizes standard
 OpenTelemetry configuration. For example, you can set
-the [OTEL_EXPORTER_OTLP_METRICS_ENDPOINT](https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/#otel_exporter_otlp_metrics_endpoint) <!-- editorconfig-checker-disable-line -->
+the [OTEL_EXPORTER_OTLP_METRICS_ENDPOINT](https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/#otel_exporter_otlp_metrics_endpoint)
 environment variable to configure the endpoint. The Javadoc
-for [OpenTelemetryExporter.Builder](/client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html) <!-- editorconfig-checker-disable-line -->
+for [OpenTelemetryExporter.Builder](/client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html)
 shows which settings have corresponding OTel configuration. The intended use case is that if you
 attach the
 [OpenTelemetry Java agent](https://github.com/open-telemetry/opentelemetry-java-instrumentation/)
 for tracing, and use the Prometheus Java client for metrics, it is sufficient to configure the OTel
 agent because the Prometheus library will pick up the same configuration.
 
-The [examples/example-exporter-opentelemetry](https://github.com/prometheus/client_java/tree/main/examples/example-exporter-opentelemetry) <!-- editorconfig-checker-disable-line -->
-folder has a Docker compose with a complete end-to-end example, including a Java app, the OTel
-collector, and a Prometheus server.
+The [examples/example-exporter-opentelemetry][opentelemetry-example] folder has
+a Docker compose with a complete end-to-end example, including a Java app, the
+OTel collector, and a Prometheus server.
+
+[builder-javadoc]: /client_java/api/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.Builder.html
+[opentelemetry-example]: https://github.com/prometheus/client_java/tree/main/examples/example-exporter-opentelemetry
+[otel-pipeline]: /client_java/images/otel-pipeline.png
+[exporter-filter-properties]: {{< relref "../config/config.md#exporter-filter-properties" >}}
+[otel-properties]: {{< relref "../config/config.md#exporter-opentelemetry-properties" >}}
diff --git a/docs/content/otel/support.md b/docs/content/otel/support.md
new file mode 100644
index 000000000..e3b8cbe3a
--- /dev/null
+++ b/docs/content/otel/support.md
@@ -0,0 +1,47 @@
+---
+title: OTel Support
+weight: 2
+---
+
+The `prometheus-metrics-otel-support` module bundles the
+OpenTelemetry SDK and the Prometheus exporter into a single
+POM dependency.
+
+Use this module when you want to combine OpenTelemetry
+instrumentations (e.g. JVM runtime metrics) with the
+Prometheus Java client on one `/metrics` endpoint.
+
+## Dependencies
+
+{{< tabs "otel-support-deps" >}}
+{{< tab "Gradle" >}}
+
+```groovy
+implementation 'io.prometheus:prometheus-metrics-otel-support:$version'
+```
+
+{{< /tab >}}
+{{< tab "Maven" >}}
+
+```xml
+<dependency>
+    <groupId>io.prometheus</groupId>
+    <artifactId>prometheus-metrics-otel-support</artifactId>
+    <version>$version</version>
+    <type>pom</type>
+</dependency>
+```
+
+{{< /tab >}}
+{{< /tabs >}}
+
+This single dependency replaces:
+
+- `io.opentelemetry:opentelemetry-sdk`
+- `io.opentelemetry:opentelemetry-exporter-prometheus`
+
+## Use Cases
+
+See [JVM Runtime Metrics]({{< relref "jvm-runtime-metrics.md" >}})
+for a concrete example of combining OTel JVM metrics with
+the Prometheus Java client.
diff --git a/docs/content/otel/tracing.md b/docs/content/otel/tracing.md
index 0e3fb72fa..9d598c6f4 100644
--- a/docs/content/otel/tracing.md
+++ b/docs/content/otel/tracing.md
@@ -6,7 +6,7 @@ weight: 2
 OpenTelemetry’s
 [vision statement](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md)
 says that
-[telemetry should be loosely coupled](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md#telemetry-should-be-loosely-coupled), <!-- editorconfig-checker-disable-line -->
+[telemetry should be loosely coupled](https://github.com/open-telemetry/community/blob/main/mission-vision-values.md#telemetry-should-be-loosely-coupled),
 allowing end users to pick and choose from the pieces they want without having to bring in the rest
 of the project, too. In that spirit, you might choose to instrument your Java application with the
 Prometheus Java client library for metrics, and attach the
@@ -56,7 +56,7 @@ Exemplars are only selected every
 [`minRetentionPeriodSeconds`]({{< relref "../config/config.md#exemplar-properties" >}}) seconds.
 
 Here's an example of how to configure OpenTelemetry's
-[tail sampling processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/processor/tailsamplingprocessor/) <!-- editorconfig-checker-disable-line -->
+[tail sampling processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/tailsamplingprocessor/)
 to sample all Spans marked with `exemplar="true"`, and then discard 90% of the traces:
 
 ```yaml
@@ -71,7 +71,47 @@ policies:
   ]
 ```
 
-The [examples/example-exemplar-tail-sampling/](https://github.com/prometheus/client_java/tree/main/examples/example-exemplars-tail-sampling) <!-- editorconfig-checker-disable-line -->
+The [examples/example-exemplar-tail-sampling/](https://github.com/prometheus/client_java/tree/main/examples/example-exemplars-tail-sampling)
 directory has a complete end-to-end example, with a distributed Java application with two services,
 an OpenTelemetry collector, Prometheus, Tempo as a trace database, and Grafana dashboards. Use
 docker-compose as described in the example's readme to run the example and explore the results.
+
+## Adding custom labels to exemplars
+
+Automatically-sampled exemplars carry the `trace_id` and `span_id` labels. You can attach
+additional, custom labels (for example an internal identifier) to every automatically-sampled
+exemplar. There are two options.
+
+### Global (all metrics)
+
+Register a global supplier to add custom labels to the exemplars of _all_ metrics, including
+metrics registered by third-party libraries that you do not control. This is the right option when
+you cannot modify the code that creates the metric:
+
+```java
+ExemplarLabelsSupplier.setExemplarLabelsSupplier(
+    () -> Labels.of("management_id", currentManagementId()));
+```
+
+### Per metric
+
+If you only want the extra labels on a specific metric you define yourself, use the builder:
+
+```java
+Counter counter =
+    Counter.builder()
+        .name("requests_total")
+        .exemplarLabelsSupplier(() -> Labels.of("management_id", currentManagementId()))
+        .build();
+```
+
+### Notes
+
+- The supplier is invoked on the (rate-limited) hot path each time an exemplar is sampled, so it
+  should be cheap. It may return dynamic, request-scoped values (e.g. read from a thread-local).
+- Custom labels are only added when a valid, sampled span context is present; the supplier never
+  causes an exemplar to be created on its own.
+- Precedence on a label-name collision: the reserved `trace_id`/`span_id` labels always win, then
+  the per-metric supplier, then the global supplier. Colliding labels are silently dropped.
+- If the supplier throws, the exception is swallowed and the exemplar is created without the
+  additional labels, so a misbehaving supplier never breaks metric collection.
diff --git a/docs/hugo.toml b/docs/hugo.toml
index b558774ec..9223f49ef 100644
--- a/docs/hugo.toml
+++ b/docs/hugo.toml
@@ -17,18 +17,18 @@ enableRobotsTXT = true
 
 # Needed for mermaid shortcodes
 [markup]
-  [markup.goldmark.renderer]
-    # Needed for mermaid shortcode
-    unsafe = true
-  [markup.tableOfContents]
-    startLevel = 1
-    endLevel = 9
-  [markup.highlight]
-    style = 'solarized-dark'
+[markup.goldmark.renderer]
+# Needed for mermaid shortcode
+unsafe = true
+[markup.tableOfContents]
+startLevel = 1
+endLevel = 9
+[markup.highlight]
+style = 'solarized-dark'
 
 [taxonomies]
-   tag = "tags"
+tag = "tags"
 
 [caches]
-  [caches.images]
-    dir = ':cacheDir/images'
+[caches.images]
+dir = ':cacheDir/images'
diff --git a/docs/themes/hugo-geekdoc/layouts/partials/microformats/schema.html b/docs/themes/hugo-geekdoc/layouts/partials/microformats/schema.html
index e4a71eb4e..7e49ef8c7 100644
--- a/docs/themes/hugo-geekdoc/layouts/partials/microformats/schema.html
+++ b/docs/themes/hugo-geekdoc/layouts/partials/microformats/schema.html
@@ -1,70 +1,58 @@
 {{ $isPage := or (and (ne .Type "posts") (in "section page" .Kind )) (and (eq .Type "posts") (eq .Kind "page")) }}
 {{- if eq .Kind "home" }}
+  {{- $schema := dict "@context" "http://schema.org" "@type" "WebSite" "name" .Site.Title "url" .Site.BaseURL "inLanguage" .Lang }}
+  {{- with partial "utils/description" . }}
+    {{- $schema = merge $schema (dict "description" (. | plainify | htmlUnescape | chomp)) }}
+  {{- end }}
+  {{- with partial "utils/featured" . }}
+    {{- $schema = merge $schema (dict "thumbnailUrl" .) }}
+  {{- end }}
+  {{- with .Site.Params.geekdocContentLicense }}
+    {{- $schema = merge $schema (dict "license" .name) }}
+  {{- end }}
   <script type="application/ld+json">
-  {
-      "@context": "http://schema.org",
-      "@type": "WebSite",
-      "name": {{ .Site.Title }},
-      "url": {{ .Site.BaseURL }},
-      {{- with partial "utils/description" . }}
-      "description": "{{ . | plainify | htmlUnescape | chomp }}",
-      {{- end }}
-      {{- with partial "utils/featured" . }}
-      "thumbnailUrl": {{ . }},
-      {{- end }}
-      {{- with .Site.Params.geekdocContentLicense }}
-      "license": "{{ .name }}",
-      {{- end }}
-      "inLanguage": {{ .Lang }}
-  }
+  {{- $schema | jsonify | safeJS }}
   </script>
 {{- else if $isPage }}
+  {{- $title := partial "utils/title" . }}
+  {{- $schema := dict
+      "@context" "http://schema.org"
+      "@type" "TechArticle"
+      "articleSection" (.Section | humanize | title)
+      "name" $title
+      "url" .Permalink
+      "headline" $title
+      "wordCount" (string .WordCount)
+      "inLanguage" .Lang
+      "isFamilyFriendly" "true"
+      "copyrightHolder" .Site.Title
+      "copyrightYear" (.Date.Format "2006")
+      "dateCreated" (.Date.Format "2006-01-02T15:04:05.00Z")
+      "datePublished" (.PublishDate.Format "2006-01-02T15:04:05.00Z")
+      "dateModified" (.Lastmod.Format "2006-01-02T15:04:05.00Z")
+    }}
+  {{- with .Params.lead }}
+    {{- $schema = merge $schema (dict "alternativeHeadline" .) }}
+  {{- end }}
+  {{- with partial "utils/description" . }}
+    {{- $schema = merge $schema (dict "description" (. | plainify | htmlUnescape | chomp)) }}
+  {{- end }}
+  {{- with partial "utils/featured" . }}
+    {{- $schema = merge $schema (dict "thumbnailUrl" .) }}
+  {{- end }}
+  {{- with .Site.Params.geekdocContentLicense }}
+    {{- $schema = merge $schema (dict "license" .name) }}
+  {{- end }}
+  {{- $mainEntity := dict "@type" "WebPage" "@id" .Permalink }}
+  {{- $schema = merge $schema (dict "mainEntityOfPage" $mainEntity) }}
+  {{- with $tags := .Params.tags }}
+    {{- $schema = merge $schema (dict "keywords" $tags) }}
+  {{- end }}
+  {{- $logoUrl := default "brand.svg" .Site.Params.logo | absURL }}
+  {{- $logo := dict "@type" "ImageObject" "url" $logoUrl "width" "32" "height" "32" }}
+  {{- $publisher := dict "@type" "Organization" "name" .Site.Title "url" .Site.BaseURL "logo" $logo }}
+  {{- $schema = merge $schema (dict "publisher" $publisher) }}
   <script type="application/ld+json">
-  {
-      "@context": "http://schema.org",
-      "@type": "TechArticle",
-      "articleSection": "{{ .Section | humanize | title }}",
-      "name": {{ partial "utils/title" . }},
-      "url" : {{ .Permalink }},
-      "headline": {{ partial "utils/title" . }},
-      {{- with .Params.lead }}
-      "alternativeHeadline": {{ . }},
-      {{- end }}
-      {{- with partial "utils/description" . }}
-      "description": "{{ . | plainify | htmlUnescape | chomp }}",
-      {{- end }}
-      {{- with partial "utils/featured" . }}
-      "thumbnailUrl": {{ . }},
-      {{- end }}
-      "wordCount" : "{{ .WordCount }}",
-      {{- with .Site.Params.geekdocContentLicense }}
-      "license": "{{ .name }}",
-      {{- end }}
-      "inLanguage": {{ .Lang }},
-      "isFamilyFriendly": "true",
-      "mainEntityOfPage": {
-          "@type": "WebPage",
-          "@id": {{ .Permalink }}
-      },
-      {{- with $tags := .Params.tags }}
-      "keywords" : [ {{ range $i, $tag := $tags }}{{ if $i }}, {{ end }}"{{ $tag }}" {{ end }}],
-      {{- end }}
-      "copyrightHolder" : "{{ .Site.Title }}",
-      "copyrightYear" : "{{ .Date.Format "2006" }}",
-      "dateCreated": "{{ .Date.Format "2006-01-02T15:04:05.00Z" | safeJS }}",
-      "datePublished": "{{ .PublishDate.Format "2006-01-02T15:04:05.00Z" | safeJS }}",
-      "dateModified": "{{ .Lastmod.Format "2006-01-02T15:04:05.00Z" | safeJS }}",
-      "publisher":{
-          "@type":"Organization",
-          "name": {{ .Site.Title }},
-          "url": {{ .Site.BaseURL }},
-          "logo": {
-              "@type": "ImageObject",
-              "url": {{ (default "brand.svg" .Site.Params.logo) | absURL }},
-              "width":"32",
-              "height":"32"
-          }
-      }
-  }
+  {{- $schema | jsonify | safeJS }}
   </script>
 {{- end }}
diff --git a/examples/example-custom-buckets/README.md b/examples/example-custom-buckets/README.md
new file mode 100644
index 000000000..a1d2c10bb
--- /dev/null
+++ b/examples/example-custom-buckets/README.md
@@ -0,0 +1,167 @@
+# Native Histograms with Custom Buckets (NHCB) Example
+
+This example demonstrates how to use native histograms with custom bucket boundaries (NHCB) in
+Prometheus Java client. It shows three different types of custom bucket configurations and how
+Prometheus converts them to native histograms with schema -53.
+
+## What are Native Histograms with Custom Buckets?
+
+Native Histograms with Custom Buckets (NHCB) is a Prometheus feature that combines the benefits of:
+
+- **Custom bucket boundaries**: Precisely defined buckets optimized for your specific use case
+- **Native histograms**: Efficient storage and querying capabilities of native histograms
+
+When you configure Prometheus with `convert_classic_histograms_to_nhcb: true`, it converts classic
+histograms with custom buckets into native histograms using schema -53, preserving the custom
+bucket boundaries.
+
+## Example Metrics
+
+This example application generates three different histogram metrics demonstrating different
+bucket configuration strategies:
+
+### 1. API Latency - Arbitrary Custom Boundaries
+
+```java
+Histogram apiLatency = Histogram.builder()
+    .name("api_request_duration_seconds")
+    .classicUpperBounds(0.01, 0.05, 0.1, 0.5, 1.0, 5.0, 10.0)
+    .register();
+```
+
+**Use case**: Optimized for typical API response times in seconds.
+
+### 2. Queue Size - Linear Boundaries
+
+```java
+Histogram queueSize = Histogram.builder()
+    .name("message_queue_size")
+    .classicLinearUpperBounds(10, 10, 10) // 10, 20, 30, ..., 100
+    .register();
+```
+
+**Use case**: Equal-width buckets for monitoring queue depth or other discrete values.
+
+### 3. Response Size - Exponential Boundaries
+
+```java
+Histogram responseSize = Histogram.builder()
+    .name("http_response_size_bytes")
+    .classicExponentialUpperBounds(100, 10, 6) // 100, 1k, 10k, 100k, 1M, 10M
+    .register();
+```
+
+**Use case**: Data spanning multiple orders of magnitude (bytes, milliseconds, etc).
+
+## Build
+
+This example is built as part of the `client_java` project:
+
+```shell
+./mvnw package
+```
+
+This creates `./examples/example-custom-buckets/target/example-custom-buckets.jar`.
+
+## Run
+
+With the JAR file present, run:
+
+```shell
+cd ./examples/example-custom-buckets/
+docker-compose up
+```
+
+This starts three Docker containers:
+
+- **[http://localhost:9400/metrics](http://localhost:9400/metrics)** - Example application
+- **[http://localhost:9090](http://localhost:9090)** - Prometheus server (with NHCB enabled)
+- **[http://localhost:3000](http://localhost:3000)** - Grafana (user: _admin_, password: _admin_)
+
+You might need to replace `localhost` with `host.docker.internal` on macOS or Windows.
+
+## Verify NHCB Conversion
+
+### 1. Check Prometheus Configuration
+
+The Prometheus configuration enables NHCB conversion:
+
+```yaml
+scrape_configs:
+  - job_name: "custom-buckets-demo"
+    scrape_protocols: ["PrometheusProto"]
+    convert_classic_histograms_to_nhcb: true
+    scrape_classic_histograms: true
+```
+
+### 2. Verify in Prometheus
+
+Visit [http://localhost:9090](http://localhost:9090) and run queries:
+
+```promql
+# View histogram metadata (should show schema -53 for NHCB)
+prometheus_tsdb_head_series
+
+# Calculate quantiles from custom buckets
+histogram_quantile(0.95, rate(api_request_duration_seconds[1m]))
+
+# View raw histogram structure
+api_request_duration_seconds
+```
+
+### 3. View in Grafana
+
+The Grafana dashboard at [http://localhost:3000](http://localhost:3000) shows:
+
+- p95 and p50 latencies for API endpoints (arbitrary custom buckets)
+- Queue size distribution (linear buckets)
+- Response size distribution (exponential buckets)
+
+## Key Observations
+
+1. **Custom Buckets Preserved**: The custom bucket boundaries you define are preserved when
+   converted to NHCB (schema -53).
+
+2. **Dual Representation**: By default, histograms maintain both classic and native
+   representations, allowing gradual migration.
+
+3. **Efficient Storage**: Native histograms provide more efficient storage than classic histograms
+   while preserving your custom bucket boundaries.
+
+4. **Flexible Bucket Strategies**: You can choose arbitrary, linear, or exponential buckets based
+   on your specific monitoring needs.
+
+## When to Use Custom Buckets
+
+Consider using custom buckets (and NHCB) when:
+
+- **Precise boundaries needed**: You know the expected distribution and want specific bucket edges
+- **Migrating from classic histograms**: You want to preserve existing bucket boundaries
+- **Specific use cases**: Default exponential bucketing doesn't fit your distribution well
+  - Temperature ranges (might include negative values)
+  - Queue depths (discrete values with linear growth)
+  - File sizes (exponential growth but with specific thresholds)
+  - API latencies (specific SLA boundaries)
+
+## Differences from Standard Native Histograms
+
+| Feature           | Standard Native Histograms      | NHCB (Schema -53)                 |
+| ----------------- | ------------------------------- | --------------------------------- |
+| Bucket boundaries | Exponential (base 2^(2^-scale)) | Custom boundaries                 |
+| Use case          | General-purpose                 | Specific distributions            |
+| Mergeability      | Can merge with same schema      | Cannot merge different boundaries |
+| Configuration     | Schema level (0-8)              | Explicit boundary list            |
+
+## Cleanup
+
+Stop the containers:
+
+```shell
+docker-compose down
+```
+
+## Further Reading
+
+- [Prometheus Native Histograms Specification](https://prometheus.io/docs/specs/native_histograms/)
+- [Prometheus Java Client Documentation](https://prometheus.github.io/client_java/)
+- [OpenTelemetry Exponential Histograms](https://opentelemetry.io/docs/specs/otel/metrics/data-model/#exponentialhistogram)
diff --git a/examples/example-custom-buckets/docker-compose.yaml b/examples/example-custom-buckets/docker-compose.yaml
new file mode 100644
index 000000000..6712c8533
--- /dev/null
+++ b/examples/example-custom-buckets/docker-compose.yaml
@@ -0,0 +1,26 @@
+version: "3"
+services:
+  example-application:
+    image: eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311
+    network_mode: host
+    volumes:
+      - ./target/example-custom-buckets.jar:/example-custom-buckets.jar
+    command:
+      - /opt/java/openjdk/bin/java
+      - -jar
+      - /example-custom-buckets.jar
+  prometheus:
+    image: prom/prometheus:v3.14.0@sha256:5ce7540c3c00ef4ab0c9d2c995c6a5b9c421f44b4a115d97a2c7af3b1c21cbb0
+    network_mode: host
+    volumes:
+      - ./docker-compose/prometheus.yml:/prometheus.yml
+    command:
+      - --enable-feature=native-histograms
+      - --config.file=/prometheus.yml
+  grafana:
+    image: grafana/grafana:13.2.0@sha256:3fd54ae1214669f8355f065ec9f6445d5279a3d77095ab048ca045685272429b
+    network_mode: host
+    volumes:
+      - ./docker-compose/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml
+      - ./docker-compose/grafana-dashboards.yaml:/etc/grafana/provisioning/dashboards/grafana-dashboards.yaml
+      - ./docker-compose/grafana-dashboard-custom-buckets.json:/etc/grafana/grafana-dashboard-custom-buckets.json
diff --git a/examples/example-custom-buckets/docker-compose/grafana-dashboard-custom-buckets.json b/examples/example-custom-buckets/docker-compose/grafana-dashboard-custom-buckets.json
new file mode 100644
index 000000000..11ae25775
--- /dev/null
+++ b/examples/example-custom-buckets/docker-compose/grafana-dashboard-custom-buckets.json
@@ -0,0 +1,349 @@
+{
+  "annotations": {
+    "list": []
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "panels": [
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "prometheus"
+      },
+      "description": "API request duration with custom bucket boundaries (0.01, 0.05, 0.1, 0.5, 1.0, 5.0, 10.0 seconds). Shows how custom buckets are preserved in NHCB (schema -53).",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "tooltip": false,
+              "viz": false,
+              "legend": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": ["mean", "max"],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "histogram_quantile(0.95, rate(api_request_duration_seconds[1m]))",
+          "instant": false,
+          "legendFormat": "{{endpoint}} {{status}} (p95)",
+          "range": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "histogram_quantile(0.5, rate(api_request_duration_seconds[1m]))",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "{{endpoint}} {{status}} (p50)",
+          "range": true,
+          "refId": "B"
+        }
+      ],
+      "title": "API Latency - Custom Buckets (Arbitrary Boundaries)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "prometheus"
+      },
+      "description": "Queue size with linear bucket boundaries (10, 20, 30, ..., 100). Demonstrates equal-width buckets for discrete values.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "tooltip": false,
+              "viz": false,
+              "legend": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "id": 2,
+      "options": {
+        "legend": {
+          "calcs": ["mean", "max"],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "histogram_quantile(0.95, rate(message_queue_size[1m]))",
+          "instant": false,
+          "legendFormat": "{{queue_name}} (p95)",
+          "range": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "histogram_quantile(0.5, rate(message_queue_size[1m]))",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "{{queue_name}} (p50)",
+          "range": true,
+          "refId": "B"
+        }
+      ],
+      "title": "Queue Size - Linear Buckets",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "prometheus"
+      },
+      "description": "HTTP response size with exponential bucket boundaries (100, 1k, 10k, 100k, 1M, 10M bytes). Shows exponential growth for data spanning multiple orders of magnitude.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "barWidthFactor": 0.6,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "tooltip": false,
+              "viz": false,
+              "legend": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "bytes"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": ["mean", "max"],
+          "displayMode": "table",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "histogram_quantile(0.95, rate(http_response_size_bytes[1m]))",
+          "instant": false,
+          "legendFormat": "{{endpoint}} (p95)",
+          "range": true,
+          "refId": "A"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "histogram_quantile(0.5, rate(http_response_size_bytes[1m]))",
+          "hide": false,
+          "instant": false,
+          "legendFormat": "{{endpoint}} (p50)",
+          "range": true,
+          "refId": "B"
+        }
+      ],
+      "title": "Response Size - Exponential Buckets",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "5s",
+  "schemaVersion": 39,
+  "tags": ["custom-buckets", "nhcb", "native-histogram"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Native Histograms with Custom Buckets (NHCB)",
+  "uid": "custom-buckets-nhcb",
+  "version": 1,
+  "weekStart": ""
+}
diff --git a/examples/example-custom-buckets/docker-compose/grafana-dashboards.yaml b/examples/example-custom-buckets/docker-compose/grafana-dashboards.yaml
new file mode 100644
index 000000000..3225b88ae
--- /dev/null
+++ b/examples/example-custom-buckets/docker-compose/grafana-dashboards.yaml
@@ -0,0 +1,8 @@
+apiVersion: 1
+
+providers:
+  - name: "Custom Buckets (NHCB) Example"
+    type: file
+    options:
+      path: /etc/grafana/grafana-dashboard-custom-buckets.json
+      foldersFromFilesStructure: false
diff --git a/examples/example-custom-buckets/docker-compose/grafana-datasources.yaml b/examples/example-custom-buckets/docker-compose/grafana-datasources.yaml
new file mode 100644
index 000000000..d442d28d2
--- /dev/null
+++ b/examples/example-custom-buckets/docker-compose/grafana-datasources.yaml
@@ -0,0 +1,7 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    uid: prometheus
+    url: http://localhost:9090
diff --git a/examples/example-custom-buckets/docker-compose/prometheus.yml b/examples/example-custom-buckets/docker-compose/prometheus.yml
new file mode 100644
index 000000000..5c5782023
--- /dev/null
+++ b/examples/example-custom-buckets/docker-compose/prometheus.yml
@@ -0,0 +1,14 @@
+---
+global:
+  scrape_interval: 5s # very short interval for demo purposes
+
+scrape_configs:
+  - job_name: "custom-buckets-demo"
+    # Use protobuf format to receive native histogram data
+    scrape_protocols: ["PrometheusProto"]
+    # Convert classic histograms with custom buckets to NHCB (schema -53)
+    convert_classic_histograms_to_nhcb: true
+    # Also scrape classic histograms for comparison
+    scrape_classic_histograms: true
+    static_configs:
+      - targets: ["localhost:9400"]
diff --git a/examples/example-custom-buckets/pom.xml b/examples/example-custom-buckets/pom.xml
new file mode 100644
index 000000000..2436e179f
--- /dev/null
+++ b/examples/example-custom-buckets/pom.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.prometheus</groupId>
+  <artifactId>example-custom-buckets</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <name>Example - Custom Buckets</name>
+  <description>
+    End-to-End example of Native Histograms with Custom Buckets (NHCB): Java app -&gt; Prometheus -&gt; Grafana
+  </description>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>io.prometheus.metrics.examples.custombuckets.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/examples/example-custom-buckets/src/main/java/io/prometheus/metrics/examples/custombuckets/Main.java b/examples/example-custom-buckets/src/main/java/io/prometheus/metrics/examples/custombuckets/Main.java
new file mode 100644
index 000000000..3d286fdf0
--- /dev/null
+++ b/examples/example-custom-buckets/src/main/java/io/prometheus/metrics/examples/custombuckets/Main.java
@@ -0,0 +1,108 @@
+package io.prometheus.metrics.examples.custombuckets;
+
+import io.prometheus.metrics.core.metrics.Histogram;
+import io.prometheus.metrics.exporter.httpserver.HTTPServer;
+import io.prometheus.metrics.instrumentation.jvm.JvmMetrics;
+import io.prometheus.metrics.model.snapshots.Unit;
+import java.io.IOException;
+import java.util.Random;
+
+/**
+ * Example demonstrating native histograms with custom buckets (NHCB).
+ *
+ * <p>This example shows three different types of custom bucket configurations:
+ *
+ * <ul>
+ *   <li>API latency with arbitrary custom boundaries optimized for typical response times
+ *   <li>Queue size with linear boundaries for equal-width buckets
+ *   <li>Response size with exponential boundaries for data spanning multiple orders of magnitude
+ * </ul>
+ *
+ * <p>These histograms maintain both classic (with custom buckets) and native representations. When
+ * Prometheus is configured with {@code convert_classic_histograms_to_nhcb: true}, the custom bucket
+ * boundaries are preserved in the native histogram format (schema -53).
+ */
+public class Main {
+
+  public static void main(String[] args) throws IOException, InterruptedException {
+
+    JvmMetrics.builder().register();
+
+    // Example 1: API latency with arbitrary custom boundaries
+    // Optimized for typical API response times in seconds
+    Histogram apiLatency =
+        Histogram.builder()
+            .name("api_request_duration_seconds")
+            .help("API request duration with custom buckets")
+            .unit(Unit.SECONDS)
+            .classicUpperBounds(0.01, 0.05, 0.1, 0.5, 1.0, 5.0, 10.0)
+            .labelNames("endpoint", "status")
+            .register();
+
+    // Example 2: Queue size with linear boundaries
+    // Equal-width buckets for monitoring queue depth
+    Histogram queueSize =
+        Histogram.builder()
+            .name("message_queue_size")
+            .help("Number of messages in queue with linear buckets")
+            .classicLinearUpperBounds(10, 10, 10) // 10, 20, 30, ..., 100
+            .labelNames("queue_name")
+            .register();
+
+    // Example 3: Response size with exponential boundaries
+    // Exponential growth for data spanning multiple orders of magnitude
+    Histogram responseSize =
+        Histogram.builder()
+            .name("http_response_size_bytes")
+            .help("HTTP response size in bytes with exponential buckets")
+            .classicExponentialUpperBounds(100, 10, 6) // 100, 1k, 10k, 100k, 1M, 10M
+            .labelNames("endpoint")
+            .register();
+
+    HTTPServer server = HTTPServer.builder().port(9400).buildAndStart();
+
+    System.out.println(
+        "HTTPServer listening on port http://localhost:" + server.getPort() + "/metrics");
+    System.out.println("\nGenerating metrics with custom bucket configurations:");
+    System.out.println("1. API latency: custom boundaries optimized for response times");
+    System.out.println("2. Queue size: linear boundaries (10, 20, 30, ..., 100)");
+    System.out.println("3. Response size: exponential boundaries (100, 1k, 10k, ..., 10M)");
+    System.out.println("\nPrometheus will convert these to NHCB (schema -53) when configured.\n");
+
+    Random random = new Random(0);
+
+    while (true) {
+      // Simulate API latency observations
+      // Fast endpoint: mostly < 100ms, occasionally slow
+      double fastLatency = Math.abs(random.nextGaussian() * 0.03 + 0.05);
+      String status = random.nextInt(100) < 95 ? "200" : "500";
+      apiLatency.labelValues("/api/fast", status).observe(fastLatency);
+
+      // Slow endpoint: typically 1-3 seconds
+      double slowLatency = Math.abs(random.nextGaussian() * 0.5 + 2.0);
+      apiLatency.labelValues("/api/slow", status).observe(slowLatency);
+
+      // Simulate queue size observations
+      // Queue oscillates between 20-80 items
+      int queueDepth = 50 + (int) (random.nextGaussian() * 15);
+      queueDepth = Math.max(0, Math.min(100, queueDepth));
+      queueSize.labelValues("default").observe(queueDepth);
+
+      // Priority queue: usually smaller
+      int priorityQueueDepth = 10 + (int) (random.nextGaussian() * 5);
+      priorityQueueDepth = Math.max(0, Math.min(50, priorityQueueDepth));
+      queueSize.labelValues("priority").observe(priorityQueueDepth);
+
+      // Simulate response size observations
+      // Small responses: mostly < 10KB
+      double smallResponse = Math.abs(random.nextGaussian() * 2000 + 5000);
+      responseSize.labelValues("/api/summary").observe(smallResponse);
+
+      // Large responses: can be up to several MB
+      double largeResponse = Math.abs(random.nextGaussian() * 200000 + 500000);
+      responseSize.labelValues("/api/download").observe(largeResponse);
+
+      Thread.sleep(1000);
+    }
+  }
+}
diff --git a/examples/example-exemplars-tail-sampling/README.md b/examples/example-exemplars-tail-sampling/README.md
index f12c43c95..4b005f745 100644
--- a/examples/example-exemplars-tail-sampling/README.md
+++ b/examples/example-exemplars-tail-sampling/README.md
@@ -9,8 +9,6 @@ Exemplars are often used to reference trace IDs when distributed tracing is used
 The following shows an example of a histogram in OpenMetrics text format where each non-empty bucket
 has an Exemplar:
 
-<!-- editorconfig-checker-disable -->
-
 ```text
 # TYPE request_duration_seconds histogram
 # UNIT request_duration_seconds seconds
@@ -31,13 +29,11 @@ request_duration_seconds_count{http_status="200"} 11243
 request_duration_seconds_sum{http_status="200"} 2843.3178731140015
 ```
 
-<!-- editorconfig-checker-enable -->
-
 In Grafana Exemplars can be visualized as little green dots. The following shows an example of the
 95th [quantile](https://prometheus.io/docs/prometheus/latest/querying/functions/#histogram_quantile)
 for the histogram above.
 
-![Screenshot of a Latency Graph with Exemplars](https://github.com/prometheus/client_java/assets/330535/68aada3d-f55b-4a7b-90be-222481f0ec79) <!-- editorconfig-checker-disable-line -->
+![Screenshot of a Latency Graph with Exemplars](https://github.com/prometheus/client_java/assets/330535/68aada3d-f55b-4a7b-90be-222481f0ec79)
 
 If you move the mouse over an Exemplar, an overlay pops up with a link to a tracing tool
 like [Tempo](https://github.com/grafana/tempo).
@@ -125,11 +121,11 @@ password _admin_.
 
 The example dashboard shows 50 requests / second for the Java services:
 
-![Screenshot showing the request rate on the Java services](https://github.com/prometheus/client_java/assets/330535/9f8dc92e-c9aa-40b6-8fda-a0f7e98560ba) <!-- editorconfig-checker-disable-line -->
+![Screenshot showing the request rate on the Java services](https://github.com/prometheus/client_java/assets/330535/9f8dc92e-c9aa-40b6-8fda-a0f7e98560ba)
 
 The Tempo metrics show that only ~5 traces / second are received:
 
-![Screenshot showing the number of traces per second received by Tempo](https://github.com/prometheus/client_java/assets/330535/5e439ac5-3c5c-4d40-a4cd-6737c2c82dfd) <!-- editorconfig-checker-disable-line -->
+![Screenshot showing the number of traces per second received by Tempo](https://github.com/prometheus/client_java/assets/330535/5e439ac5-3c5c-4d40-a4cd-6737c2c82dfd)
 
 The reason is that the OpenTelemetry collector is configured to sample only 10% of the traces. Yet,
 all Exemplars in the
diff --git a/examples/example-exemplars-tail-sampling/docker-compose.yaml b/examples/example-exemplars-tail-sampling/docker-compose.yaml
index 675a39ead..2d5dc0e24 100644
--- a/examples/example-exemplars-tail-sampling/docker-compose.yaml
+++ b/examples/example-exemplars-tail-sampling/docker-compose.yaml
@@ -36,14 +36,14 @@ services:
       - -jar
       - /example-greeting-service.jar
   collector:
-    image: otel/opentelemetry-collector-contrib:0.139.0@sha256:faf125d656fa47cea568b2f3b4494efd2525083bc75c1e96038bc23f05cd68fd
+    image: otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc
     network_mode: host
     volumes:
       - ./config/otelcol-config.yaml:/config.yaml
     command:
       - --config=file:/config.yaml
   prometheus:
-    image: prom/prometheus:v3.7.3@sha256:49214755b6153f90a597adcbff0252cc61069f8ab69ce8411285cd4a560e8038
+    image: prom/prometheus:v3.14.0@sha256:5ce7540c3c00ef4ab0c9d2c995c6a5b9c421f44b4a115d97a2c7af3b1c21cbb0
     network_mode: host
     volumes:
       - ./config/prometheus.yaml:/prometheus.yaml
@@ -52,14 +52,14 @@ services:
       - --enable-feature=native-histograms
       - --config.file=/prometheus.yaml
   tempo:
-    image: grafana/tempo:2.9.0@sha256:65a5789759435f1ef696f1953258b9bbdb18eb571d5ce711ff812d2e128288a4
+    image: grafana/tempo:3.0.3@sha256:0296560ac66f8a3600d7fb3014a52c189d4d9c3549ad6ff441bf2409855d68d5
     network_mode: host
     volumes:
       - ./config/tempo-config.yaml:/config.yaml
     command:
       - --config.file=/config.yaml
   grafana:
-    image: grafana/grafana:12.2.1@sha256:35c41e0fd0295f5d0ee5db7e780cf33506abfaf47686196f825364889dee878b
+    image: grafana/grafana:13.2.0@sha256:3fd54ae1214669f8355f065ec9f6445d5279a3d77095ab048ca045685272429b
     network_mode: host
     ports:
       - "3000:3000"
@@ -68,7 +68,7 @@ services:
       - ./config/grafana-dashboards.yaml:/etc/grafana/provisioning/dashboards/grafana-dashboards.yaml
       - ./config/grafana-example-dashboard.json:/etc/grafana/example-dashboard.json
   k6:
-    image: grafana/k6@sha256:ef816d99a6697f914811f99c09e7481df6989d55dec382e4d4ee49311f812459
+    image: grafana/k6@sha256:5221b620a4f874faff6e32ba597aa667c058391fe4898b1c6f6377f062c6cdec
     network_mode: host
     volumes:
       - ./config/k6-script.js:/k6-script.js
diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
index 3141a566c..4b7d5484b 100644
--- a/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
+++ b/examples/example-exemplars-tail-sampling/example-greeting-service/pom.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>example-exemplars-tail-sampling</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-greeting-service</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - OpenTelemetry Exemplars - Greeting Service</name>
   <description>
@@ -18,30 +17,35 @@
     tracing
   </description>
 
-  <properties>
-    <java.version>25</java.version>
-  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-servlet-jakarta</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.14</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
@@ -59,8 +63,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.otel.exemplars.greeting.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java b/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java
index 99ba1084c..ed47d3787 100644
--- a/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java
+++ b/examples/example-exemplars-tail-sampling/example-greeting-service/src/main/java/io/prometheus/metrics/examples/otel/exemplars/greeting/Main.java
@@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException {
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
 
     Tomcat.addServlet(ctx, "hello", new GreetingServlet());
-    ctx.addServletMappingDecoded("/*", "hello");
+    ctx.addServletMapping("/*", "hello");
 
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
index c090aeb08..d1f01b17f 100644
--- a/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
+++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/pom.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>example-exemplars-tail-sampling</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-hello-world-app</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - OpenTelemetry Exemplars - Hello World App</name>
   <description>
@@ -18,30 +17,35 @@
     tracing
   </description>
 
-  <properties>
-    <java.version>25</java.version>
-  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-servlet-jakarta</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.14</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
@@ -59,8 +63,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.otel.exemplars.app.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java b/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java
index 25ea8a1c6..b3e83cb7d 100644
--- a/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java
+++ b/examples/example-exemplars-tail-sampling/example-hello-world-app/src/main/java/io/prometheus/metrics/examples/otel/exemplars/app/Main.java
@@ -20,10 +20,10 @@ public static void main(String[] args) throws LifecycleException {
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
 
     Tomcat.addServlet(ctx, "hello", new HelloWorldServlet());
-    ctx.addServletMappingDecoded("/*", "hello");
+    ctx.addServletMapping("/*", "hello");
 
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/examples/example-exemplars-tail-sampling/pom.xml b/examples/example-exemplars-tail-sampling/pom.xml
index 8a739e939..24df1f9e5 100644
--- a/examples/example-exemplars-tail-sampling/pom.xml
+++ b/examples/example-exemplars-tail-sampling/pom.xml
@@ -1,27 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-exemplars-tail-sampling</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Example - Exemplars with OpenTelemetry's Tail Sampling</name>
   <description>
-    Example project showing Examplars with OpenTelemetry's Tail Sampling.
+    Example project showing Exemplars with OpenTelemetry's Tail Sampling.
   </description>
 
-  <properties>
-    <java.version>11</java.version>
-  </properties>
-
   <modules>
     <module>example-greeting-service</module>
     <module>example-hello-world-app</module>
diff --git a/examples/example-exporter-httpserver/README.md b/examples/example-exporter-httpserver/README.md
index 341f8e2c3..ad7164aa7 100644
--- a/examples/example-exporter-httpserver/README.md
+++ b/examples/example-exporter-httpserver/README.md
@@ -32,7 +32,7 @@ The exporter supports a `debug` URL parameter to quickly view other formats in y
 
 - [http://localhost:9400/metrics?debug=text](http://localhost:9400/metrics?debug=text): Prometheus
   text format, same as without the `debug` option.
-- [http://localhost:9400/metrics?debug=openmetrics](http://localhost:9400/metrics?debug=openmetrics): <!-- editorconfig-checker-disable-line -->
+- [http://localhost:9400/metrics?debug=openmetrics](http://localhost:9400/metrics?debug=openmetrics):
   OpenMetrics text format.
-- [http://localhost:9400/metrics?debug=prometheus-protobuf](http://localhost:9400/metrics?debug=prometheus-protobuf): <!-- editorconfig-checker-disable-line -->
+- [http://localhost:9400/metrics?debug=prometheus-protobuf](http://localhost:9400/metrics?debug=prometheus-protobuf):
   Text representation of the Prometheus protobuf format.
diff --git a/examples/example-exporter-httpserver/pom.xml b/examples/example-exporter-httpserver/pom.xml
index f9ee206f0..cda7dad6e 100644
--- a/examples/example-exporter-httpserver/pom.xml
+++ b/examples/example-exporter-httpserver/pom.xml
@@ -1,37 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-exporter-httpserver</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - HTTPServer Exporter</name>
   <description>
     Prometheus Metrics Example using the HTTPServer for exposing the metrics endpoint
   </description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -49,8 +57,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.httpserver.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-exporter-multi-target/README.md b/examples/example-exporter-multi-target/README.md
index 7b20217ac..b655e3244 100644
--- a/examples/example-exporter-multi-target/README.md
+++ b/examples/example-exporter-multi-target/README.md
@@ -34,8 +34,8 @@ The exporter supports a `debug` URL parameter to quickly view other formats in y
 - [http://localhost:9400/metrics?debug=text](http://localhost:9400/metrics?debug=text): Prometheus
   text format, same as
   without the `debug` option.
-- [http://localhost:9400/metrics?debug=openmetrics](http://localhost:9400/metrics?debug=openmetrics): <!-- editorconfig-checker-disable-line -->
+- [http://localhost:9400/metrics?debug=openmetrics](http://localhost:9400/metrics?debug=openmetrics):
   OpenMetrics text
   format.
-- [http://localhost:9400/metrics?debug=prometheus-protobuf](http://localhost:9400/metrics?debug=prometheus-protobuf): <!-- editorconfig-checker-disable-line -->
+- [http://localhost:9400/metrics?debug=prometheus-protobuf](http://localhost:9400/metrics?debug=prometheus-protobuf):
   Text representation of the Prometheus protobuf format.
diff --git a/examples/example-exporter-multi-target/pom.xml b/examples/example-exporter-multi-target/pom.xml
index ac13ff2a1..0457a7591 100644
--- a/examples/example-exporter-multi-target/pom.xml
+++ b/examples/example-exporter-multi-target/pom.xml
@@ -1,37 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-exporter-multi-target</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - HTTPServer Exporter Multi Target</name>
   <description>
     Prometheus Metrics Example for multi-target pattern implementation
   </description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -49,8 +57,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.multitarget.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-exporter-multi-target/src/main/java/io/prometheus/metrics/examples/multitarget/SampleMultiCollector.java b/examples/example-exporter-multi-target/src/main/java/io/prometheus/metrics/examples/multitarget/SampleMultiCollector.java
index 207c024a5..72e2b28ad 100644
--- a/examples/example-exporter-multi-target/src/main/java/io/prometheus/metrics/examples/multitarget/SampleMultiCollector.java
+++ b/examples/example-exporter-multi-target/src/main/java/io/prometheus/metrics/examples/multitarget/SampleMultiCollector.java
@@ -77,7 +77,12 @@ protected MetricSnapshots collectMetricSnapshots(PrometheusScrapeRequest scrapeR
     return new MetricSnapshots(snaps);
   }
 
+  /**
+   * @deprecated Use {@code getMetricFamilyDescriptors()} instead.
+   */
   @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   public List<String> getPrometheusNames() {
     List<String> names = new ArrayList<String>();
     names.add("x_calls_total");
diff --git a/examples/example-exporter-opentelemetry/README.md b/examples/example-exporter-opentelemetry/README.md
index 03dc39e45..5e0551ae5 100644
--- a/examples/example-exporter-opentelemetry/README.md
+++ b/examples/example-exporter-opentelemetry/README.md
@@ -20,14 +20,10 @@ docker-compose up
 
 This will set up the following scenario:
 
-<!-- editorconfig-checker-disable -->
-
 ```mermaid
 flowchart LR
    A[example app] -->|OTLP|B[OpenTelemetry collector] -->|Prometheus remote write|C[Prometheus server]
 ```
 
-<!-- editorconfig-checker-enable -->
-
 The OpenTelemetry collector is configured to log incoming metrics to the console.
 The Prometheus server is running on [http://localhost:9090](http://localhost:9090).
diff --git a/examples/example-exporter-opentelemetry/docker-compose.yaml b/examples/example-exporter-opentelemetry/docker-compose.yaml
index 485343d9c..116b57461 100644
--- a/examples/example-exporter-opentelemetry/docker-compose.yaml
+++ b/examples/example-exporter-opentelemetry/docker-compose.yaml
@@ -13,14 +13,14 @@ services:
       #- -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
       - /example-exporter-opentelemetry.jar
   collector:
-    image: otel/opentelemetry-collector-contrib:0.139.0@sha256:faf125d656fa47cea568b2f3b4494efd2525083bc75c1e96038bc23f05cd68fd
+    image: otel/opentelemetry-collector-contrib:0.159.0@sha256:1f2c54a30e713fac6b3ae77a1ec84010c2007e29ced8ec666214fc2f6739c1cc
     network_mode: host
     volumes:
       - ./config/otelcol-config.yaml:/config.yaml
     command:
       - --config=file:/config.yaml
   prometheus:
-    image: prom/prometheus:v3.7.3@sha256:49214755b6153f90a597adcbff0252cc61069f8ab69ce8411285cd4a560e8038
+    image: prom/prometheus:v3.14.0@sha256:5ce7540c3c00ef4ab0c9d2c995c6a5b9c421f44b4a115d97a2c7af3b1c21cbb0
     network_mode: host
     volumes:
       - ./config/prometheus.yaml:/prometheus.yaml
diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile b/examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile
index 041e418e8..3f49b8774 100644
--- a/examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile
+++ b/examples/example-exporter-opentelemetry/oats-tests/agent/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:25.0.1_8-jre@sha256:31fb090d244e9167d22fb90755423c54934fb6b6a22edeb413e2201882259d1b
+FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311
 
 COPY target/example-exporter-opentelemetry.jar ./app.jar
 # check that the resource attributes from the agent are used, epsecially the service.instance.id should be the same
diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/oats-case.yaml b/examples/example-exporter-opentelemetry/oats-tests/agent/oats-case.yaml
new file mode 100644
index 000000000..a8a05d0f2
--- /dev/null
+++ b/examples/example-exporter-opentelemetry/oats-tests/agent/oats-case.yaml
@@ -0,0 +1,20 @@
+name: java agent exporter preserves target_info identity
+fixture:
+  compose:
+    template: lgtm
+    file: docker-compose.yml
+seed:
+  type: app
+expected:
+  metrics:
+    - promql: "uptime_seconds_total{}"
+      value: ">= 0"
+    - promql: 'count(target_info{service_name!="otelcol-contrib"})'
+      value: "== 2"
+    - promql: 'count(count by (instance) (target_info{service_name!="otelcol-contrib"}))'
+      value: "== 1"
+  custom-checks:
+    - script: |
+        #!/usr/bin/env bash
+        set -euo pipefail
+        curl -fsS "${OATS_GRAFANA_URL:?}/api/health" >/dev/null
diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml b/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml
deleted file mode 100644
index 9c380dea9..000000000
--- a/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# OATS is an acceptance testing framework for OpenTelemetry -
-# https://github.com/grafana/oats/tree/main/yaml
-docker-compose:
-  files:
-    - ./docker-compose.yml
-expected:
-  custom-checks:
-    - script: ./service_instance_id_check.py
-  metrics:
-    - promql: "uptime_seconds_total{}"
-      value: ">= 0"
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
deleted file mode 100755
index 6bb8291f7..000000000
--- a/examples/example-exporter-opentelemetry/oats-tests/agent/service_instance_id_check.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-"""
-Check if the service instance id is present in the exported data.
-Returns 0 if the service instance id is present in the exported data.
-"""
-import json
-import urllib.parse
-from urllib.request import urlopen
-
-
-def get_json(url):
-    with urlopen(url) as response:
-        return json.loads(response.read().decode("utf-8"))
-
-
-def main():
-    # Query Prometheus for target_info
-    res = get_json("http://localhost:9090/api/v1/query?query=target_info")
-
-    # Uncomment for local debugging
-    # with open('example_target_info.json') as f:
-    #     res = json.load(f)
-
-    instance_ids = {
-        r["metric"]["instance"]
-        for r in res["data"]["result"]
-        if r["metric"].get("service_name") != "otelcol-contrib"
-    }
-    instance_ids = list(instance_ids)
-
-    print(f"Instance ids found:{instance_ids}")
-    if len(instance_ids) > 1:
-        print("More than one instance id found")
-        print(res)
-
-    # Both the agent and the exporter should report the same instance id
-    assert len(instance_ids) == 1, "Expected exactly one instance id"
-
-    query = f'target_info{{instance="{instance_ids[0]}"}}'
-    encoded_query = urllib.parse.quote_plus(query)
-    res = get_json(f"http://localhost:9090/api/v1/query?query={encoded_query}")
-
-    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, "Expected two target info results"
-
-
-if __name__ == "__main__":
-    main()
diff --git a/examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile b/examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile
index 85e445c26..d41513edc 100644
--- a/examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile
+++ b/examples/example-exporter-opentelemetry/oats-tests/http/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:25.0.1_8-jre@sha256:31fb090d244e9167d22fb90755423c54934fb6b6a22edeb413e2201882259d1b
+FROM eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311
 
 COPY target/example-exporter-opentelemetry.jar ./app.jar
 
diff --git a/examples/example-exporter-opentelemetry/oats-tests/http/oats-case.yaml b/examples/example-exporter-opentelemetry/oats-tests/http/oats-case.yaml
new file mode 100644
index 000000000..fab99dfe3
--- /dev/null
+++ b/examples/example-exporter-opentelemetry/oats-tests/http/oats-case.yaml
@@ -0,0 +1,11 @@
+name: http protobuf exporter emits uptime metric
+fixture:
+  compose:
+    template: lgtm
+    file: docker-compose.yml
+seed:
+  type: app
+expected:
+  metrics:
+    - promql: "uptime_seconds_total{}"
+      value: ">= 0"
diff --git a/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml b/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml
deleted file mode 100644
index 66430ca3b..000000000
--- a/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# OATS is an acceptance testing framework for OpenTelemetry -
-# https://github.com/grafana/oats/tree/main/yaml
-docker-compose:
-  files:
-    - ./docker-compose.yml
-expected:
-  metrics:
-    - promql: "uptime_seconds_total{}"
-      value: ">= 0"
diff --git a/examples/example-exporter-opentelemetry/pom.xml b/examples/example-exporter-opentelemetry/pom.xml
index 8e8fa6891..3bfec6143 100644
--- a/examples/example-exporter-opentelemetry/pom.xml
+++ b/examples/example-exporter-opentelemetry/pom.xml
@@ -1,37 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-exporter-opentelemetry</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - OpenTelemetry Metrics Exporter</name>
   <description>
     Example of exposing metrics in OpenTelemetry format and pushing them to an OpenTelemetry collector
   </description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-opentelemetry</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -49,8 +57,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.opentelemetry.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-exporter-servlet-tomcat/README.md b/examples/example-exporter-servlet-tomcat/README.md
index 05ac894e3..5ca273896 100644
--- a/examples/example-exporter-servlet-tomcat/README.md
+++ b/examples/example-exporter-servlet-tomcat/README.md
@@ -54,24 +54,27 @@ browser:
 - [http://localhost:8080/metrics?debug=text](http://localhost:8080/metrics?debug=text): Prometheus
   text format, same as
   without the `debug` option.
-- [http://localhost:8080/metrics?debug=openmetrics](http://localhost:8080/metrics?debug=openmetrics): <!-- editorconfig-checker-disable-line -->
+- [http://localhost:8080/metrics?debug=openmetrics](http://localhost:8080/metrics?debug=openmetrics):
   OpenMetrics text
   format.
-- [http://localhost:8080/metrics?debug=prometheus-protobuf](http://localhost:8080/metrics?debug=prometheus-protobuf): <!-- editorconfig-checker-disable-line -->
+- [http://localhost:8080/metrics?debug=prometheus-protobuf](http://localhost:8080/metrics?debug=prometheus-protobuf):
   Text representation of the Prometheus protobuf format.
 
 ## Testing with the Prometheus Server
 
 1. Download the latest Prometheus server release
-   from [https://github.com/prometheus/prometheus/releases](https://github.com/prometheus/prometheus/releases). <!-- editorconfig-checker-disable-line -->
+   from [https://github.com/prometheus/prometheus/releases](https://github.com/prometheus/prometheus/releases).
 2. Extract the archive
 3. Edit `prometheus.yml` and append the following snippet at the end:
+
    ```yaml
    job_name: "tomcat-servlet-example"
    static_configs:
      - targets: ["localhost:8080"]
    ```
-4. Run with native histograms and examplars enabled:
+
+4. Run with native histograms and exemplars enabled:
+
    ```shell
    ./prometheus --enable-feature=native-histograms --enable-feature=exemplar-storage
    ```
@@ -83,7 +86,7 @@ Prometheus is now scraping metrics in Protobuf format. If you type the name
 `request_duration_seconds` you will see a
 non-human-readable representation of the histogram including the native buckets:
 
-![Screenshot showing a Prometheus Native Histogram in Text Format](https://github.com/prometheus/client_java/assets/330535/863efe0b-a9eb-40ae-a078-72497abc6f04) <!-- editorconfig-checker-disable-line -->
+![Screenshot showing a Prometheus Native Histogram in Text Format](https://github.com/prometheus/client_java/assets/330535/863efe0b-a9eb-40ae-a078-72497abc6f04)
 
 Note: You have to run at least one GET request on the Hello World
 endpoint [http://localhost:8080](http://localhost:8080) before you see the metric.
@@ -94,4 +97,6 @@ Use the `histogram_quantile()` function to calculate quantiles from the native h
 histogram_quantile(0.95, rate(request_duration_seconds[10m]))
 ```
 
-![Screenshot showing the 95th Percentile Calculated from a Prometheus Native Histogram](https://github.com/prometheus/client_java/assets/330535/889fb769-9445-4f6f-8540-2b1ddffca55e) <!-- editorconfig-checker-disable-line -->
+![Screenshot showing the 95th Percentile Calculated from a Prometheus Native Histogram][native-histogram-quantile]
+
+[native-histogram-quantile]: https://github.com/prometheus/client_java/assets/330535/889fb769-9445-4f6f-8540-2b1ddffca55e
diff --git a/examples/example-exporter-servlet-tomcat/pom.xml b/examples/example-exporter-servlet-tomcat/pom.xml
index 39de3f84c..c7a2b1e4d 100644
--- a/examples/example-exporter-servlet-tomcat/pom.xml
+++ b/examples/example-exporter-servlet-tomcat/pom.xml
@@ -1,45 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-exporter-servlet-tomcat</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>17</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - Servlet Exporter with Tomcat</name>
   <description>
     Prometheus Metrics Example using Embedded Tomcat and the Exporter Servlet
   </description>
 
-  <properties>
-    <java.version>25</java.version>
-  </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-servlet-jakarta</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.14</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
@@ -57,8 +62,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.tomcat_servlet.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java b/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java
index 81bc2ac19..2348cea9d 100644
--- a/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java
+++ b/examples/example-exporter-servlet-tomcat/src/main/java/io/prometheus/metrics/examples/tomcat_servlet/Main.java
@@ -24,10 +24,10 @@ public static void main(String[] args) throws LifecycleException, IOException {
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
 
     Tomcat.addServlet(ctx, "hello", new HelloWorldServlet());
-    ctx.addServletMappingDecoded("/*", "hello");
+    ctx.addServletMapping("/*", "hello");
 
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/examples/example-native-histogram/docker-compose.yaml b/examples/example-native-histogram/docker-compose.yaml
index 3f0848c1f..25ff9b5a8 100644
--- a/examples/example-native-histogram/docker-compose.yaml
+++ b/examples/example-native-histogram/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   example-application:
-    image: eclipse-temurin:25.0.1_8-jre@sha256:31fb090d244e9167d22fb90755423c54934fb6b6a22edeb413e2201882259d1b
+    image: eclipse-temurin:25.0.3_9-jre@sha256:7c1c6297dc3a3ff947922f3ab14ecd326e29083b9edaa8dbff3b94fef1688311
     network_mode: host
     volumes:
       - ./target/example-native-histogram.jar:/example-native-histogram.jar
@@ -10,7 +10,7 @@ services:
       - -jar
       - /example-native-histogram.jar
   prometheus:
-    image: prom/prometheus:v3.7.3@sha256:49214755b6153f90a597adcbff0252cc61069f8ab69ce8411285cd4a560e8038
+    image: prom/prometheus:v3.14.0@sha256:5ce7540c3c00ef4ab0c9d2c995c6a5b9c421f44b4a115d97a2c7af3b1c21cbb0
     network_mode: host
     volumes:
       - ./docker-compose/prometheus.yml:/prometheus.yml
@@ -18,7 +18,7 @@ services:
       - --enable-feature=native-histograms
       - --config.file=/prometheus.yml
   grafana:
-    image: grafana/grafana:12.2.1@sha256:35c41e0fd0295f5d0ee5db7e780cf33506abfaf47686196f825364889dee878b
+    image: grafana/grafana:13.2.0@sha256:3fd54ae1214669f8355f065ec9f6445d5279a3d77095ab048ca045685272429b
     network_mode: host
     volumes:
       - ./docker-compose/grafana-datasources.yaml:/etc/grafana/provisioning/datasources/grafana-datasources.yaml
diff --git a/examples/example-native-histogram/pom.xml b/examples/example-native-histogram/pom.xml
index 5324ffb91..ab0045e88 100644
--- a/examples/example-native-histogram/pom.xml
+++ b/examples/example-native-histogram/pom.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-native-histogram</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - Native Histogram</name>
   <description>
     End-to-End example of a Native histogram: Java app -&gt; Prometheus -&gt; Grafana
   </description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -48,8 +57,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.nativehistogram.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-otel-jvm-runtime-metrics/README.md b/examples/example-otel-jvm-runtime-metrics/README.md
new file mode 100644
index 000000000..a58584694
--- /dev/null
+++ b/examples/example-otel-jvm-runtime-metrics/README.md
@@ -0,0 +1,41 @@
+# OTel JVM Runtime Metrics with Prometheus HTTPServer
+
+## Build
+
+This example is built as part of the `client_java` project.
+
+```shell
+./mvnw package
+```
+
+## Run
+
+The build creates a JAR file with the example application in
+`./examples/example-otel-jvm-runtime-metrics/target/`.
+
+```shell
+java -jar ./examples/example-otel-jvm-runtime-metrics/target/example-otel-jvm-runtime-metrics.jar
+```
+
+## Manually Testing the Metrics Endpoint
+
+Accessing
+[http://localhost:9400/metrics](http://localhost:9400/metrics)
+with a Web browser should yield both a Prometheus counter metric
+and OTel JVM runtime metrics on the same endpoint.
+
+Prometheus counter:
+
+```text
+# HELP uptime_seconds_total total number of seconds since this application was started
+# TYPE uptime_seconds_total counter
+uptime_seconds_total 42.0
+```
+
+OTel JVM runtime metrics (excerpt):
+
+```text
+# HELP jvm_memory_used_bytes Measure of memory used.
+# TYPE jvm_memory_used_bytes gauge
+jvm_memory_used_bytes{jvm_memory_pool_name="G1 Eden Space",jvm_memory_type="heap"} 4194304.0
+```
diff --git a/examples/example-otel-jvm-runtime-metrics/pom.xml b/examples/example-otel-jvm-runtime-metrics/pom.xml
new file mode 100644
index 000000000..75232e35c
--- /dev/null
+++ b/examples/example-otel-jvm-runtime-metrics/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.prometheus</groupId>
+  <artifactId>example-otel-jvm-runtime-metrics</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <name>Example - OTel JVM Runtime Metrics</name>
+  <description>
+    Example of combining Prometheus metrics with OpenTelemetry JVM runtime metrics on one endpoint
+  </description>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.instrumentation</groupId>
+        <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
+        <version>2.31.0-alpha</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-otel-support</artifactId>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry.instrumentation</groupId>
+      <artifactId>opentelemetry-runtime-telemetry</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>io.prometheus.metrics.examples.otelruntimemetrics.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/examples/example-otel-jvm-runtime-metrics/src/main/java/io/prometheus/metrics/examples/otelruntimemetrics/Main.java b/examples/example-otel-jvm-runtime-metrics/src/main/java/io/prometheus/metrics/examples/otelruntimemetrics/Main.java
new file mode 100644
index 000000000..07971096e
--- /dev/null
+++ b/examples/example-otel-jvm-runtime-metrics/src/main/java/io/prometheus/metrics/examples/otelruntimemetrics/Main.java
@@ -0,0 +1,72 @@
+package io.prometheus.metrics.examples.otelruntimemetrics;
+
+import io.opentelemetry.exporter.prometheus.PrometheusMetricReader;
+import io.opentelemetry.instrumentation.runtimetelemetry.RuntimeTelemetry;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.exporter.httpserver.HTTPServer;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Unit;
+import java.io.IOException;
+
+/**
+ * Example combining Prometheus metrics with OpenTelemetry JVM runtime metrics on a single endpoint.
+ *
+ * <p>This demonstrates:
+ *
+ * <ul>
+ *   <li>Registering a Prometheus counter metric
+ *   <li>Bridging OTel runtime metrics into the same PrometheusRegistry
+ *   <li>Exposing everything via the built-in HTTPServer on /metrics
+ * </ul>
+ */
+public class Main {
+
+  public static void main(String[] args) throws IOException, InterruptedException {
+
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    // 1. Register a Prometheus counter metric
+    Counter counter =
+        Counter.builder()
+            .name("uptime_seconds_total")
+            .help("total number of seconds since this application was started")
+            .unit(Unit.SECONDS)
+            .register(registry);
+
+    // 2. Create a PrometheusMetricReader and register it with the same registry.
+    //    This bridges OTel metrics into the Prometheus registry.
+    PrometheusMetricReader reader = PrometheusMetricReader.create();
+    registry.register(reader);
+
+    // 3. Build the OTel SDK with the reader.
+    OpenTelemetrySdk openTelemetry =
+        OpenTelemetrySdk.builder()
+            .setMeterProvider(SdkMeterProvider.builder().registerMetricReader(reader).build())
+            .build();
+
+    // 4. Start OTel JVM runtime metrics collection.
+    RuntimeTelemetry runtimeMetrics = RuntimeTelemetry.create(openTelemetry);
+
+    // 5. Expose both Prometheus and OTel metrics on a single endpoint.
+    HTTPServer server = HTTPServer.builder().port(9400).registry(registry).buildAndStart();
+
+    // 6. Close RuntimeMetrics and server on shutdown to stop JMX metric collection.
+    Runtime.getRuntime()
+        .addShutdownHook(
+            new Thread(
+                () -> {
+                  runtimeMetrics.close();
+                  server.close();
+                }));
+
+    System.out.println(
+        "HTTPServer listening on port http://localhost:" + server.getPort() + "/metrics");
+
+    while (true) {
+      Thread.sleep(1000);
+      counter.inc();
+    }
+  }
+}
diff --git a/examples/example-prometheus-properties/README.md b/examples/example-prometheus-properties/README.md
index 2a4e61e80..9faed9201 100644
--- a/examples/example-prometheus-properties/README.md
+++ b/examples/example-prometheus-properties/README.md
@@ -17,8 +17,8 @@ This should create the file
 java -jar ./examples/example-prometheus-properties/target/example-prometheus-properties.jar
 ```
 
-View the metrics
-on [http://localhost:9401/metrics?name[]=request_duration_seconds&name[]=request_size_bytes](http://localhost:9401/metrics?name[]=request_duration_seconds&name[]=request_size_bytes). <!-- editorconfig-checker-disable-line -->
+View the metrics on
+[http://localhost:9401/metrics?name[]=request_duration_seconds&name[]=request_size_bytes][metrics-url].
 
 The example has a `prometheus.properties` file in the classpath with a few examples of how to change
 settings at runtime.
@@ -28,3 +28,5 @@ There are multiple alternative ways to specify the location of the `prometheus.p
 - Put it in the classpath, like in this example.
 - Set the environment variable `PROMETHEUS_CONFIG` to the file location.
 - Set the `prometheus.config` System property to the file location.
+
+[metrics-url]: http://localhost:9401/metrics?name[]=request_duration_seconds&name[]=request_size_bytes
diff --git a/examples/example-prometheus-properties/pom.xml b/examples/example-prometheus-properties/pom.xml
index b02b8fa03..3bf352d16 100644
--- a/examples/example-prometheus-properties/pom.xml
+++ b/examples/example-prometheus-properties/pom.xml
@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-prometheus-properties</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - prometheus.properties</name>
   <description>
     Example of runtime configuration with prometheus.properties
   </description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -48,8 +57,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.prometheus_properties.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/example-prometheus-properties/src/main/resources/prometheus.properties b/examples/example-prometheus-properties/src/main/resources/prometheus.properties
index a786fd370..be895f2fe 100644
--- a/examples/example-prometheus-properties/src/main/resources/prometheus.properties
+++ b/examples/example-prometheus-properties/src/main/resources/prometheus.properties
@@ -1,8 +1,8 @@
-io.prometheus.exporter.httpServer.port = 9401
-io.prometheus.exporter.includeCreatedTimestamps = true
+io.prometheus.exporter.http_server.port = 9401
+io.prometheus.exporter.include_created_timestamps = true
 
 # Set a new default for all histograms
-io.prometheus.metrics.histogramClassicUpperBounds =  .2, .4, .8, .1
+io.prometheus.metrics.histogram_classic_upper_bounds =  .2, .4, .8, .1
 
 # Override the default for one specific histogram
-io.prometheus.metrics.request_size_bytes.histogramClassicUpperBounds = 256, 512, 768, 1024
+io.prometheus.metrics.request_size_bytes.histogram_classic_upper_bounds = 256, 512, 768, 1024
diff --git a/examples/example-simpleclient-bridge/pom.xml b/examples/example-simpleclient-bridge/pom.xml
index f6d2c4207..0f8bf496a 100644
--- a/examples/example-simpleclient-bridge/pom.xml
+++ b/examples/example-simpleclient-bridge/pom.xml
@@ -1,21 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>io.prometheus</groupId>
-    <artifactId>examples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-  </parent>
-
+  <groupId>io.prometheus</groupId>
   <artifactId>example-simpleclient-bridge</artifactId>
+  <version>1.8.1-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.release>8</maven.compiler.release>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
 
   <name>Example - Simpleclient Bridge</name>
   <description>
     Prometheus Metrics Example of the Simpleclient Backwards Compatibility module
   </description>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-bom</artifactId>
+        <version>1.5.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>io.prometheus</groupId>
@@ -25,12 +37,10 @@
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-simpleclient-bridge</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -48,8 +58,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.examples.simpleclient.Main</mainClass>
                 </transformer>
               </transformers>
diff --git a/examples/pom.xml b/examples/pom.xml
index f88b313a2..80594e550 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>examples</artifactId>
@@ -19,6 +18,7 @@
 
   <properties>
     <coverage.skip>true</coverage.skip>
+    <javadoc.skip>true</javadoc.skip>
   </properties>
 
   <modules>
@@ -29,7 +29,9 @@
     <module>example-exporter-opentelemetry</module>
     <module>example-simpleclient-bridge</module>
     <module>example-native-histogram</module>
+    <module>example-custom-buckets</module>
     <module>example-prometheus-properties</module>
+    <module>example-otel-jvm-runtime-metrics</module>
   </modules>
 
 </project>
diff --git a/integration-tests/it-common/pom.xml b/integration-tests/it-common/pom.xml
index 2faac1769..9a4895f1c 100644
--- a/integration-tests/it-common/pom.xml
+++ b/integration-tests/it-common/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-common</artifactId>
diff --git a/integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java b/integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java
index 1b243991d..449a19186 100644
--- a/integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java
+++ b/integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java
@@ -4,7 +4,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
 
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,7 +24,7 @@
 import org.testcontainers.containers.GenericContainer;
 
 public abstract class ExporterTest {
-  private final GenericContainer<?> sampleAppContainer;
+  protected final GenericContainer<?> sampleAppContainer;
   private final Volume sampleAppVolume;
   protected final String sampleApp;
 
@@ -33,8 +33,12 @@ public ExporterTest(String sampleApp) throws IOException, URISyntaxException {
     this.sampleAppVolume =
         Volume.create("it-exporter")
             .copy("../../it-" + sampleApp + "/target/" + sampleApp + ".jar");
+    String javaVersion = System.getenv("TEST_JAVA_VERSION");
+    if (javaVersion == null || javaVersion.isEmpty()) {
+      javaVersion = "25";
+    }
     this.sampleAppContainer =
-        new GenericContainer<>("eclipse-temurin:25")
+        new GenericContainer<>("eclipse-temurin:" + javaVersion)
             .withFileSystemBind(sampleAppVolume.getHostPath(), "/app", BindMode.READ_ONLY)
             .withWorkingDirectory("/app")
             .withLogConsumer(LogConsumer.withPrefix(sampleApp))
@@ -53,7 +57,7 @@ protected void start(String outcome) {
   }
 
   @AfterEach
-  public void tearDown() throws IOException {
+  void tearDown() throws IOException {
     sampleAppContainer.stop();
     sampleAppVolume.remove();
   }
diff --git a/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/pom.xml b/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/pom.xml
new file mode 100644
index 000000000..e0c05f7f8
--- /dev/null
+++ b/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.prometheus</groupId>
+    <artifactId>it-exporter</artifactId>
+    <version>1.8.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>it-exporter-duplicate-metrics-sample</artifactId>
+
+  <name>Integration Tests - Duplicate Metrics Sample</name>
+  <description>
+    HTTPServer Sample demonstrating duplicate metric names with different label sets
+  </description>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>exporter-duplicate-metrics-sample</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>
+                    io.prometheus.metrics.it.exporter.duplicatemetrics.DuplicateMetricsSample
+                  </mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/src/main/java/io/prometheus/metrics/it/exporter/duplicatemetrics/DuplicateMetricsSample.java b/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/src/main/java/io/prometheus/metrics/it/exporter/duplicatemetrics/DuplicateMetricsSample.java
new file mode 100644
index 000000000..c6005674a
--- /dev/null
+++ b/integration-tests/it-exporter/it-exporter-duplicate-metrics-sample/src/main/java/io/prometheus/metrics/it/exporter/duplicatemetrics/DuplicateMetricsSample.java
@@ -0,0 +1,91 @@
+package io.prometheus.metrics.it.exporter.duplicatemetrics;
+
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.core.metrics.Gauge;
+import io.prometheus.metrics.exporter.httpserver.HTTPServer;
+import io.prometheus.metrics.model.snapshots.Unit;
+import java.io.IOException;
+
+/** Integration test sample demonstrating metrics with duplicate names but different label sets. */
+public class DuplicateMetricsSample {
+
+  public static void main(String[] args) throws IOException, InterruptedException {
+    if (args.length != 2) {
+      System.err.println("Usage: java -jar duplicate-metrics-sample.jar <port> <outcome>");
+      System.err.println("Where outcome is \"success\" or \"error\".");
+      System.exit(1);
+    }
+
+    int port = parsePortOrExit(args[0]);
+    String outcome = args[1];
+    run(port, outcome);
+  }
+
+  private static void run(int port, String outcome) throws IOException, InterruptedException {
+    // Register multiple counters with the same Prometheus name "http_requests_total"
+    // but different label sets
+    Counter requestsSuccess =
+        Counter.builder()
+            .name("http_requests_total")
+            .help("Total HTTP requests by status")
+            .labelNames("status", "method")
+            .register();
+    requestsSuccess.labelValues("success", "GET").inc(150);
+    requestsSuccess.labelValues("success", "POST").inc(45);
+
+    Counter requestsError =
+        Counter.builder()
+            .name("http_requests_total")
+            .help("Total HTTP requests by status")
+            .labelNames("status", "endpoint")
+            .register();
+    requestsError.labelValues("error", "/api").inc(5);
+    requestsError.labelValues("error", "/health").inc(2);
+
+    // Register multiple gauges with the same Prometheus name "active_connections"
+    // but different label sets
+    Gauge connectionsByRegion =
+        Gauge.builder()
+            .name("active_connections")
+            .help("Active connections")
+            .labelNames("region", "protocol")
+            .register();
+    connectionsByRegion.labelValues("us-east", "http").set(42);
+    connectionsByRegion.labelValues("us-west", "http").set(38);
+    connectionsByRegion.labelValues("eu-west", "https").set(55);
+
+    Gauge connectionsByPool =
+        Gauge.builder()
+            .name("active_connections")
+            .help("Active connections")
+            .labelNames("pool", "type")
+            .register();
+    connectionsByPool.labelValues("primary", "read").set(30);
+    connectionsByPool.labelValues("replica", "write").set(10);
+
+    // Also add a regular metric without duplicates for reference
+    Counter uniqueMetric =
+        Counter.builder()
+            .name("unique_metric_total")
+            .help("A unique metric for reference")
+            .unit(Unit.BYTES)
+            .register();
+    uniqueMetric.inc(1024);
+
+    HTTPServer server = HTTPServer.builder().port(port).buildAndStart();
+
+    System.out.println(
+        "DuplicateMetricsSample listening on http://localhost:" + server.getPort() + "/metrics");
+    Thread.currentThread().join(); // wait forever
+  }
+
+  private static int parsePortOrExit(String port) {
+    try {
+      return Integer.parseInt(port);
+    } catch (NumberFormatException e) {
+      System.err.println("\"" + port + "\": Invalid port number.");
+      System.exit(1);
+    }
+    return 0; // this won't happen
+  }
+}
diff --git a/integration-tests/it-exporter/it-exporter-httpserver-sample/pom.xml b/integration-tests/it-exporter/it-exporter-httpserver-sample/pom.xml
index f52c8434e..5255122dd 100644
--- a/integration-tests/it-exporter/it-exporter-httpserver-sample/pom.xml
+++ b/integration-tests/it-exporter/it-exporter-httpserver-sample/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-httpserver-sample</artifactId>
@@ -43,8 +42,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.it.exporter.httpserver.HTTPServerSample</mainClass>
                 </transformer>
               </transformers>
diff --git a/integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml b/integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml
index f75c398a5..0193d414f 100644
--- a/integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml
+++ b/integration-tests/it-exporter/it-exporter-no-protobuf/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-no-protobuf</artifactId>
@@ -55,8 +54,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.it.exporter.httpserver.HTTPServerSample</mainClass>
                 </transformer>
               </transformers>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml
index a8f90a5e6..a8a93ab20 100644
--- a/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml
+++ b/integration-tests/it-exporter/it-exporter-servlet-jetty-sample/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-servlet-jetty-sample</artifactId>
@@ -16,7 +15,7 @@
     Jetty Sample for the Exporter Integration Test
   </description>
   <properties>
-    <jetty-server.version>12.1.3</jetty-server.version>
+    <jetty-server.version>12.1.12</jetty-server.version>
     <java.version>25</java.version>
   </properties>
 
@@ -57,8 +56,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.it.exporter.servlet.jetty.ExporterServletJettySample
                   </mainClass>
                 </transformer>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
index ad188fa7d..7e9d9ab7d 100644
--- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
+++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-servlet-tomcat-sample</artifactId>
@@ -34,7 +33,7 @@
     <dependency>
       <groupId>org.apache.tomcat.embed</groupId>
       <artifactId>tomcat-embed-core</artifactId>
-      <version>11.0.14</version>
+      <version>11.0.25</version>
     </dependency>
   </dependencies>
 
@@ -52,8 +51,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.it.exporter.servlet.tomcat.ExporterServletTomcatSample
                   </mainClass>
                 </transformer>
diff --git a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java
index fa470b306..3cfd603c0 100644
--- a/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java
+++ b/integration-tests/it-exporter/it-exporter-servlet-tomcat-sample/src/main/java/io/prometheus/metrics/it/exporter/servlet/tomcat/ExporterServletTomcatSample.java
@@ -78,7 +78,7 @@ private static void run(Mode mode, int port) throws IOException, LifecycleExcept
     tomcat.setBaseDir(tmpDir.toFile().getAbsolutePath());
     Context ctx = tomcat.addContext("", new File(".").getAbsolutePath());
     Tomcat.addServlet(ctx, "metrics", new PrometheusMetricsServlet());
-    ctx.addServletMappingDecoded("/metrics", "metrics");
+    ctx.addServletMapping("/metrics", "metrics");
 
     tomcat.getConnector();
     tomcat.start();
diff --git a/integration-tests/it-exporter/it-exporter-test/pom.xml b/integration-tests/it-exporter/it-exporter-test/pom.xml
index 1929a9c6d..40ee58412 100644
--- a/integration-tests/it-exporter/it-exporter-test/pom.xml
+++ b/integration-tests/it-exporter/it-exporter-test/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter-test</artifactId>
@@ -24,5 +23,11 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/DuplicateMetricsIT.java b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/DuplicateMetricsIT.java
new file mode 100644
index 000000000..d69a65a29
--- /dev/null
+++ b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/DuplicateMetricsIT.java
@@ -0,0 +1,181 @@
+package io.prometheus.metrics.it.exporter.test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.client.it.common.ExporterTest;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class DuplicateMetricsIT extends ExporterTest {
+
+  public DuplicateMetricsIT() throws IOException, URISyntaxException {
+    super("exporter-duplicate-metrics-sample");
+  }
+
+  @Test
+  void testDuplicateMetricsInPrometheusTextFormat() throws IOException {
+    start();
+    Response response = scrape("GET", "");
+    assertThat(response.status).isEqualTo(200);
+    assertContentType(
+        "text/plain; version=0.0.4; charset=utf-8", response.getHeader("Content-Type"));
+
+    String expected =
+        """
+        # HELP active_connections Active connections
+        # TYPE active_connections gauge
+        active_connections{pool="primary",type="read"} 30.0
+        active_connections{pool="replica",type="write"} 10.0
+        active_connections{protocol="http",region="us-east"} 42.0
+        active_connections{protocol="http",region="us-west"} 38.0
+        active_connections{protocol="https",region="eu-west"} 55.0
+        # HELP http_requests_total Total HTTP requests by status
+        # TYPE http_requests_total counter
+        http_requests_total{endpoint="/api",status="error"} 5.0
+        http_requests_total{endpoint="/health",status="error"} 2.0
+        http_requests_total{method="GET",status="success"} 150.0
+        http_requests_total{method="POST",status="success"} 45.0
+        # HELP unique_metric_bytes_total A unique metric for reference
+        # TYPE unique_metric_bytes_total counter
+        unique_metric_bytes_total 1024.0
+        """;
+
+    assertThat(response.stringBody()).isEqualTo(expected);
+  }
+
+  @Test
+  void testDuplicateMetricsInOpenMetricsTextFormat() throws IOException {
+    start();
+    Response response =
+        scrape("GET", "", "Accept", "application/openmetrics-text; version=1.0.0; charset=utf-8");
+    assertThat(response.status).isEqualTo(200);
+    assertContentType(
+        "application/openmetrics-text; version=1.0.0; charset=utf-8",
+        response.getHeader("Content-Type"));
+
+    // OpenMetrics format should have UNIT for unique_metric_bytes (base name without _total)
+    String expected =
+        """
+        # TYPE active_connections gauge
+        # HELP active_connections Active connections
+        active_connections{pool="primary",type="read"} 30.0
+        active_connections{pool="replica",type="write"} 10.0
+        active_connections{protocol="http",region="us-east"} 42.0
+        active_connections{protocol="http",region="us-west"} 38.0
+        active_connections{protocol="https",region="eu-west"} 55.0
+        # TYPE http_requests counter
+        # HELP http_requests Total HTTP requests by status
+        http_requests_total{endpoint="/api",status="error"} 5.0
+        http_requests_total{endpoint="/health",status="error"} 2.0
+        http_requests_total{method="GET",status="success"} 150.0
+        http_requests_total{method="POST",status="success"} 45.0
+        # TYPE unique_metric_bytes counter
+        # UNIT unique_metric_bytes bytes
+        # HELP unique_metric_bytes A unique metric for reference
+        unique_metric_bytes_total 1024.0
+        # EOF
+        """;
+
+    assertThat(response.stringBody()).isEqualTo(expected);
+  }
+
+  @Test
+  void testDuplicateMetricsInPrometheusProtobufFormat() throws IOException {
+    start();
+    Response response =
+        scrape(
+            "GET",
+            "",
+            "Accept",
+            "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily;"
+                + " encoding=delimited");
+    assertThat(response.status).isEqualTo(200);
+    assertContentType(
+        "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily;"
+            + " encoding=delimited",
+        response.getHeader("Content-Type"));
+
+    List<Metrics.MetricFamily> metrics = response.protoBody();
+
+    assertThat(metrics).hasSize(3);
+
+    // Metrics are sorted by name
+    assertThat(metrics.get(0).getName()).isEqualTo("active_connections");
+    assertThat(metrics.get(1).getName()).isEqualTo("http_requests_total");
+    assertThat(metrics.get(2).getName()).isEqualTo("unique_metric_bytes_total");
+
+    // Verify active_connections has all 5 data points merged
+    Metrics.MetricFamily activeConnections = metrics.get(0);
+    assertThat(activeConnections.getType()).isEqualTo(Metrics.MetricType.GAUGE);
+    assertThat(activeConnections.getHelp()).isEqualTo("Active connections");
+    assertThat(activeConnections.getMetricList()).hasSize(5);
+
+    // Verify http_requests_total has all 4 data points merged
+    Metrics.MetricFamily httpRequests = metrics.get(1);
+    assertThat(httpRequests.getType()).isEqualTo(Metrics.MetricType.COUNTER);
+    assertThat(httpRequests.getHelp()).isEqualTo("Total HTTP requests by status");
+    assertThat(httpRequests.getMetricList()).hasSize(4);
+
+    // Verify each data point has the expected labels
+    boolean foundSuccessGet = false;
+    boolean foundSuccessPost = false;
+    boolean foundErrorApi = false;
+    boolean foundErrorHealth = false;
+
+    for (Metrics.Metric metric : httpRequests.getMetricList()) {
+      List<Metrics.LabelPair> labels = metric.getLabelList();
+      if (hasLabel(labels, "status", "success") && hasLabel(labels, "method", "GET")) {
+        assertThat(metric.getCounter().getValue()).isEqualTo(150.0);
+        foundSuccessGet = true;
+      } else if (hasLabel(labels, "status", "success") && hasLabel(labels, "method", "POST")) {
+        assertThat(metric.getCounter().getValue()).isEqualTo(45.0);
+        foundSuccessPost = true;
+      } else if (hasLabel(labels, "status", "error") && hasLabel(labels, "endpoint", "/api")) {
+        assertThat(metric.getCounter().getValue()).isEqualTo(5.0);
+        foundErrorApi = true;
+      } else if (hasLabel(labels, "status", "error") && hasLabel(labels, "endpoint", "/health")) {
+        assertThat(metric.getCounter().getValue()).isEqualTo(2.0);
+        foundErrorHealth = true;
+      }
+    }
+
+    assertThat(foundSuccessGet).isTrue();
+    assertThat(foundSuccessPost).isTrue();
+    assertThat(foundErrorApi).isTrue();
+    assertThat(foundErrorHealth).isTrue();
+
+    Metrics.MetricFamily uniqueMetric = metrics.get(2);
+    assertThat(uniqueMetric.getType()).isEqualTo(Metrics.MetricType.COUNTER);
+    assertThat(uniqueMetric.getMetricList()).hasSize(1);
+    assertThat(uniqueMetric.getMetric(0).getCounter().getValue()).isEqualTo(1024.0);
+  }
+
+  @Test
+  void testDuplicateMetricsWithNameFilter() throws IOException {
+    start();
+    // Only scrape http_requests_total
+    Response response = scrape("GET", nameParam());
+    assertThat(response.status).isEqualTo(200);
+
+    String body = response.stringBody();
+
+    assertThat(body)
+        .contains("http_requests_total{method=\"GET\",status=\"success\"} 150.0")
+        .contains("http_requests_total{endpoint=\"/api\",status=\"error\"} 5.0");
+
+    // Should NOT contain active_connections or unique_metric_total
+    assertThat(body).doesNotContain("active_connections").doesNotContain("unique_metric_total");
+  }
+
+  private boolean hasLabel(List<Metrics.LabelPair> labels, String name, String value) {
+    return labels.stream()
+        .anyMatch(label -> label.getName().equals(name) && label.getValue().equals(value));
+  }
+
+  private String nameParam() {
+    return "name[]=" + "http_requests_total";
+  }
+}
diff --git a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java
index d40fa2060..5a80d8bdf 100644
--- a/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java
+++ b/integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java
@@ -5,7 +5,7 @@
 
 import com.google.common.io.Resources;
 import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
@@ -22,7 +22,7 @@ public ExporterIT(String sampleApp) throws IOException, URISyntaxException {
   }
 
   @Test
-  public void testOpenMetricsTextFormat() throws IOException {
+  void testOpenMetricsTextFormat() throws IOException {
     start();
     Response response =
         scrape("GET", "", "Accept", "application/openmetrics-text; version=1.0.0; charset=utf-8");
@@ -44,7 +44,7 @@ public void testOpenMetricsTextFormat() throws IOException {
   }
 
   @Test
-  public void testPrometheusTextFormat() throws IOException {
+  void testPrometheusTextFormat() throws IOException {
     start();
     Response response = scrape("GET", "");
     assertThat(response.status).isEqualTo(200);
@@ -64,7 +64,7 @@ public void testPrometheusTextFormat() throws IOException {
   }
 
   @Test
-  public void testPrometheusProtobufFormat() throws IOException {
+  void testPrometheusProtobufFormat() throws IOException {
     start();
     Response response =
         scrape(
@@ -110,18 +110,22 @@ public void testPrometheusProtobufDebugFormat(String format, String expected) th
             .replace("<app>", sampleApp);
 
     if ("prometheus-protobuf".equals(format)) {
-      assertThat(actualResponse)
-          .matches(
-              Pattern.quote(expectedResponse)
-                  .replace("<CREATED_TIMESTAMP_SECONDS>", "\\E\\d+\\Q")
-                  .replace("<CREATED_TIMESTAMP_NANOS>", "\\E\\d+\\Q"));
+      // Protobuf text format omits fields with value 0, so nanos may be absent.
+      // Replace the nanos placeholder with a regex-friendly marker before quoting.
+      String withOptionalNanos =
+          expectedResponse.replace("\n      nanos: <CREATED_TIMESTAMP_NANOS>", "<OPTIONAL_NANOS>");
+      String pattern =
+          Pattern.quote(withOptionalNanos)
+              .replace("<CREATED_TIMESTAMP_SECONDS>", "\\E\\d+\\Q")
+              .replace("<OPTIONAL_NANOS>", "\\E(\n      nanos: \\d+)?\\Q");
+      assertThat(actualResponse).matches(pattern);
     } else {
       assertThat(actualResponse).isEqualTo(expectedResponse);
     }
   }
 
   @Test
-  public void testCompression() throws IOException {
+  void testCompression() throws IOException {
     start();
     Response response =
         scrape(
@@ -149,7 +153,7 @@ public void testCompression() throws IOException {
   }
 
   @Test
-  public void testErrorHandling() throws IOException {
+  void testErrorHandling() throws IOException {
     start("error");
     Response response = scrape("GET", "");
     assertThat(response.status).isEqualTo(500);
@@ -157,7 +161,7 @@ public void testErrorHandling() throws IOException {
   }
 
   @Test
-  public void testHeadRequest() throws IOException {
+  void testHeadRequest() throws IOException {
     start();
     Response fullResponse = scrape("GET", "");
     int size = fullResponse.body.length;
@@ -169,7 +173,7 @@ public void testHeadRequest() throws IOException {
   }
 
   @Test
-  public void testDebug() throws IOException {
+  void testDebug() throws IOException {
     start();
     Response response = scrape("GET", "debug=openmetrics");
     assertThat(response.status).isEqualTo(200);
@@ -180,7 +184,7 @@ public void testDebug() throws IOException {
   }
 
   @Test
-  public void testNameFilter() throws IOException {
+  void testNameFilter() throws IOException {
     start();
     Response response =
         scrape(
@@ -199,7 +203,7 @@ public void testNameFilter() throws IOException {
   }
 
   @Test
-  public void testEmptyResponseOpenMetrics() throws IOException {
+  void testEmptyResponseOpenMetrics() throws IOException {
     start();
     Response response =
         scrape(
@@ -217,7 +221,7 @@ public void testEmptyResponseOpenMetrics() throws IOException {
   }
 
   @Test
-  public void testEmptyResponseText() throws IOException {
+  void testEmptyResponseText() throws IOException {
     start();
     Response response = scrape("GET", nameParam("none_existing"));
     assertThat(response.status).isEqualTo(200);
@@ -231,7 +235,7 @@ public void testEmptyResponseText() throws IOException {
   }
 
   @Test
-  public void testEmptyResponseProtobuf() throws IOException {
+  void testEmptyResponseProtobuf() throws IOException {
     start();
     Response response =
         scrape(
@@ -249,7 +253,7 @@ public void testEmptyResponseProtobuf() throws IOException {
   }
 
   @Test
-  public void testEmptyResponseGzipOpenMetrics() throws IOException {
+  void testEmptyResponseGzipOpenMetrics() throws IOException {
     start();
     Response response =
         scrape(
@@ -265,7 +269,7 @@ public void testEmptyResponseGzipOpenMetrics() throws IOException {
   }
 
   @Test
-  public void testEmptyResponseGzipText() throws IOException {
+  void testEmptyResponseGzipText() throws IOException {
     start();
     Response response = scrape("GET", nameParam("none_existing"), "Accept-Encoding", "gzip");
     assertThat(response.status).isEqualTo(200);
@@ -278,7 +282,7 @@ private String nameParam(String name) {
   }
 
   @Test
-  public void testDebugUnknown() throws IOException {
+  void testDebugUnknown() throws IOException {
     start();
     Response response = scrape("GET", "debug=unknown");
     assertThat(response.status).isEqualTo(500);
diff --git a/integration-tests/it-exporter/it-no-protobuf-test/pom.xml b/integration-tests/it-exporter/it-no-protobuf-test/pom.xml
index 6321799db..389867de5 100644
--- a/integration-tests/it-exporter/it-no-protobuf-test/pom.xml
+++ b/integration-tests/it-exporter/it-no-protobuf-test/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>it-exporter</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-no-protobuf-test</artifactId>
diff --git a/integration-tests/it-exporter/it-no-protobuf-test/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java b/integration-tests/it-exporter/it-no-protobuf-test/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java
index cd534dcb9..9b041795e 100644
--- a/integration-tests/it-exporter/it-no-protobuf-test/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java
+++ b/integration-tests/it-exporter/it-no-protobuf-test/src/test/java/io/prometheus/metrics/it/noprotobuf/NoProtobufIT.java
@@ -14,7 +14,7 @@ public NoProtobufIT() throws IOException, URISyntaxException {
   }
 
   @Test
-  public void testPrometheusProtobufDebugFormat() throws IOException {
+  void testPrometheusProtobufDebugFormat() throws IOException {
     start();
     assertThat(scrape("GET", "debug=text").status).isEqualTo(200);
     // protobuf is not supported
diff --git a/integration-tests/it-exporter/pom.xml b/integration-tests/it-exporter/pom.xml
index a442b9086..b759c4330 100644
--- a/integration-tests/it-exporter/pom.xml
+++ b/integration-tests/it-exporter/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-exporter</artifactId>
@@ -21,6 +20,7 @@
     <module>it-exporter-servlet-tomcat-sample</module>
     <module>it-exporter-servlet-jetty-sample</module>
     <module>it-exporter-httpserver-sample</module>
+    <module>it-exporter-duplicate-metrics-sample</module>
     <module>it-exporter-no-protobuf</module>
     <module>it-exporter-test</module>
     <module>it-no-protobuf-test</module>
diff --git a/integration-tests/it-pushgateway/pom.xml b/integration-tests/it-pushgateway/pom.xml
index cf3e68169..bfc73ab10 100644
--- a/integration-tests/it-pushgateway/pom.xml
+++ b/integration-tests/it-pushgateway/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration-tests</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it-pushgateway</artifactId>
@@ -48,7 +47,7 @@
     <dependency>
       <groupId>com.jayway.jsonpath</groupId>
       <artifactId>json-path</artifactId>
-      <version>2.10.0</version>
+      <version>3.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -67,8 +66,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.metrics.it.pushgateway.PushGatewayTestApp</mainClass>
                 </transformer>
               </transformers>
diff --git a/integration-tests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java b/integration-tests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java
index 29a8fad72..3d31129f1 100644
--- a/integration-tests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java
+++ b/integration-tests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java
@@ -22,7 +22,7 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.MountableFile;
 
-public class PushGatewayIT {
+class PushGatewayIT {
 
   private GenericContainer<?> sampleAppContainer;
   private GenericContainer<?> pushGatewayContainer;
@@ -30,9 +30,13 @@ public class PushGatewayIT {
   private Volume sampleAppVolume;
 
   @BeforeEach
-  public void setUp() throws IOException, URISyntaxException {
+  void setUp() throws IOException, URISyntaxException {
     Network network = Network.newNetwork();
     sampleAppVolume = Volume.create("it-pushgateway").copy("pushgateway-test-app.jar");
+    String javaVersion = System.getenv("TEST_JAVA_VERSION");
+    if (javaVersion == null || javaVersion.isEmpty()) {
+      javaVersion = "25";
+    }
     pushGatewayContainer =
         new GenericContainer<>("prom/pushgateway:v1.8.0")
             .withExposedPorts(9091)
@@ -41,7 +45,7 @@ public void setUp() throws IOException, URISyntaxException {
             .withLogConsumer(LogConsumer.withPrefix("pushgateway"))
             .waitingFor(Wait.forListeningPort());
     sampleAppContainer =
-        new GenericContainer<>("eclipse-temurin:25")
+        new GenericContainer<>("eclipse-temurin:" + javaVersion)
             .withFileSystemBind(sampleAppVolume.getHostPath(), "/app", BindMode.READ_ONLY)
             .withNetwork(network)
             .withWorkingDirectory("/app")
@@ -56,7 +60,7 @@ public void setUp() throws IOException, URISyntaxException {
   }
 
   @AfterEach
-  public void tearDown() throws IOException {
+  void tearDown() throws IOException {
     prometheusContainer.stop();
     pushGatewayContainer.stop();
     sampleAppContainer.stop();
@@ -66,7 +70,7 @@ public void tearDown() throws IOException {
   final OkHttpClient client = new OkHttpClient();
 
   @Test
-  public void testSimple() throws IOException, InterruptedException {
+  void testSimple() throws IOException, InterruptedException {
     pushGatewayContainer.start();
     sampleAppContainer
         .withCommand(
@@ -86,7 +90,7 @@ public void testSimple() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testTextFormat() throws IOException, InterruptedException {
+  void testTextFormat() throws IOException, InterruptedException {
     pushGatewayContainer.start();
     sampleAppContainer
         .withCommand(
@@ -106,7 +110,7 @@ public void testTextFormat() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testBasicAuth() throws IOException, InterruptedException {
+  void testBasicAuth() throws IOException, InterruptedException {
     pushGatewayContainer
         .withCopyFileToContainer(
             MountableFile.forClasspathResource("/pushgateway-basicauth.yaml"),
@@ -131,7 +135,7 @@ public void testBasicAuth() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testSsl() throws InterruptedException, IOException {
+  void testSsl() throws InterruptedException, IOException {
     pushGatewayContainer
         .withCopyFileToContainer(
             MountableFile.forClasspathResource("/pushgateway-ssl.yaml"),
@@ -156,7 +160,7 @@ public void testSsl() throws InterruptedException, IOException {
   }
 
   @Test
-  public void testProtobuf() throws IOException, InterruptedException {
+  void testProtobuf() throws IOException, InterruptedException {
     pushGatewayContainer.start();
     sampleAppContainer
         .withCommand(
diff --git a/integration-tests/it-spring-boot-smoke-test/pom.xml b/integration-tests/it-spring-boot-smoke-test/pom.xml
index 28d6cf74c..0431364e2 100644
--- a/integration-tests/it-spring-boot-smoke-test/pom.xml
+++ b/integration-tests/it-spring-boot-smoke-test/pom.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.5.7</version>
+    <version>4.1.1</version>
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
   <groupId>io.prometheus</groupId>
   <artifactId>it-spring-boot-smoke-test</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
 
   <name>Integration Test - Spring Smoke Tests</name>
   <description>
@@ -22,7 +20,7 @@
   </description>
   <properties>
     <java.version>25</java.version>
-    <junit-jupiter.version>6.0.1</junit-jupiter.version>
+    <junit-jupiter.version>6.1.3</junit-jupiter.version>
   </properties>
 
   <dependencyManagement>
@@ -89,75 +87,19 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.graalvm.buildtools</groupId>
-        <artifactId>native-maven-plugin</artifactId>
-        <configuration>
-          <!-- editorconfig-checker-disable -->
-          <buildArgs>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator$IndicativeSentences
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$ClassInfo
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$LifecycleMethods
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter$Mode
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector$1
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor$MethodInfo
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver$DummyClassTemplateInvocationContext
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore$EvaluatedValue
-            </buildArg>
-            <buildArg>--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
-            </buildArg>
-            <buildArg>
-              --initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor$LifecycleMethods
-            </buildArg>
-          </buildArgs>
-          <!-- editorconfig-checker-enable -->
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
+      <!-- Run after package so reactor dependencies resolve to their shaded artifacts. -->
       <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <java>
-            <googleJavaFormat/>
-          </java>
-        </configuration>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
         <executions>
           <execution>
-            <phase>verify</phase>
             <goals>
-              <goal>check</goal>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
             </goals>
           </execution>
         </executions>
@@ -165,4 +107,83 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>java17-plus</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.graalvm.buildtools</groupId>
+            <artifactId>native-maven-plugin</artifactId>
+            <configuration>
+              <!-- editorconfig-checker-disable -->
+              <buildArgs>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator$IndicativeSentences
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$ClassInfo
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor$LifecycleMethods
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter$Mode
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector$1
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor$MethodInfo
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver$DummyClassTemplateInvocationContext
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore$EvaluatedValue
+                </buildArg>
+                <buildArg>--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor$LifecycleMethods
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.platform.commons.logging.LoggerFactory$DelegatingLogger
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.execution.ConditionEvaluator
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.execution.InterceptingExecutableInvoker
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.api.extension.ConditionEvaluationResult
+                </buildArg>
+                <buildArg>
+                  --initialize-at-build-time=org.junit.jupiter.engine.execution.InvocationInterceptorChain
+                </buildArg>
+              </buildArgs>
+              <!-- editorconfig-checker-enable -->
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationIT.java b/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationIT.java
new file mode 100644
index 000000000..43f389482
--- /dev/null
+++ b/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationIT.java
@@ -0,0 +1,74 @@
+package io.prometheus.metrics.it.springboot;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.client.it.common.ExporterTest;
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
+import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+class ApplicationIT {
+  @Test
+  void testUsesShadedProtobufRuntime() {
+    assertThat(Metrics.MetricFamily.class.getSuperclass().getName())
+        .startsWith("io.prometheus.metrics.shaded.com_google_protobuf_");
+  }
+
+  @Test
+  void testPrometheusProtobufFormat() throws IOException {
+    ExporterTest.Response response =
+        ExporterTest.scrape(
+            "GET",
+            URI.create("http://localhost:8080/actuator/prometheus"),
+            "Accept",
+            "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily;"
+                + " encoding=delimited");
+    assertThat(response.status).isEqualTo(200);
+
+    List<Metrics.MetricFamily> metrics = response.protoBody();
+    Optional<Metrics.MetricFamily> metric =
+        metrics.stream()
+            .filter(m -> m.getName().equals("application_started_time_seconds"))
+            .findFirst();
+    assertThat(metric).isPresent();
+  }
+
+  @Test
+  void testPrometheusProtobufDebugFormat() throws IOException {
+    HistogramSnapshot histogram =
+        HistogramSnapshot.builder()
+            .name("native_debug_repro_seconds")
+            .help("native debug repro")
+            .dataPoint(
+                HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                    .sum(0.123)
+                    .nativeSchema(5)
+                    .nativeZeroThreshold(2.938735877055719E-39)
+                    .nativeZeroCount(0)
+                    .nativeBucketsForPositiveValues(
+                        NativeHistogramBuckets.builder().bucket(-96, 1).build())
+                    .build())
+            .build();
+
+    String debugString =
+        new PrometheusProtobufWriterImpl()
+            .toDebugString(MetricSnapshots.of(histogram), EscapingScheme.UNDERSCORE_ESCAPING);
+
+    assertThat(debugString)
+        .contains(
+            "name: \"native_debug_repro_seconds\"",
+            "type: HISTOGRAM",
+            "schema: 5",
+            "positive_span");
+  }
+}
diff --git a/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java b/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java
deleted file mode 100644
index 967c4e714..000000000
--- a/integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.prometheus.metrics.it.springboot;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import io.prometheus.client.it.common.ExporterTest;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import java.util.Optional;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-@AutoConfigureObservability
-class ApplicationTest {
-  @Test
-  public void testPrometheusProtobufFormat() throws IOException {
-    ExporterTest.Response response =
-        ExporterTest.scrape(
-            "GET",
-            URI.create("http://localhost:8080/actuator/prometheus"),
-            "Accept",
-            "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily;"
-                + " encoding=delimited");
-    assertThat(response.status).isEqualTo(200);
-
-    List<Metrics.MetricFamily> metrics = response.protoBody();
-    Optional<Metrics.MetricFamily> metric =
-        metrics.stream()
-            .filter(m -> m.getName().equals("application_started_time_seconds"))
-            .findFirst();
-    assertThat(metric).isPresent();
-  }
-}
diff --git a/integration-tests/it-spring-boot-smoke-test/src/test/resources/META-INF/native-image/io.prometheus/it-spring-boot-smoke-test/serialization-config.json b/integration-tests/it-spring-boot-smoke-test/src/test/resources/META-INF/native-image/io.prometheus/it-spring-boot-smoke-test/serialization-config.json
new file mode 100644
index 000000000..eccc08a42
--- /dev/null
+++ b/integration-tests/it-spring-boot-smoke-test/src/test/resources/META-INF/native-image/io.prometheus/it-spring-boot-smoke-test/serialization-config.json
@@ -0,0 +1,5 @@
+[
+  {
+    "name": "org.junit.platform.engine.UniqueId$SerializedForm"
+  }
+]
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 5626ae17b..c3f299d69 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>integration-tests</artifactId>
@@ -19,6 +18,7 @@
 
   <properties>
     <coverage.skip>true</coverage.skip>
+    <javadoc.skip>true</javadoc.skip>
   </properties>
 
   <modules>
@@ -51,12 +51,12 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.21.0</version>
+      <version>2.22.0</version>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.21.3</version>
+      <version>1.21.4</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/lychee.toml b/lychee.toml
deleted file mode 100644
index 599f2de7a..000000000
--- a/lychee.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-max_retries = 6
-exclude_loopback = true
-cache = true
-
-base = "https://prometheus.github.io"
-exclude_path = ["docs/themes"]
-exclude = [
-  '^https://github\.com/prometheus/client_java/settings',
-  '#',
-  'CONTRIBUTING.md',
-  'LICENSE',
-  'MAINTAINERS.md'
-]
-
-
diff --git a/mise.lock b/mise.lock
new file mode 100644
index 000000000..fb1773f67
--- /dev/null
+++ b/mise.lock
@@ -0,0 +1,884 @@
+# @generated - this file is auto-generated by `mise lock` https://mise.en.dev/dev-tools/mise-lock.html
+
+[[tools.actionlint]]
+version = "1.7.12"
+backend = "aqua:rhysd/actionlint"
+
+[tools.actionlint."platforms.linux-arm64"]
+checksum = "sha256:325e971b6ba9bfa504672e29be93c24981eeb1c07576d730e9f7c8805afff0c6"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924897"
+provenance = "github-attestations"
+
+[tools.actionlint."platforms.linux-arm64-musl"]
+checksum = "sha256:325e971b6ba9bfa504672e29be93c24981eeb1c07576d730e9f7c8805afff0c6"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924897"
+provenance = "github-attestations"
+
+[tools.actionlint."platforms.linux-x64"]
+checksum = "sha256:8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924896"
+provenance = "github-attestations"
+
+[tools.actionlint."platforms.linux-x64-musl"]
+checksum = "sha256:8aca8db96f1b94770f1b0d72b6dddcb1ebb8123cb3712530b08cc387b349a3d8"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924896"
+provenance = "github-attestations"
+
+[tools.actionlint."platforms.macos-arm64"]
+checksum = "sha256:aba9ced2dee8d27fecca3dc7feb1a7f9a52caefa1eb46f3271ea66b6e0e6953f"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924893"
+provenance = "github-attestations"
+
+[tools.actionlint."platforms.macos-x64"]
+checksum = "sha256:5b44c3bc2255115c9b69e30efc0fecdf498fdb63c5d58e17084fd5f16324c644"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924880"
+provenance = "github-attestations"
+
+[tools.actionlint."platforms.windows-x64"]
+checksum = "sha256:6e7241b51e6817ea6a047693d8e6fed13b31819c9a0dd6c5a726e1592d22f6e9"
+url = "https://github.com/rhysd/actionlint/releases/download/v1.7.12/actionlint_1.7.12_windows_amd64.zip"
+url_api = "https://api.github.com/repos/rhysd/actionlint/releases/assets/384924919"
+provenance = "github-attestations"
+
+[[tools."aqua:grafana/flint"]]
+version = "0.22.10"
+backend = "aqua:grafana/flint"
+
+[tools."aqua:grafana/flint"."platforms.linux-arm64"]
+checksum = "sha256:6dec82cb6486b7e645e0b1674493497191d92a8e28c5c79194e5553882d213de"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-aarch64-unknown-linux-gnu.tar.gz"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491750275"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/flint"."platforms.linux-arm64-musl"]
+checksum = "sha256:373060c08a4cdd905d6e8e83f62ef43da8778d9133cb66b7801f392587812e8f"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491750193"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/flint"."platforms.linux-x64"]
+checksum = "sha256:a9f7f3768ec02cdd082c12cea0e815fc142d3ee721f4d8485f4ba9fc2c7d0521"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-x86_64-unknown-linux-gnu.tar.gz"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491749844"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/flint"."platforms.linux-x64-musl"]
+checksum = "sha256:3b174b31f10b1ded2cf0a54e8b62e5526713a49816c1fd74b00073519044f7bb"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491750257"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/flint"."platforms.macos-arm64"]
+checksum = "sha256:f9aa1a95aa5953f7f5a64c0d72f86e634c4930e9cb73422a95e342c6cb9be5d5"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491750245"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/flint"."platforms.macos-x64"]
+checksum = "sha256:b55731f1b74196afea675bdbd6ebbbd94171b4e9d31f79ecee36372bdf8818cf"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-x86_64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491752660"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/flint"."platforms.windows-x64"]
+checksum = "sha256:494f16ad4d2d8eae137438832e544675d196a2887086ab8070a5a346d70650be"
+url = "https://github.com/grafana/flint/releases/download/v0.22.10/flint-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/grafana/flint/releases/assets/491751016"
+provenance = "github-attestations"
+
+[[tools."aqua:grafana/gcx"]]
+version = "v1.1.0"
+backend = "aqua:grafana/gcx"
+
+[tools."aqua:grafana/gcx"."platforms.linux-arm64"]
+checksum = "sha256:4d39b70a5691045b7e381fd37976b75988926931f6cf184698444099099692e1"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303325"
+
+[tools."aqua:grafana/gcx"."platforms.linux-arm64-musl"]
+checksum = "sha256:4d39b70a5691045b7e381fd37976b75988926931f6cf184698444099099692e1"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303325"
+
+[tools."aqua:grafana/gcx"."platforms.linux-x64"]
+checksum = "sha256:0c7867e99f5786b7e1b5ea449cf540c14b67f40c1c92c0f93031eaa2e0c38df9"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303327"
+
+[tools."aqua:grafana/gcx"."platforms.linux-x64-musl"]
+checksum = "sha256:0c7867e99f5786b7e1b5ea449cf540c14b67f40c1c92c0f93031eaa2e0c38df9"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303327"
+
+[tools."aqua:grafana/gcx"."platforms.macos-arm64"]
+checksum = "sha256:a1e1e62b54700d829ece3cc4a013570e0eff3c872e8c11991866ed58a6701709"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303326"
+
+[tools."aqua:grafana/gcx"."platforms.macos-x64"]
+checksum = "sha256:94324fd3d052eee604df58af41ef125ac5cfc6d878fcb615b34012e21a6bc7f5"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303329"
+
+[tools."aqua:grafana/gcx"."platforms.windows-x64"]
+checksum = "sha256:21039e34896c0bafaf044cee0de7545d3ccda2f05ed0f13404685b1e09fd3cb0"
+url = "https://github.com/grafana/gcx/releases/download/v1.1.0/gcx_1.1.0_windows_amd64.zip"
+url_api = "https://api.github.com/repos/grafana/gcx/releases/assets/514303368"
+
+[[tools."aqua:grafana/oats"]]
+version = "0.10.0"
+backend = "aqua:grafana/oats"
+
+[tools."aqua:grafana/oats"."platforms.linux-arm64"]
+checksum = "sha256:be195aeeafce644c8a59438bbc8c472f5ca51df6f9570c6b646373a703d686b0"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772122"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/oats"."platforms.linux-arm64-musl"]
+checksum = "sha256:be195aeeafce644c8a59438bbc8c472f5ca51df6f9570c6b646373a703d686b0"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_linux_arm64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772122"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/oats"."platforms.linux-x64"]
+checksum = "sha256:b72a7a587148d1eaa15ccea3ce1adfd67e040d1cd9f9e267c850154035ef9a18"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772131"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/oats"."platforms.linux-x64-musl"]
+checksum = "sha256:b72a7a587148d1eaa15ccea3ce1adfd67e040d1cd9f9e267c850154035ef9a18"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_linux_amd64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772131"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/oats"."platforms.macos-arm64"]
+checksum = "sha256:570d5c3b43c0cbe0d88c527d2fcecb9ee565e2f9d1a4d49fb4b6bbf5c3fa47e5"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_darwin_arm64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772124"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/oats"."platforms.macos-x64"]
+checksum = "sha256:c3579f73928df56d1cf6d6bbb90d20424649ff08c228daa4810914017f8620d8"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_darwin_amd64.tar.gz"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772123"
+provenance = "github-attestations"
+
+[tools."aqua:grafana/oats"."platforms.windows-x64"]
+checksum = "sha256:b52112bf0932ea8dea1fb051bc04e29efa5ef138f67d09d775c4eb716d3d92f9"
+url = "https://github.com/grafana/oats/releases/download/v0.10.0/oats_0.10.0_windows_amd64.zip"
+url_api = "https://api.github.com/repos/grafana/oats/releases/assets/493772125"
+provenance = "github-attestations"
+
+[[tools."aqua:jonwiggins/xmloxide"]]
+version = "v0.5.0"
+backend = "aqua:jonwiggins/xmloxide"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.linux-arm64"]
+checksum = "sha256:554d4ae976782bed0d9fa44b9ee7106a756f6a599ef9867b412db47a2a664399"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_linux-aarch64"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799877"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.linux-arm64-musl"]
+checksum = "sha256:554d4ae976782bed0d9fa44b9ee7106a756f6a599ef9867b412db47a2a664399"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_linux-aarch64"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799877"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.linux-x64"]
+checksum = "sha256:4dd8c45676bb34bd397db97179231f4e6f77caff35059f18de9d1d4b68773d55"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_linux-x86-64"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799872"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.linux-x64-musl"]
+checksum = "sha256:4dd8c45676bb34bd397db97179231f4e6f77caff35059f18de9d1d4b68773d55"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_linux-x86-64"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799872"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.macos-arm64"]
+checksum = "sha256:02a44c8cab86cd2d8765fcf0dc7e7610768571a0cf0af3785fb691196d1eebe5"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_darwin-aarch64"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799873"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.macos-x64"]
+checksum = "sha256:6876c1f1ec9dd31bc80a6417548fa337898e78e50ac0479ed391f3bd26e0b4f3"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_darwin-x86-64"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799874"
+
+[tools."aqua:jonwiggins/xmloxide"."platforms.windows-x64"]
+checksum = "sha256:ecf509be8f9de6cb86921c88a516a9fac4a920f0905c18f62d91a4ed41af920f"
+url = "https://github.com/jonwiggins/xmloxide/releases/download/v0.5.0/xmllint_windows-x86-64.exe"
+url_api = "https://api.github.com/repos/jonwiggins/xmloxide/releases/assets/506799871"
+
+[[tools."aqua:owenlamont/ryl"]]
+version = "0.21.0"
+backend = "aqua:owenlamont/ryl"
+
+[tools."aqua:owenlamont/ryl"."platforms.linux-arm64"]
+checksum = "sha256:134dfccd5dd7fd13092dbaf482e14e1e9c2b238ecf4306ac020b036212f85abc"
+url = "https://github.com/owenlamont/ryl/releases/download/v0.21.0/ryl-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/owenlamont/ryl/releases/assets/454375977"
+provenance = "github-attestations"
+
+[tools."aqua:owenlamont/ryl"."platforms.linux-arm64-musl"]
+checksum = "sha256:134dfccd5dd7fd13092dbaf482e14e1e9c2b238ecf4306ac020b036212f85abc"
+url = "https://github.com/owenlamont/ryl/releases/download/v0.21.0/ryl-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/owenlamont/ryl/releases/assets/454375977"
+provenance = "github-attestations"
+
+[tools."aqua:owenlamont/ryl"."platforms.linux-x64"]
+checksum = "sha256:36867148c4e7415b5f8dd24a1c4e3212e8ec016a6a16d1d1e0d16d7c2f641214"
+url = "https://github.com/owenlamont/ryl/releases/download/v0.21.0/ryl-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/owenlamont/ryl/releases/assets/454375995"
+provenance = "github-attestations"
+
+[tools."aqua:owenlamont/ryl"."platforms.linux-x64-musl"]
+checksum = "sha256:36867148c4e7415b5f8dd24a1c4e3212e8ec016a6a16d1d1e0d16d7c2f641214"
+url = "https://github.com/owenlamont/ryl/releases/download/v0.21.0/ryl-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/owenlamont/ryl/releases/assets/454375995"
+provenance = "github-attestations"
+
+[tools."aqua:owenlamont/ryl"."platforms.macos-arm64"]
+checksum = "sha256:ed5e23a5634f138aac5c2c15e72975f0f485f694582ef6874625e38460b0c3b4"
+url = "https://github.com/owenlamont/ryl/releases/download/v0.21.0/ryl-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/owenlamont/ryl/releases/assets/454375976"
+provenance = "github-attestations"
+
+[tools."aqua:owenlamont/ryl"."platforms.windows-x64"]
+checksum = "sha256:7522a1fde12775ad43b74e154a6abe3affb676bb52d719ac9e7eb6980bda856d"
+url = "https://github.com/owenlamont/ryl/releases/download/v0.21.0/ryl-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/owenlamont/ryl/releases/assets/454375990"
+provenance = "github-attestations"
+
+[[tools.biome]]
+version = "2.5.8"
+backend = "aqua:biomejs/biome"
+
+[tools.biome."platforms.linux-arm64"]
+checksum = "sha256:3f2be9f1f68dca8e0b96d2a9212b408f15dc2668203b2c42cfb78a2894cc966b"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-linux-arm64"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899232"
+provenance = "github-attestations"
+
+[tools.biome."platforms.linux-arm64-musl"]
+checksum = "sha256:09d02b9839aa1bf97b65fcce39b561c5687f6521607db46e4bcffdd99a0175a5"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-linux-arm64-musl"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899235"
+provenance = "github-attestations"
+
+[tools.biome."platforms.linux-x64"]
+checksum = "sha256:17abac7ef72e7a1aaccd89892f7e2e62c9919d27473defe772be04ad78400ac2"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-linux-x64"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899231"
+provenance = "github-attestations"
+
+[tools.biome."platforms.linux-x64-musl"]
+checksum = "sha256:365f2aac71051842d65a9d03139dc0f189628a0e8c2dc3aa2ef09a51ef94bcbd"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-linux-x64-musl"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899233"
+provenance = "github-attestations"
+
+[tools.biome."platforms.macos-arm64"]
+checksum = "sha256:04c2d44e61242c8bf56e2d663e5312e78639334b4a2fef84b5f59ac8bc9579fb"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-darwin-arm64"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899230"
+provenance = "github-attestations"
+
+[tools.biome."platforms.macos-x64"]
+checksum = "sha256:6bfc751bfff3429888c527d2bb1fe632808769d2f5849579ed8cf71e5fe25c8b"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-darwin-x64"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899236"
+provenance = "github-attestations"
+
+[tools.biome."platforms.windows-x64"]
+checksum = "sha256:80ac9293d359f55e5f75e1dec13c2ec9c28f01e7e8a8e409b0407a1498da006f"
+url = "https://github.com/biomejs/biome/releases/download/%40biomejs/biome%402.5.8/biome-win32-x64.exe"
+url_api = "https://api.github.com/repos/biomejs/biome/releases/assets/509899229"
+provenance = "github-attestations"
+
+[[tools.checkstyle]]
+version = "13.8.0"
+backend = "aqua:checkstyle/checkstyle"
+
+[tools.checkstyle."platforms.linux-arm64"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[tools.checkstyle."platforms.linux-arm64-musl"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[tools.checkstyle."platforms.linux-x64"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[tools.checkstyle."platforms.linux-x64-musl"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[tools.checkstyle."platforms.macos-arm64"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[tools.checkstyle."platforms.macos-x64"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[tools.checkstyle."platforms.windows-x64"]
+checksum = "sha256:cb0b1083eb5d3f9f0b7f0edd9a86d8dbe406bf44da73c3df869abace8cb8502c"
+url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-13.8.0/checkstyle-13.8.0-all.jar"
+url_api = "https://api.github.com/repos/checkstyle/checkstyle/releases/assets/474019260"
+
+[[tools.editorconfig-checker]]
+version = "3.11.1"
+backend = "aqua:editorconfig-checker/editorconfig-checker"
+
+[tools.editorconfig-checker."platforms.linux-arm64"]
+checksum = "sha256:073d5263f0c5953f3e847df44a84403ecc284ab77419de56e280ab92bc082e8d"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306098"
+
+[tools.editorconfig-checker."platforms.linux-arm64-musl"]
+checksum = "sha256:073d5263f0c5953f3e847df44a84403ecc284ab77419de56e280ab92bc082e8d"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306098"
+
+[tools.editorconfig-checker."platforms.linux-x64"]
+checksum = "sha256:5a37922963248451e88149251e49f6ae08f69717a3918202a51fe9945e19691e"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-linux-amd64.tar.gz"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306099"
+
+[tools.editorconfig-checker."platforms.linux-x64-musl"]
+checksum = "sha256:5a37922963248451e88149251e49f6ae08f69717a3918202a51fe9945e19691e"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-linux-amd64.tar.gz"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306099"
+
+[tools.editorconfig-checker."platforms.macos-arm64"]
+checksum = "sha256:69205598fe8b26677d31194c5c9fdf7e8be321909ffb3c99efb5c9e4e648583e"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-darwin-arm64.tar.gz"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306097"
+
+[tools.editorconfig-checker."platforms.macos-x64"]
+checksum = "sha256:a9f68961e33d1a3b3f134c403557c8b2bbafb70b21b4c32b5d9245ffc2875f4f"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-darwin-amd64.tar.gz"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306114"
+
+[tools.editorconfig-checker."platforms.windows-x64"]
+checksum = "sha256:6f81f034bbaf77d7ea73274aa7d33995baf9e0d91bc4d4caa8eccff4645f870e"
+url = "https://github.com/editorconfig-checker/editorconfig-checker/releases/download/v3.11.1/ec-windows-amd64.zip"
+url_api = "https://api.github.com/repos/editorconfig-checker/editorconfig-checker/releases/assets/506306105"
+
+[[tools.google-java-format]]
+version = "1.36.1"
+backend = "aqua:google/google-java-format"
+
+[tools.google-java-format."platforms.linux-arm64"]
+checksum = "sha256:37d27263fce029fc59aa4e1b556ac6997d0eb2266a38ba2b8746b709f6c77b11"
+url = "https://github.com/google/google-java-format/releases/download/v1.36.1/google-java-format_linux-arm64"
+url_api = "https://api.github.com/repos/google/google-java-format/releases/assets/495658509"
+
+[tools.google-java-format."platforms.linux-arm64-musl"]
+checksum = "sha256:37d27263fce029fc59aa4e1b556ac6997d0eb2266a38ba2b8746b709f6c77b11"
+url = "https://github.com/google/google-java-format/releases/download/v1.36.1/google-java-format_linux-arm64"
+url_api = "https://api.github.com/repos/google/google-java-format/releases/assets/495658509"
+
+[tools.google-java-format."platforms.linux-x64"]
+checksum = "sha256:8dc71663a6c9cb17b02ba9709bfab5c4de59de6f4ac133fd7a1d5a4394b1193b"
+url = "https://github.com/google/google-java-format/releases/download/v1.36.1/google-java-format_linux-x86-64"
+url_api = "https://api.github.com/repos/google/google-java-format/releases/assets/495658560"
+
+[tools.google-java-format."platforms.linux-x64-musl"]
+checksum = "sha256:8dc71663a6c9cb17b02ba9709bfab5c4de59de6f4ac133fd7a1d5a4394b1193b"
+url = "https://github.com/google/google-java-format/releases/download/v1.36.1/google-java-format_linux-x86-64"
+url_api = "https://api.github.com/repos/google/google-java-format/releases/assets/495658560"
+
+[tools.google-java-format."platforms.macos-arm64"]
+checksum = "sha256:572c8be5ea4e15c674f7f9c89f9c0a4b9336950d9c42c07220557e97a4002bce"
+url = "https://github.com/google/google-java-format/releases/download/v1.36.1/google-java-format_darwin-arm64"
+url_api = "https://api.github.com/repos/google/google-java-format/releases/assets/495658217"
+
+[tools.google-java-format."platforms.windows-x64"]
+checksum = "sha256:23a6acedcfd9253da8413984dd1e3aecab32f00543477566d1abe5ae5aab1019"
+url = "https://github.com/google/google-java-format/releases/download/v1.36.1/google-java-format_windows-x86-64.exe"
+url_api = "https://api.github.com/repos/google/google-java-format/releases/assets/495658633"
+
+[[tools.hugo]]
+version = "0.165.0"
+backend = "aqua:gohugoio/hugo"
+
+[tools.hugo."platforms.linux-arm64"]
+checksum = "sha256:65c9fdd75e82d5f1eaf565f6e9fede6c0ceecaa267798e10c73068986996b77d"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697401"
+
+[tools.hugo."platforms.linux-arm64-musl"]
+checksum = "sha256:65c9fdd75e82d5f1eaf565f6e9fede6c0ceecaa267798e10c73068986996b77d"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_linux-arm64.tar.gz"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697401"
+
+[tools.hugo."platforms.linux-x64"]
+checksum = "sha256:5c3a37a5450b3e386e5b75a87a790fea2d04a796d75e171216c80ef48a32b432"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_linux-amd64.tar.gz"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697404"
+
+[tools.hugo."platforms.linux-x64-musl"]
+checksum = "sha256:5c3a37a5450b3e386e5b75a87a790fea2d04a796d75e171216c80ef48a32b432"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_linux-amd64.tar.gz"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697404"
+
+[tools.hugo."platforms.macos-arm64"]
+checksum = "sha256:10ea75335975a13d0e73ac298402179335c55fa4e99d1687452d9cfa70b30d16"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_darwin-universal.pkg"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697483"
+
+[tools.hugo."platforms.macos-x64"]
+checksum = "sha256:10ea75335975a13d0e73ac298402179335c55fa4e99d1687452d9cfa70b30d16"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_darwin-universal.pkg"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697483"
+
+[tools.hugo."platforms.windows-x64"]
+checksum = "sha256:bdd9cc7837a42389067b2d0df7858d5878ceddef21307c2dd27fa10885fbbcf9"
+url = "https://github.com/gohugoio/hugo/releases/download/v0.165.0/hugo_0.165.0_windows-amd64.zip"
+url_api = "https://api.github.com/repos/gohugoio/hugo/releases/assets/511697493"
+
+[[tools.java]]
+version = "temurin-25.0.3+9.0.LTS"
+backend = "core:java"
+
+[tools.java."platforms.linux-arm64"]
+checksum = "sha256:3e4287cb98870ba824ed698854bdc27cff984254caf66dd12cc291e7bfdde26b"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_aarch64_linux_hotspot_25.0.3_9.tar.gz"
+
+[tools.java."platforms.linux-arm64-musl"]
+checksum = "sha256:6ed368e93049d3b188c045fce0b20953bbea92fe0614dbbf4d3fd8daad7be3b2"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_aarch64_alpine-linux_hotspot_25.0.3_9.tar.gz"
+
+[tools.java."platforms.linux-x64"]
+checksum = "sha256:69264a7a211bf5029830d07bc3370f879769d62ebc5b5488e90c9343a2da0e1f"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_x64_linux_hotspot_25.0.3_9.tar.gz"
+
+[tools.java."platforms.linux-x64-musl"]
+checksum = "sha256:51c2415b370aac7c3796b0c4663c8fcf91bc22d76f03df95b25fa5667cb5fdd8"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_x64_alpine-linux_hotspot_25.0.3_9.tar.gz"
+
+[tools.java."platforms.macos-arm64"]
+checksum = "sha256:7baab4d69a15554e119b86ff78d40e3fdc28819b5b322955c913cebfe3f6a37c"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_aarch64_mac_hotspot_25.0.3_9.tar.gz"
+
+[tools.java."platforms.macos-x64"]
+checksum = "sha256:4c539a18b4d656960ff6766727e9ca546fc17f7a29714dba9e7b47bdcb37c447"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_x64_mac_hotspot_25.0.3_9.tar.gz"
+
+[tools.java."platforms.windows-x64"]
+checksum = "sha256:709312cd0420296d9b9de917fe6e28a5b979e875ee5ab91783fb79bcd5857235"
+url = "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_x64_windows_hotspot_25.0.3_9.zip"
+
+[[tools.lychee]]
+version = "0.24.2"
+backend = "aqua:lycheeverse/lychee"
+
+[tools.lychee."platforms.linux-arm64"]
+checksum = "sha256:5d0b0e3aeab240f41920c633a6eaf97599be6eedda034b36e858ede7dba5e535"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409958602"
+
+[tools.lychee."platforms.linux-arm64-musl"]
+checksum = "sha256:5d0b0e3aeab240f41920c633a6eaf97599be6eedda034b36e858ede7dba5e535"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409958602"
+
+[tools.lychee."platforms.linux-x64"]
+checksum = "sha256:73657a111819a30c47c08352896796f23d64e4eb2b3ed39b6d32149241566fc5"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409959271"
+
+[tools.lychee."platforms.linux-x64-musl"]
+checksum = "sha256:73657a111819a30c47c08352896796f23d64e4eb2b3ed39b6d32149241566fc5"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409959271"
+
+[tools.lychee."platforms.macos-arm64"]
+checksum = "sha256:c9d3740ea2d891854d37116c9fba840f37b6e7c89d330e7db84ac333631c4977"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409957951"
+
+[tools.lychee."platforms.macos-x64"]
+checksum = "sha256:887503a9cff667d322b8d0892b40bf49976eb9507af8483220a3706cdad55978"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-x86_64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409957687"
+
+[tools.lychee."platforms.windows-x64"]
+checksum = "sha256:32975d1493ee1a975d6bb41e4fb56fe419cb442ded628bb772ba2e614acfacad"
+url = "https://github.com/lycheeverse/lychee/releases/download/lychee-v0.24.2/lychee-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/lycheeverse/lychee/releases/assets/409959491"
+
+[[tools.node]]
+version = "24.19.0"
+backend = "core:node"
+
+[tools.node."platforms.linux-arm64"]
+checksum = "sha256:d28c8a5bf0a808f0ed434a1dce8c54ae98f0371c0bd86ac58abc613f73e6643f"
+url = "https://nodejs.org/dist/v24.19.0/node-v24.19.0-linux-arm64.tar.gz"
+
+[tools.node."platforms.linux-arm64-musl"]
+checksum = "sha256:20824e4d35948fae5b337dccef47813b04d8995312f59df7386f2256d9f9ab7e"
+url = "https://unofficial-builds.nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-arm64-musl.tar.gz"
+
+[tools.node."platforms.linux-x64"]
+checksum = "sha256:f625d97cd707df4ff96254916fbc5ff014f09c09effe5a1e0ca8f6d41a8789d4"
+url = "https://nodejs.org/dist/v24.19.0/node-v24.19.0-linux-x64.tar.gz"
+
+[tools.node."platforms.linux-x64-musl"]
+checksum = "sha256:c60223786df14a5d23e220ebb8e60318f5322640a62f90e6d9e54d3a18da532e"
+url = "https://unofficial-builds.nodejs.org/download/release/v24.19.0/node-v24.19.0-linux-x64-musl.tar.gz"
+
+[tools.node."platforms.macos-arm64"]
+checksum = "sha256:8294b7aa9b03997481c06babf1e8b270c859358f27da57a11509afe537ac381d"
+url = "https://nodejs.org/dist/v24.19.0/node-v24.19.0-darwin-arm64.tar.gz"
+
+[tools.node."platforms.macos-x64"]
+checksum = "sha256:d1b5e999db158c62fe8f7267a4476b035d8bd93b1a605bac24a3f0dd166e3316"
+url = "https://nodejs.org/dist/v24.19.0/node-v24.19.0-darwin-x64.tar.gz"
+
+[tools.node."platforms.windows-x64"]
+checksum = "sha256:57f71ab3652e797d84acddc79c81cc9ff1c6ddb2a1974cdb83f00fee9bff4c73"
+url = "https://nodejs.org/dist/v24.19.0/node-v24.19.0-win-x64.zip"
+
+[[tools."npm:renovate"]]
+version = "44.29.4"
+backend = "npm:renovate"
+
+[tools."npm:renovate".options]
+trust_policy_excludes = '["@yarnpkg/libzip@3.2.2"]'
+
+[[tools.protoc]]
+version = "36.0"
+backend = "aqua:protocolbuffers/protobuf/protoc"
+
+[tools.protoc."platforms.linux-arm64"]
+checksum = "sha256:4a00ec5e256d20a3deadd9e77d56da0ac04c72367c3c959f6d08e110a368400a"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-linux-aarch_64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522289978"
+
+[tools.protoc."platforms.linux-arm64-musl"]
+checksum = "sha256:4a00ec5e256d20a3deadd9e77d56da0ac04c72367c3c959f6d08e110a368400a"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-linux-aarch_64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522289978"
+
+[tools.protoc."platforms.linux-x64"]
+checksum = "sha256:bc8211ce760bd43ee21ddc145d6d9dbaeeabae205267a79d9054a240e367d4b4"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-linux-x86_64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522290000"
+
+[tools.protoc."platforms.linux-x64-musl"]
+checksum = "sha256:bc8211ce760bd43ee21ddc145d6d9dbaeeabae205267a79d9054a240e367d4b4"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-linux-x86_64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522290000"
+
+[tools.protoc."platforms.macos-arm64"]
+checksum = "sha256:b6bc4afdcb880124bf342851d05155b6e3d9b6e661236d87b9c614250d26ae00"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-osx-aarch_64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522290002"
+
+[tools.protoc."platforms.macos-x64"]
+checksum = "sha256:2847d952ecd1c466769ae3ca319c9cd34c3613542eba335dc9b02c49537f6c70"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-osx-x86_64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522290007"
+
+[tools.protoc."platforms.windows-x64"]
+checksum = "sha256:510fb2369a4720adb457783768c5e1481a0e1137d9e7694478dfe9b8fe445dc1"
+url = "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-win64.zip"
+url_api = "https://api.github.com/repos/protocolbuffers/protobuf/releases/assets/522290018"
+
+[[tools.ruff]]
+version = "0.16.3"
+backend = "aqua:astral-sh/ruff"
+
+[tools.ruff."platforms.linux-arm64"]
+checksum = "sha256:8319ba22f655e6efc086103486d7165bf0de73f71ff1c5f25ba580153ad05feb"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140238"
+provenance = "github-attestations"
+
+[tools.ruff."platforms.linux-arm64-musl"]
+checksum = "sha256:8319ba22f655e6efc086103486d7165bf0de73f71ff1c5f25ba580153ad05feb"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140238"
+provenance = "github-attestations"
+
+[tools.ruff."platforms.linux-x64"]
+checksum = "sha256:d67c9b5949981698c48915abf65e0b3406ba9184ad73521cdf20a926bc889c73"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140356"
+provenance = "github-attestations"
+
+[tools.ruff."platforms.linux-x64-musl"]
+checksum = "sha256:d67c9b5949981698c48915abf65e0b3406ba9184ad73521cdf20a926bc889c73"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140356"
+provenance = "github-attestations"
+
+[tools.ruff."platforms.macos-arm64"]
+checksum = "sha256:136a4db6512d9b16dda56ac8604696ed65c3b1a914a142de029e7f8d5006f1d9"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140218"
+provenance = "github-attestations"
+
+[tools.ruff."platforms.macos-x64"]
+checksum = "sha256:05c2a6705e7c0c056d6d93ff538978583f0c47b4c28d334ab9d58d2e8daf4c24"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-x86_64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140338"
+provenance = "github-attestations"
+
+[tools.ruff."platforms.windows-x64"]
+checksum = "sha256:f10c709755b393fd9821506b21070bcca969b9966504edd1e490efd08e3662ba"
+url = "https://github.com/astral-sh/ruff/releases/download/0.16.3/ruff-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/astral-sh/ruff/releases/assets/513140346"
+provenance = "github-attestations"
+
+[[tools.rumdl]]
+version = "v0.2.55"
+backend = "aqua:rvben/rumdl"
+
+[tools.rumdl."platforms.linux-arm64"]
+checksum = "sha256:baed03dac3bf50565f4e1e461fb8162fcff58742034c6d643a1977d9025dfdb6"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169605"
+provenance = "github-attestations"
+
+[tools.rumdl."platforms.linux-arm64-musl"]
+checksum = "sha256:baed03dac3bf50565f4e1e461fb8162fcff58742034c6d643a1977d9025dfdb6"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169605"
+provenance = "github-attestations"
+
+[tools.rumdl."platforms.linux-x64"]
+checksum = "sha256:09c8f72cb57f1ff646d68b5ec2ef6a7b296e6d9f945093db2698c260e81d9f90"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169600"
+provenance = "github-attestations"
+
+[tools.rumdl."platforms.linux-x64-musl"]
+checksum = "sha256:09c8f72cb57f1ff646d68b5ec2ef6a7b296e6d9f945093db2698c260e81d9f90"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169600"
+provenance = "github-attestations"
+
+[tools.rumdl."platforms.macos-arm64"]
+checksum = "sha256:98dd5620e7eb8ba8fd77830fe1f313530ae2a6368ae867149f7de13dbebde6e3"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169607"
+provenance = "github-attestations"
+
+[tools.rumdl."platforms.macos-x64"]
+checksum = "sha256:8dadf1b9aeda17f8a41ab4fcdd2a7f7dfb6eda8981ddce3ebf61b72e3d1d3f89"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-x86_64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169601"
+provenance = "github-attestations"
+
+[tools.rumdl."platforms.windows-x64"]
+checksum = "sha256:47c04176f960e2d196b1e465564869363469ec00714c2970e1f441deff7f679d"
+url = "https://github.com/rvben/rumdl/releases/download/v0.2.55/rumdl-v0.2.55-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/rvben/rumdl/releases/assets/512169608"
+provenance = "github-attestations"
+
+[[tools.shellcheck]]
+version = "v0.11.0"
+backend = "aqua:koalaman/shellcheck"
+
+[tools.shellcheck."platforms.linux-arm64"]
+checksum = "sha256:12b331c1d2db6b9eb13cfca64306b1b157a86eb69db83023e261eaa7e7c14588"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.linux.aarch64.tar.xz"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056934"
+
+[tools.shellcheck."platforms.linux-arm64-musl"]
+checksum = "sha256:12b331c1d2db6b9eb13cfca64306b1b157a86eb69db83023e261eaa7e7c14588"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.linux.aarch64.tar.xz"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056934"
+
+[tools.shellcheck."platforms.linux-x64"]
+checksum = "sha256:8c3be12b05d5c177a04c29e3c78ce89ac86f1595681cab149b65b97c4e227198"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.linux.x86_64.tar.xz"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056942"
+
+[tools.shellcheck."platforms.linux-x64-musl"]
+checksum = "sha256:8c3be12b05d5c177a04c29e3c78ce89ac86f1595681cab149b65b97c4e227198"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.linux.x86_64.tar.xz"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056942"
+
+[tools.shellcheck."platforms.macos-arm64"]
+checksum = "sha256:56affdd8de5527894dca6dc3d7e0a99a873b0f004d7aabc30ae407d3f48b0a79"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.darwin.aarch64.tar.xz"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056932"
+
+[tools.shellcheck."platforms.macos-x64"]
+checksum = "sha256:3c89db4edcab7cf1c27bff178882e0f6f27f7afdf54e859fa041fca10febe4c6"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.darwin.x86_64.tar.xz"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056930"
+
+[tools.shellcheck."platforms.windows-x64"]
+checksum = "sha256:8a4e35ab0b331c85d73567b12f2a444df187f483e5079ceffa6bda1faa2e740e"
+url = "https://github.com/koalaman/shellcheck/releases/download/v0.11.0/shellcheck-v0.11.0.zip"
+url_api = "https://api.github.com/repos/koalaman/shellcheck/releases/assets/279056944"
+
+[[tools.shfmt]]
+version = "3.13.1"
+backend = "aqua:mvdan/sh"
+
+[tools.shfmt."platforms.linux-arm64"]
+checksum = "sha256:32d92acaa5cd8abb29fc49dac123dc412442d5713967819d8af2c29f1b3857c7"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_arm64"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322859"
+
+[tools.shfmt."platforms.linux-arm64-musl"]
+checksum = "sha256:32d92acaa5cd8abb29fc49dac123dc412442d5713967819d8af2c29f1b3857c7"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_arm64"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322859"
+
+[tools.shfmt."platforms.linux-x64"]
+checksum = "sha256:fb096c5d1ac6beabbdbaa2874d025badb03ee07929f0c9ff67563ce8c75398b1"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_amd64"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322866"
+
+[tools.shfmt."platforms.linux-x64-musl"]
+checksum = "sha256:fb096c5d1ac6beabbdbaa2874d025badb03ee07929f0c9ff67563ce8c75398b1"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_linux_amd64"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322866"
+
+[tools.shfmt."platforms.macos-arm64"]
+checksum = "sha256:9680526be4a66ea1ffe988ed08af58e1400fe1e4f4aef5bd88b20bb9b3da33f8"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_darwin_arm64"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322881"
+
+[tools.shfmt."platforms.macos-x64"]
+checksum = "sha256:6feedafc72915794163114f512348e2437d080d0047ef8b8fa2ec63b575f12af"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_darwin_amd64"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322886"
+
+[tools.shfmt."platforms.windows-x64"]
+checksum = "sha256:60cd368533d0ad73fa86d93d5bbf95ef40587245ce684ed138c1b31557b5fe97"
+url = "https://github.com/mvdan/sh/releases/download/v3.13.1/shfmt_v3.13.1_windows_amd64.exe"
+url_api = "https://api.github.com/repos/mvdan/sh/releases/assets/390322844"
+
+[[tools.taplo]]
+version = "0.10.0"
+backend = "aqua:tamasfe/taplo"
+
+[tools.taplo."platforms.linux-arm64"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-linux-aarch64.gz"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257322597"
+
+[tools.taplo."platforms.linux-arm64-musl"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-linux-aarch64.gz"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257322597"
+
+[tools.taplo."platforms.linux-x64"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-linux-x86_64.gz"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257322600"
+
+[tools.taplo."platforms.linux-x64-musl"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-linux-x86_64.gz"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257322600"
+
+[tools.taplo."platforms.macos-arm64"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-darwin-aarch64.gz"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257323110"
+
+[tools.taplo."platforms.macos-x64"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-darwin-x86_64.gz"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257323116"
+
+[tools.taplo."platforms.windows-x64"]
+url = "https://github.com/tamasfe/taplo/releases/download/0.10.0/taplo-windows-x86_64.zip"
+url_api = "https://api.github.com/repos/tamasfe/taplo/releases/assets/257323062"
+
+[[tools.typos]]
+version = "1.49.0"
+backend = "aqua:crate-ci/typos"
+
+[tools.typos."platforms.linux-arm64"]
+checksum = "sha256:85c8b87b22a0fb1da130cd4d495e0beba7f1225eb580933184509e146ec4c509"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500258983"
+
+[tools.typos."platforms.linux-arm64-musl"]
+checksum = "sha256:85c8b87b22a0fb1da130cd4d495e0beba7f1225eb580933184509e146ec4c509"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-aarch64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500258983"
+
+[tools.typos."platforms.linux-x64"]
+checksum = "sha256:48bd2d58e02ce713b8c0f1aa239e68ee4f7d8c551013135806e6aed3938d9e10"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500261019"
+
+[tools.typos."platforms.linux-x64-musl"]
+checksum = "sha256:48bd2d58e02ce713b8c0f1aa239e68ee4f7d8c551013135806e6aed3938d9e10"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-x86_64-unknown-linux-musl.tar.gz"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500261019"
+
+[tools.typos."platforms.macos-arm64"]
+checksum = "sha256:8c0e7bd40b2b60c0b0cfe9f74dd814b4d4385c956ce86860f7da9e62d91fdc73"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500262463"
+
+[tools.typos."platforms.macos-x64"]
+checksum = "sha256:4cecbf653a9fc45f023abf57f4e2e2f6b138c2d2387b09289beacdd3f0ea7bfd"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-x86_64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500259181"
+
+[tools.typos."platforms.windows-x64"]
+checksum = "sha256:06d3a1b71c282e021671070696a72696d5c60ea485b47dc4f8f1fbcf90144d02"
+url = "https://github.com/crate-ci/typos/releases/download/v1.49.0/typos-v1.49.0-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/crate-ci/typos/releases/assets/500264256"
+
+[[tools.zizmor]]
+version = "1.29.0"
+backend = "aqua:zizmorcore/zizmor"
+
+[tools.zizmor."platforms.linux-arm64"]
+checksum = "sha256:415eaa7c0a06479a701b8e44a3e812c1047decc848ec4bede7bd6bbf49f22d20"
+url = "https://github.com/zizmorcore/zizmor/releases/download/v1.29.0/zizmor-aarch64-unknown-linux-gnu.tar.gz"
+url_api = "https://api.github.com/repos/zizmorcore/zizmor/releases/assets/498263143"
+provenance = "github-attestations"
+
+[tools.zizmor."platforms.linux-arm64-musl"]
+provenance = "github-attestations"
+
+[tools.zizmor."platforms.linux-x64"]
+checksum = "sha256:dd96df044a6e8538d5f423790f453bdd03d49e5b2bcc38214acc41a2f1297839"
+url = "https://github.com/zizmorcore/zizmor/releases/download/v1.29.0/zizmor-x86_64-unknown-linux-gnu.tar.gz"
+url_api = "https://api.github.com/repos/zizmorcore/zizmor/releases/assets/498263145"
+provenance = "github-attestations"
+
+[tools.zizmor."platforms.linux-x64-musl"]
+provenance = "github-attestations"
+
+[tools.zizmor."platforms.macos-arm64"]
+checksum = "sha256:720322fade9e83a9c7953944c438f2ba942636b86b96a8f0e6b15ce94c8a6b6f"
+url = "https://github.com/zizmorcore/zizmor/releases/download/v1.29.0/zizmor-aarch64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/zizmorcore/zizmor/releases/assets/498263141"
+provenance = "github-attestations"
+
+[tools.zizmor."platforms.macos-x64"]
+checksum = "sha256:648b72ab9941a7f2a8d65d7b68a8e76cef789538c8df3a3950384d38423375b0"
+url = "https://github.com/zizmorcore/zizmor/releases/download/v1.29.0/zizmor-x86_64-apple-darwin.tar.gz"
+url_api = "https://api.github.com/repos/zizmorcore/zizmor/releases/assets/498263144"
+provenance = "github-attestations"
+
+[tools.zizmor."platforms.windows-x64"]
+checksum = "sha256:68a6bc6888f10bf0d53658c75885e7c1b7a0588d4c1fbc3f0ca280ad7324bf06"
+url = "https://github.com/zizmorcore/zizmor/releases/download/v1.29.0/zizmor-x86_64-pc-windows-msvc.zip"
+url_api = "https://api.github.com/repos/zizmorcore/zizmor/releases/assets/498263142"
+provenance = "github-attestations"
diff --git a/mise.native.toml b/mise.native.toml
deleted file mode 100644
index 67ad3940f..000000000
--- a/mise.native.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[tools]
-java = "graalvm-community-24.0.1"
-
-[tasks.test]
-depends = "build"
-run = "../../mvnw test -PnativeTest"
-dir = "integration-tests/it-spring-boot-smoke-test"
-
diff --git a/mise.toml b/mise.toml
index 4acbec4b8..29085c417 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,9 +1,46 @@
+monorepo_root = true
+
+[monorepo]
+config_roots = [".mise/envs/*"]
+
 [tools]
-"go:github.com/gohugoio/hugo" = "v0.152.2"
-"go:github.com/grafana/oats" = "0.4.1"
-java = "temurin-25.0.1+8.0.LTS"
-lychee = "0.21.0"
-protoc = "33.0"
+"aqua:grafana/gcx" = "v1.1.0"
+"aqua:grafana/oats" = "0.10.0"
+hugo = "0.165.0"
+java = "temurin-25.0.3+9.0.LTS"
+node = "24.19.0"
+protoc = "36.0"
+
+# Linters
+actionlint = "1.7.12"
+"aqua:grafana/flint" = "0.22.10"
+"aqua:jonwiggins/xmloxide" = "v0.5.0"
+"aqua:owenlamont/ryl" = "0.21.0"
+biome = "2.5.8"
+checkstyle = "13.8.0"
+editorconfig-checker = "3.11.1"
+google-java-format = "1.36.1"
+lychee = "0.24.2"
+# @yarnpkg/libzip 3.2.2 is npm-signed and matches Yarn's release commit, but
+# was published without provenance; mise's no-downgrade policy otherwise rejects Renovate.
+"npm:renovate" = { version = "44.29.4", trust_policy_excludes = ["@yarnpkg/libzip@3.2.2"] }
+ruff = "0.16.3"
+rumdl = "v0.2.55"
+shellcheck = "v0.11.0"
+shfmt = "3.13.1"
+taplo = "0.10.0"
+typos = "1.49.0"
+zizmor = "1.29.0"
+
+[env]
+FLINT_CONFIG_DIR = ".github/config"
+# renovate: datasource=github-releases depName=grafana/docker-otel-lgtm
+LGTM_VERSION = "0.30.2"
+# Latest JMX Exporter release; used as the default ref for the compatibility job.
+# renovate: datasource=github-tags depName=prometheus/jmx_exporter versioning=semver-coerced
+DEFAULT_JMX_EXPORTER_VERSION = "v1.6.0"
+# renovate: datasource=github-tags depName=micrometer-metrics/micrometer versioning=semver-coerced
+DEFAULT_MICROMETER_VERSION = "v1.17.1"
 
 [tasks.ci]
 description = "CI Build"
@@ -11,29 +48,22 @@ run = "./mvnw clean install"
 env.REQUIRE_PROTO_UP_TO_DATE = "true"
 env.PROTO_GENERATION = "true"
 
-[tasks.format]
-description = "format source code"
-run = "./mvnw spotless:apply"
-
 [tasks.clean]
 description = "clean all modules"
 run = "./mvnw clean"
 
 [tasks.compile]
 description = "bare compile, ignoring formatting and linters"
-run = "./mvnw install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
+run = "./mvnw install -DskipTests -Dcoverage.skip=true -Dwarnings=-nowarn"
 
 [tasks.generate]
-description = "bare compile, ignoring formatting and linters"
-run = [
-  "mise use --pin protoc@latest",
-  "./mvnw clean install -DskipTests -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
-]
+description = "regenerate protobuf sources"
+run = "./mvnw clean install -DskipTests -Dcoverage.skip=true -Dwarnings=-nowarn"
 env.PROTO_GENERATION = "true"
 
 [tasks.test]
 description = "run unit tests, ignoring formatting and linters"
-run = "./mvnw test -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn"
+run = "./mvnw test -Dcoverage.skip=true -Dwarnings=-nowarn"
 
 [tasks.test-all]
 description = "run all tests"
@@ -43,25 +73,42 @@ run = "./mvnw verify"
 description = "build all modules without tests"
 run = "./mvnw install -DskipTests -Dcoverage.skip=true"
 
-[tasks.lint-links]
-description = "Lint markdown links"
-run = "lychee --include-fragments ."
+[tasks."api-diff"]
+description = "Compare published API against the japicmp baseline and refresh docs/apidiffs"
+run = """
+# Baseline version comes from the <api.diff.baseline.version> property in pom.xml.
+# Set API_DIFF_BASELINE_VERSION only to override it ad hoc (e.g. workflow_dispatch).
+BASELINE_OVERRIDE="${API_DIFF_BASELINE_VERSION:+-Dapi.diff.baseline.version=${API_DIFF_BASELINE_VERSION}}"
+./mvnw -B verify \
+  -P 'api-diff,!examples-and-integration-tests' \
+  ${BASELINE_OVERRIDE} \
+  -DskipTests \
+  -Dcoverage.skip=true \
+  -Dwarnings=-nowarn
+./.github/scripts/sync-api-diffs.sh
+"""
 
-[tasks.lint-rest]
-description = "All lints not covered by super linter"
-depends = ["lint-links", "lint-bom"]
+[tasks."lint"]
+description = "Run all lints"
+depends = ["lint:bom"]
+raw_args = true
+run = "flint run"
+
+[tasks."lint:fix"]
+description = "Auto-fix lint issues"
+run = "flint run --fix"
 
 [tasks.acceptance-test]
 description = "Run OATs acceptance tests"
 depends = "build"
-run = "oats -timeout 5m examples/"
+run = "oats --no-cache --lgtm-version $LGTM_VERSION --timeout 5m ."
 
 [tasks.javadoc]
 description = "Generate Javadoc"
 run = [
   "./mvnw -B clean compile javadoc:javadoc javadoc:aggregate -P 'javadoc,!default'",
   "rm -rf ./docs/static/api",
-  "mv ./target/reports/apidocs ./docs/static/api && echo && echo 'ls ./docs/static/api' && ls ./docs/static/api"
+  "mv ./target/reports/apidocs ./docs/static/api && echo && echo 'ls ./docs/static/api' && ls ./docs/static/api",
 ]
 
 [tasks.gh-pages-dev]
@@ -75,7 +122,25 @@ depends = ["javadoc", "set-release-version-github-pages"]
 # For maximum backward compatibility with Hugo modules
 env = { HUGO_ENVIRONMENT = "production", HUGO_ENV = "production" }
 dir = "docs"
-run = [
-  "hugo --gc --minify --baseURL ${BASE_URL}/",
-  "echo 'ls ./public/api' && ls ./public/api"
-]
+run = ["hugo --gc --minify --baseURL ${BASE_URL}/", "echo 'ls ./public/api' && ls ./public/api"]
+
+[tasks."benchmark:quick"]
+description = "Run benchmarks with reduced iterations (quick smoke test, ~10 min)"
+run = "python3 ./.mise/tasks/update_benchmarks.py --jmh-args '-f 1 -wi 1 -i 3 -prof gc'"
+
+[tasks."benchmark:ci"]
+description = "Run benchmarks with CI configuration (3 forks, 3 warmup, 5 measurement iterations (~60 min total)"
+run = "python3 ./.mise/tasks/update_benchmarks.py --jmh-args '-f 3 -wi 3 -i 5 -prof gc'"
+
+[tasks."benchmark:ci-json"]
+description = "Run benchmarks with CI configuration and JSON output (for workflow/testing)"
+run = """
+./mvnw -pl benchmarks -am -DskipTests clean package
+JMH_ARGS="${JMH_ARGS:--f 3 -wi 3 -i 5}"
+echo "Running benchmarks with args: $JMH_ARGS"
+java -jar ./benchmarks/target/benchmarks.jar -rf json -rff benchmark-results.json $JMH_ARGS -prof gc
+"""
+
+[tasks."benchmark:generate-summary"]
+description = "Generate summary from existing benchmark-results.json"
+run = "python3 ./.mise/tasks/generate_benchmark_summary.py"
diff --git a/oats-config.yaml b/oats-config.yaml
new file mode 100644
index 000000000..d23490ffb
--- /dev/null
+++ b/oats-config.yaml
@@ -0,0 +1,6 @@
+meta:
+  version: 3
+
+cases:
+  - examples/example-exporter-opentelemetry/oats-tests/http/oats-case.yaml
+  - examples/example-exporter-opentelemetry/oats-tests/agent/oats-case.yaml
diff --git a/pom.xml b/pom.xml
index bd8c82d41..53781fb59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java_parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
     <relativePath>prometheus-metrics-parent/pom.xml</relativePath>
   </parent>
 
-  <version>1.5.0-SNAPSHOT</version>
   <artifactId>client_java</artifactId>
 
   <name>Prometheus Metrics Library</name>
@@ -23,21 +20,26 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <automatic.module.name>--module-name-need-to-be-overridden--</automatic.module.name>
-    <protobuf-java.version>4.33.0</protobuf-java.version>
-    <guava.version>33.5.0-jre</guava.version>
-    <junit-jupiter.version>6.0.1</junit-jupiter.version>
-    <otel.instrumentation.version>2.16.0-alpha</otel.instrumentation.version>
+    <protobuf-java.version>4.36.0</protobuf-java.version>
+    <guava.version>33.7.1-jre</guava.version>
+    <junit-pioneer.version>2.3.0</junit-pioneer.version>
+    <awaitility.version>4.3.0</awaitility.version>
+    <wiremock.version>3.13.2</wiremock.version>
+    <junit-jupiter.version>6.1.3</junit-jupiter.version>
+    <otel.instrumentation.version>2.31.0-alpha</otel.instrumentation.version>
     <java.version>8</java.version>
+    <test.java.version>25</test.java.version>
+    <!-- Bumped by .github/workflows/bump-api-diff-baseline.yml after each release. -->
+    <api.diff.baseline.version>1.8.0</api.diff.baseline.version>
     <jacoco.line-coverage>0.70</jacoco.line-coverage>
-    <checkstyle.skip>false</checkstyle.skip>
     <coverage.skip>false</coverage.skip>
-    <spotless.skip>false</spotless.skip>
     <javadoc.skip>false</javadoc.skip>
     <warnings>-Werror</warnings>
   </properties>
 
   <modules>
     <module>prometheus-metrics-parent</module>
+    <module>prometheus-metrics-annotations</module>
     <module>prometheus-metrics-bom</module>
     <module>prometheus-metrics-core</module>
     <module>prometheus-metrics-config</module>
@@ -60,6 +62,7 @@
     <module>prometheus-metrics-instrumentation-dropwizard</module>
     <module>prometheus-metrics-instrumentation-guava</module>
     <module>prometheus-metrics-simpleclient-bridge</module>
+    <module>prometheus-metrics-otel-support</module>
   </modules>
 
   <dependencies>
@@ -69,6 +72,37 @@
       <version>3.0.2</version>
       <scope>provided</scope>
     </dependency>
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${junit-jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>5.23.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.27.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>2.0.18</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -82,19 +116,19 @@
         </plugin>
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
+          <version>3.5.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.14.1</version>
+          <version>3.15.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.5.4</version>
+          <version>3.5.6</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.4.2</version>
+          <version>3.5.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
@@ -106,20 +140,20 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.21.0</version>
+          <version>3.22.0</version>
         </plugin>
         <!-- Plugins with groupId org.apache.maven.plugins that are not part of default bindings. -->
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.6.1</version>
+          <version>3.6.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.5.4</version>
+          <version>3.5.6</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>3.9.0</version>
+          <version>3.11.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
@@ -127,7 +161,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.6.2</version>
+          <version>3.6.3</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -137,42 +171,27 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>3.6.2</version>
+          <version>3.6.3</version>
+        </plugin>
+        <plugin>
+          <groupId>com.github.siom79.japicmp</groupId>
+          <artifactId>japicmp-maven-plugin</artifactId>
+          <version>0.26.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.6.0</version>
-        <configuration>
-          <consoleOutput>true</consoleOutput>
-          <configLocation>google_checks.xml</configLocation>
-          <configLocation>checkstyle.xml</configLocation>
-          <violationSeverity>warning</violationSeverity>
-          <failOnViolation>true</failOnViolation>
-          <skip>${checkstyle.skip}</skip>
-          <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
-          <excludes>**/generated/**,**/jmh_generated/*</excludes>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.14</version>
+        <version>0.8.15</version>
         <configuration>
           <skip>${coverage.skip}</skip>
           <excludes>
             <exclude>**/generated/**</exclude>
             <exclude>**/*BlockingRejectedExecutionHandler*</exclude>
+            <exclude>**/*AllocationCountingNotificationListener*</exclude>
+            <exclude>**/*MapperConfig*</exclude>
           </excludes>
         </configuration>
         <executions>
@@ -203,6 +222,11 @@
                       <value>COVEREDRATIO</value>
                       <minimum>${jacoco.line-coverage}</minimum>
                     </limit>
+                    <limit>
+                      <counter>BRANCH</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>0.50</minimum>
+                    </limit>
                   </limits>
                 </rule>
               </rules>
@@ -234,7 +258,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -252,62 +276,62 @@
           <release>${java.version}</release>
           <source>${java.version}</source>
           <target>${java.version}</target>
-          <testRelease>25</testRelease>
-          <testSource>25</testSource>
-          <testTarget>25</testTarget>
+          <testRelease>${test.java.version}</testRelease>
+          <testSource>${test.java.version}</testSource>
+          <testTarget>${test.java.version}</testTarget>
           <showWarnings>true</showWarnings>
           <compilerArgs>
             <arg>-Xlint:all,-serial,-processing,-options</arg>
             <arg>${warnings}</arg>
             <arg>--should-stop=ifError=FLOW</arg>
             <arg>-XDcompilePolicy=simple</arg>
-            <arg>
-              -Xplugin:ErrorProne
-              -Xep:AlmostJavadoc:OFF
-              -Xep:MissingSummary:OFF
-              -Xep:LongDoubleConversion:OFF
-              -Xep:StringSplitter:OFF
-              -XepExcludedPaths:(.*/generated/.*|.*/src/test/java/.*|.*/examples/.*|.*/integration-tests/.*)
-              -XepOpt:NullAway:AnnotatedPackages=io.prometheus.metrics
-            </arg>
           </compilerArgs>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.44.0</version>
-            </path>
-            <path>
-              <groupId>com.uber.nullaway</groupId>
-              <artifactId>nullaway</artifactId>
-              <version>0.12.12</version>
-            </path>
-            <!-- Other annotation processors go here.
-
-            If 'annotationProcessorPaths' is set, processors will no longer be
-            discovered on the regular -classpath; see also 'Using Error Prone
-            together with other annotation processors' below. -->
-          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>versions-maven-plugin</artifactId>
-        <version>2.19.1</version>
+        <version>2.21.0</version>
         <configuration>
           <rulesUri>file://${project.basedir}/version-rules.xml</rulesUri>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <skip>${javadoc.skip}</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit-jupiter.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry.instrumentation</groupId>
+        <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
+        <version>${otel.instrumentation.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-proto</artifactId>
+        <version>1.7.1-alpha</version>
+        <scope>test</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <reporting>
     <plugins>
-      <plugin>
-        <!-- maven-site-plugin 3.3 requires maven-project-info-reports-plugin < 3.0 -->
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.9.0</version>
-      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <reportSets>
@@ -331,102 +355,15 @@
 
   <profiles>
     <profile>
-      <id>default</id>
+      <id>examples-and-integration-tests</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
+        <jdk>[25,)</jdk>
       </activation>
       <modules>
         <module>examples</module>
         <module>benchmarks</module>
         <module>integration-tests</module>
       </modules>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.junit</groupId>
-            <artifactId>junit-bom</artifactId>
-            <version>${junit-jupiter.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-          <dependency>
-            <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
-            <version>${otel.instrumentation.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-          <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-proto</artifactId>
-            <version>1.7.1-alpha</version>
-            <scope>test</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-      <dependencies>
-        <!-- test dependencies -->
-        <dependency>
-          <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter</artifactId>
-          <version>${junit-jupiter.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.junit.jupiter</groupId>
-          <artifactId>junit-jupiter-params</artifactId>
-          <version>${junit-jupiter.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-core</artifactId>
-          <version>5.20.0</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.assertj</groupId>
-          <artifactId>assertj-core</artifactId>
-          <version>3.27.6</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-          <version>${guava.version}</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-simple</artifactId>
-          <version>2.0.17</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.junit-pioneer</groupId>
-          <artifactId>junit-pioneer</artifactId>
-          <version>2.3.0</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.awaitility</groupId>
-          <artifactId>awaitility</artifactId>
-          <version>4.3.0</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.wiremock</groupId>
-          <artifactId>wiremock</artifactId>
-          <version>3.13.1</version>
-          <scope>test</scope>
-          <exclusions>
-            <exclusion>
-              <groupId>org.hamcrest</groupId>
-              <artifactId>hamcrest-core</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>
-      </dependencies>
     </profile>
     <profile>
       <id>javadoc</id>
@@ -435,6 +372,7 @@
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
+              <skip>${javadoc.skip}</skip>
               <encoding>UTF-8</encoding>
               <docencoding>UTF-8</docencoding>
               <linksource>true</linksource>
@@ -448,6 +386,110 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>api-diff</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.github.siom79.japicmp</groupId>
+            <artifactId>japicmp-maven-plugin</artifactId>
+            <configuration>
+              <oldVersion>
+                <dependency>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${api.diff.baseline.version}</version>
+                  <type>jar</type>
+                </dependency>
+              </oldVersion>
+              <newVersion>
+                <file>
+                  <path>${project.build.directory}/${project.build.finalName}.jar</path>
+                </file>
+              </newVersion>
+              <parameter>
+                <accessModifier>public</accessModifier>
+                <onlyModified>true</onlyModified>
+                <includes>
+                  <include>io.prometheus.metrics.annotations.StableApi</include>
+                  <include>@io.prometheus.metrics.annotations.StableApi</include>
+                </includes>
+                <excludes>
+                  <exclude>io.prometheus.metrics.expositionformats.generated</exclude>
+                  <exclude>io.prometheus.metrics.shaded</exclude>
+                </excludes>
+                <breakBuildOnModifications>false</breakBuildOnModifications>
+                <breakBuildOnBinaryIncompatibleModifications>
+                  false
+                </breakBuildOnBinaryIncompatibleModifications>
+                <breakBuildOnSourceIncompatibleModifications>
+                  false
+                </breakBuildOnSourceIncompatibleModifications>
+                <breakBuildBasedOnSemanticVersioning>false</breakBuildBasedOnSemanticVersioning>
+                <ignoreMissingClasses>true</ignoreMissingClasses>
+                <ignoreMissingOldVersion>true</ignoreMissingOldVersion>
+                <ignoreMissingOptionalDependency>true</ignoreMissingOptionalDependency>
+                <skipPomModules>true</skipPomModules>
+                <skipHtmlReport>true</skipHtmlReport>
+                <reportOnlyFilename>true</reportOnlyFilename>
+                <packagingSupporteds>
+                  <packagingSupported>bundle</packagingSupported>
+                  <packagingSupported>jar</packagingSupported>
+                </packagingSupporteds>
+              </parameter>
+            </configuration>
+            <executions>
+              <execution>
+                <id>api-diff</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>cmp</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>errorprone</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <compilerArgs combine.children="append">
+                <arg>-XDaddTypeAnnotationsToSymbol=true</arg>
+                <arg>
+                  -Xplugin:ErrorProne
+                  -Xep:AlmostJavadoc:OFF
+                  -Xep:MissingSummary:OFF
+                  -Xep:LongDoubleConversion:OFF
+                  -Xep:StringSplitter:OFF
+                  -XepExcludedPaths:(.*/generated/.*|.*/src/test/java/.*|.*/examples/.*|.*/integration-tests/.*)
+                  -XepOpt:NullAway:AnnotatedPackages=io.prometheus.metrics
+                </arg>
+              </compilerArgs>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>com.google.errorprone</groupId>
+                  <artifactId>error_prone_core</artifactId>
+                  <version>2.50.0</version>
+                </path>
+                <path>
+                  <groupId>com.uber.nullaway</groupId>
+                  <artifactId>nullaway</artifactId>
+                  <version>0.13.8</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>release</id>
       <build>
diff --git a/prometheus-metrics-annotations/pom.xml b/prometheus-metrics-annotations/pom.xml
new file mode 100644
index 000000000..3552a8ddb
--- /dev/null
+++ b/prometheus-metrics-annotations/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.prometheus</groupId>
+    <artifactId>client_java</artifactId>
+    <version>1.8.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>prometheus-metrics-annotations</artifactId>
+  <packaging>bundle</packaging>
+
+  <name>Prometheus Metrics Annotations</name>
+  <description>
+    Annotations for Prometheus Metrics library API contracts.
+  </description>
+
+  <properties>
+    <automatic.module.name>io.prometheus.metrics.annotations</automatic.module.name>
+  </properties>
+</project>
diff --git a/prometheus-metrics-annotations/src/main/java/io/prometheus/metrics/annotations/StableApi.java b/prometheus-metrics-annotations/src/main/java/io/prometheus/metrics/annotations/StableApi.java
new file mode 100644
index 000000000..a3bfe89ae
--- /dev/null
+++ b/prometheus-metrics-annotations/src/main/java/io/prometheus/metrics/annotations/StableApi.java
@@ -0,0 +1,22 @@
+package io.prometheus.metrics.annotations;
+
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a Java element as part of the stable, published Prometheus Metrics API.
+ *
+ * <p>Use this on public or protected types to publish the type and its members. Use it on
+ * individual constructors, methods, and fields when only part of a public type is stable.
+ */
+@Documented
+@Retention(CLASS)
+@Target({TYPE, CONSTRUCTOR, METHOD, FIELD})
+public @interface StableApi {}
diff --git a/prometheus-metrics-bom/pom.xml b/prometheus-metrics-bom/pom.xml
index a13398228..c2c9935f7 100644
--- a/prometheus-metrics-bom/pom.xml
+++ b/prometheus-metrics-bom/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java_parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
     <relativePath>../prometheus-metrics-parent/pom.xml</relativePath>
   </parent>
 
@@ -18,12 +17,13 @@
     Bill of Materials for the Prometheus Metrics library
   </description>
 
-  <properties>
-    <spotless.skip>true</spotless.skip>
-  </properties>
-
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-annotations</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>io.prometheus</groupId>
         <artifactId>prometheus-metrics-config</artifactId>
@@ -119,6 +119,12 @@
         <artifactId>prometheus-metrics-model</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.prometheus</groupId>
+        <artifactId>prometheus-metrics-otel-support</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+      </dependency>
       <dependency>
         <groupId>io.prometheus</groupId>
         <artifactId>prometheus-metrics-simpleclient-bridge</artifactId>
diff --git a/prometheus-metrics-config/pom.xml b/prometheus-metrics-config/pom.xml
index a07c83f0b..681f4a557 100644
--- a/prometheus-metrics-config/pom.xml
+++ b/prometheus-metrics-config/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-config</artifactId>
@@ -21,4 +20,19 @@
     <automatic.module.name>io.prometheus.metrics.config</automatic.module.name>
   </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.junit-pioneer</groupId>
+      <artifactId>junit-pioneer</artifactId>
+      <version>${junit-pioneer.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/EscapingScheme.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/EscapingScheme.java
index 1cd037bf3..1d6bd37cf 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/EscapingScheme.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/EscapingScheme.java
@@ -1,7 +1,9 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
+@StableApi
 public enum EscapingScheme {
   /** NO_ESCAPING indicates that a name will not be escaped. */
   ALLOW_UTF8("allow-utf-8"),
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExemplarsProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExemplarsProperties.java
index 20933bfdc..93190ef19 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExemplarsProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExemplarsProperties.java
@@ -1,15 +1,16 @@
 package io.prometheus.metrics.config;
 
-import java.util.Map;
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
 /** Properties starting with io.prometheus.exemplars */
+@StableApi
 public class ExemplarsProperties {
 
   private static final String PREFIX = "io.prometheus.exemplars";
-  private static final String MIN_RETENTION_PERIOD_SECONDS = "minRetentionPeriodSeconds";
-  private static final String MAX_RETENTION_PERIOD_SECONDS = "maxRetentionPeriodSeconds";
-  private static final String SAMPLE_INTERVAL_MILLISECONDS = "sampleIntervalMilliseconds";
+  private static final String MIN_RETENTION_PERIOD_SECONDS = "min_retention_period_seconds";
+  private static final String MAX_RETENTION_PERIOD_SECONDS = "max_retention_period_seconds";
+  private static final String SAMPLE_INTERVAL_MILLISECONDS = "sample_interval_milliseconds";
 
   @Nullable private final Integer minRetentionPeriodSeconds;
   @Nullable private final Integer maxRetentionPeriodSeconds;
@@ -57,17 +58,17 @@ public Integer getSampleIntervalMilliseconds() {
   }
 
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
    */
-  static ExemplarsProperties load(Map<Object, Object> properties)
+  static ExemplarsProperties load(PropertySource propertySource)
       throws PrometheusPropertiesException {
     Integer minRetentionPeriodSeconds =
-        Util.loadInteger(PREFIX + "." + MIN_RETENTION_PERIOD_SECONDS, properties);
+        Util.loadInteger(PREFIX, MIN_RETENTION_PERIOD_SECONDS, propertySource);
     Integer maxRetentionPeriodSeconds =
-        Util.loadInteger(PREFIX + "." + MAX_RETENTION_PERIOD_SECONDS, properties);
+        Util.loadInteger(PREFIX, MAX_RETENTION_PERIOD_SECONDS, propertySource);
     Integer sampleIntervalMilliseconds =
-        Util.loadInteger(PREFIX + "." + SAMPLE_INTERVAL_MILLISECONDS, properties);
+        Util.loadInteger(PREFIX, SAMPLE_INTERVAL_MILLISECONDS, propertySource);
 
     Util.assertValue(
         minRetentionPeriodSeconds,
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterFilterProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterFilterProperties.java
index 7f3b46842..999c2c8e8 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterFilterProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterFilterProperties.java
@@ -1,19 +1,20 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Nullable;
 
 /** Properties starting with io.prometheus.exporter.filter */
+@StableApi
 public class ExporterFilterProperties {
 
-  public static final String METRIC_NAME_MUST_BE_EQUAL_TO = "metricNameMustBeEqualTo";
-  public static final String METRIC_NAME_MUST_NOT_BE_EQUAL_TO = "metricNameMustNotBeEqualTo";
-  public static final String METRIC_NAME_MUST_START_WITH = "metricNameMustStartWith";
-  public static final String METRIC_NAME_MUST_NOT_START_WITH = "metricNameMustNotStartWith";
+  public static final String METRIC_NAME_MUST_BE_EQUAL_TO = "metric_name_must_be_equal_to";
+  public static final String METRIC_NAME_MUST_NOT_BE_EQUAL_TO = "metric_name_must_not_be_equal_to";
+  public static final String METRIC_NAME_MUST_START_WITH = "metric_name_must_start_with";
+  public static final String METRIC_NAME_MUST_NOT_START_WITH = "metric_name_must_not_start_with";
   private static final String PREFIX = "io.prometheus.exporter.filter";
 
   @Nullable private final List<String> allowedNames;
@@ -61,19 +62,19 @@ public List<String> getExcludedMetricNamePrefixes() {
   }
 
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
    */
-  static ExporterFilterProperties load(Map<Object, Object> properties)
+  static ExporterFilterProperties load(PropertySource propertySource)
       throws PrometheusPropertiesException {
     List<String> allowedNames =
-        Util.loadStringList(PREFIX + "." + METRIC_NAME_MUST_BE_EQUAL_TO, properties);
+        Util.loadStringList(PREFIX, METRIC_NAME_MUST_BE_EQUAL_TO, propertySource);
     List<String> excludedNames =
-        Util.loadStringList(PREFIX + "." + METRIC_NAME_MUST_NOT_BE_EQUAL_TO, properties);
+        Util.loadStringList(PREFIX, METRIC_NAME_MUST_NOT_BE_EQUAL_TO, propertySource);
     List<String> allowedPrefixes =
-        Util.loadStringList(PREFIX + "." + METRIC_NAME_MUST_START_WITH, properties);
+        Util.loadStringList(PREFIX, METRIC_NAME_MUST_START_WITH, propertySource);
     List<String> excludedPrefixes =
-        Util.loadStringList(PREFIX + "." + METRIC_NAME_MUST_NOT_START_WITH, properties);
+        Util.loadStringList(PREFIX, METRIC_NAME_MUST_NOT_START_WITH, propertySource);
     return new ExporterFilterProperties(
         allowedNames, excludedNames, allowedPrefixes, excludedPrefixes);
   }
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterHttpServerProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterHttpServerProperties.java
index 55c15a60c..4f921c2ac 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterHttpServerProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterHttpServerProperties.java
@@ -1,17 +1,21 @@
 package io.prometheus.metrics.config;
 
-import java.util.Map;
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
-/** Properties starting with io.prometheus.exporter.httpServer */
+/** Properties starting with io.prometheus.exporter.http_server */
+@StableApi
 public class ExporterHttpServerProperties {
 
   private static final String PORT = "port";
-  private static final String PREFIX = "io.prometheus.exporter.httpServer";
+  private static final String PREFER_UNCOMPRESSED_RESPONSE = "prefer_uncompressed_response";
+  private static final String PREFIX = "io.prometheus.exporter.http_server";
   @Nullable private final Integer port;
+  private final boolean preferUncompressedResponse;
 
-  private ExporterHttpServerProperties(@Nullable Integer port) {
+  private ExporterHttpServerProperties(@Nullable Integer port, boolean preferUncompressedResponse) {
     this.port = port;
+    this.preferUncompressedResponse = preferUncompressedResponse;
   }
 
   @Nullable
@@ -19,15 +23,24 @@ public Integer getPort() {
     return port;
   }
 
+  public boolean isPreferUncompressedResponse() {
+    return preferUncompressedResponse;
+  }
+
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
    */
-  static ExporterHttpServerProperties load(Map<Object, Object> properties)
+  static ExporterHttpServerProperties load(PropertySource propertySource)
       throws PrometheusPropertiesException {
-    Integer port = Util.loadInteger(PREFIX + "." + PORT, properties);
+    Integer port = Util.loadInteger(PREFIX, PORT, propertySource);
     Util.assertValue(port, t -> t > 0, "Expecting value > 0.", PREFIX, PORT);
-    return new ExporterHttpServerProperties(port);
+
+    Boolean preferUncompressedResponse =
+        Util.loadBoolean(PREFIX, PREFER_UNCOMPRESSED_RESPONSE, propertySource);
+
+    return new ExporterHttpServerProperties(
+        port, preferUncompressedResponse != null && preferUncompressedResponse);
   }
 
   public static Builder builder() {
@@ -37,6 +50,7 @@ public static Builder builder() {
   public static class Builder {
 
     @Nullable private Integer port;
+    private boolean preferUncompressedResponse = false;
 
     private Builder() {}
 
@@ -45,8 +59,13 @@ public Builder port(int port) {
       return this;
     }
 
+    public Builder preferUncompressedResponse(boolean preferUncompressedResponse) {
+      this.preferUncompressedResponse = preferUncompressedResponse;
+      return this;
+    }
+
     public ExporterHttpServerProperties build() {
-      return new ExporterHttpServerProperties(port);
+      return new ExporterHttpServerProperties(port, preferUncompressedResponse);
     }
   }
 }
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterOpenTelemetryProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterOpenTelemetryProperties.java
index be09b5a63..8c0bdd5c7 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterOpenTelemetryProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterOpenTelemetryProperties.java
@@ -1,10 +1,38 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nullable;
 
-// TODO: JavaDoc is currently only in OpenTelemetryExporter.Builder. Look there for reference.
+/**
+ * Properties for configuring the OpenTelemetry exporter.
+ *
+ * <p>These properties can be configured via {@code prometheus.properties}, system properties, or
+ * programmatically.
+ *
+ * <p>All properties are prefixed with {@code io.prometheus.exporter.opentelemetry}.
+ *
+ * <p>Available properties:
+ *
+ * <ul>
+ *   <li>{@code protocol} - OTLP protocol: {@code "grpc"} or {@code "http/protobuf"}
+ *   <li>{@code endpoint} - OTLP endpoint URL
+ *   <li>{@code headers} - HTTP headers for outgoing requests
+ *   <li>{@code intervalSeconds} - Export interval in seconds
+ *   <li>{@code timeoutSeconds} - Request timeout in seconds
+ *   <li>{@code serviceName} - Service name resource attribute
+ *   <li>{@code serviceNamespace} - Service namespace resource attribute
+ *   <li>{@code serviceInstanceId} - Service instance ID resource attribute
+ *   <li>{@code serviceVersion} - Service version resource attribute
+ *   <li>{@code resourceAttributes} - Additional resource attributes
+ * </ul>
+ *
+ * @see <a
+ *     href="https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/">OpenTelemetry
+ *     SDK Environment Variables</a>
+ */
+@StableApi
 public class ExporterOpenTelemetryProperties {
 
   // See
@@ -12,14 +40,15 @@ public class ExporterOpenTelemetryProperties {
   private static final String PROTOCOL = "protocol"; // otel.exporter.otlp.protocol
   private static final String ENDPOINT = "endpoint"; // otel.exporter.otlp.endpoint
   private static final String HEADERS = "headers"; // otel.exporter.otlp.headers
-  private static final String INTERVAL_SECONDS = "intervalSeconds"; // otel.metric.export.interval
-  private static final String TIMEOUT_SECONDS = "timeoutSeconds"; // otel.exporter.otlp.timeout
-  private static final String SERVICE_NAME = "serviceName"; // otel.service.name
-  private static final String SERVICE_NAMESPACE = "serviceNamespace";
-  private static final String SERVICE_INSTANCE_ID = "serviceInstanceId";
-  private static final String SERVICE_VERSION = "serviceVersion";
+  private static final String INTERVAL_SECONDS = "interval_seconds"; // otel.metric.export.interval
+  private static final String TIMEOUT_SECONDS = "timeout_seconds"; // otel.exporter.otlp.timeout
+  private static final String SERVICE_NAME = "service_name"; // otel.service.name
+  private static final String SERVICE_NAMESPACE = "service_namespace";
+  private static final String SERVICE_INSTANCE_ID = "service_instance_id";
+  private static final String SERVICE_VERSION = "service_version";
   private static final String RESOURCE_ATTRIBUTES =
-      "resourceAttributes"; // otel.resource.attributes
+      "resource_attributes"; // otel.resource.attributes
+  private static final String PRESERVE_NAMES = "preserve_names";
   private static final String PREFIX = "io.prometheus.exporter.opentelemetry";
 
   @Nullable private final String endpoint;
@@ -32,6 +61,7 @@ public class ExporterOpenTelemetryProperties {
   @Nullable private final String serviceInstanceId;
   @Nullable private final String serviceVersion;
   private final Map<String, String> resourceAttributes;
+  @Nullable private final Boolean preserveNames;
 
   private ExporterOpenTelemetryProperties(
       @Nullable String protocol,
@@ -43,7 +73,8 @@ private ExporterOpenTelemetryProperties(
       @Nullable String serviceNamespace,
       @Nullable String serviceInstanceId,
       @Nullable String serviceVersion,
-      Map<String, String> resourceAttributes) {
+      Map<String, String> resourceAttributes,
+      @Nullable Boolean preserveNames) {
     this.protocol = protocol;
     this.endpoint = endpoint;
     this.headers = headers;
@@ -54,6 +85,7 @@ private ExporterOpenTelemetryProperties(
     this.serviceInstanceId = serviceInstanceId;
     this.serviceVersion = serviceVersion;
     this.resourceAttributes = resourceAttributes;
+    this.preserveNames = preserveNames;
   }
 
   @Nullable
@@ -105,22 +137,33 @@ public Map<String, String> getResourceAttributes() {
   }
 
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * When {@code true}, metric names are preserved as-is (including suffixes like {@code _total}).
+   * When {@code false} (default), standard OTel name normalization is applied (stripping unit
+   * suffix).
    */
-  static ExporterOpenTelemetryProperties load(Map<Object, Object> properties)
+  @Nullable
+  public Boolean getPreserveNames() {
+    return preserveNames;
+  }
+
+  /**
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
+   */
+  static ExporterOpenTelemetryProperties load(PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String protocol = Util.loadString(PREFIX + "." + PROTOCOL, properties);
-    String endpoint = Util.loadString(PREFIX + "." + ENDPOINT, properties);
-    Map<String, String> headers = Util.loadMap(PREFIX + "." + HEADERS, properties);
-    String interval = Util.loadStringAddSuffix(PREFIX + "." + INTERVAL_SECONDS, properties, "s");
-    String timeout = Util.loadStringAddSuffix(PREFIX + "." + TIMEOUT_SECONDS, properties, "s");
-    String serviceName = Util.loadString(PREFIX + "." + SERVICE_NAME, properties);
-    String serviceNamespace = Util.loadString(PREFIX + "." + SERVICE_NAMESPACE, properties);
-    String serviceInstanceId = Util.loadString(PREFIX + "." + SERVICE_INSTANCE_ID, properties);
-    String serviceVersion = Util.loadString(PREFIX + "." + SERVICE_VERSION, properties);
+    String protocol = Util.loadString(PREFIX, PROTOCOL, propertySource);
+    String endpoint = Util.loadString(PREFIX, ENDPOINT, propertySource);
+    Map<String, String> headers = Util.loadMap(PREFIX, HEADERS, propertySource);
+    String interval = Util.loadStringAddSuffix(PREFIX, INTERVAL_SECONDS, propertySource, "s");
+    String timeout = Util.loadStringAddSuffix(PREFIX, TIMEOUT_SECONDS, propertySource, "s");
+    String serviceName = Util.loadString(PREFIX, SERVICE_NAME, propertySource);
+    String serviceNamespace = Util.loadString(PREFIX, SERVICE_NAMESPACE, propertySource);
+    String serviceInstanceId = Util.loadString(PREFIX, SERVICE_INSTANCE_ID, propertySource);
+    String serviceVersion = Util.loadString(PREFIX, SERVICE_VERSION, propertySource);
     Map<String, String> resourceAttributes =
-        Util.loadMap(PREFIX + "." + RESOURCE_ATTRIBUTES, properties);
+        Util.loadMap(PREFIX, RESOURCE_ATTRIBUTES, propertySource);
+    Boolean preserveNames = Util.loadBoolean(PREFIX, PRESERVE_NAMES, propertySource);
     return new ExporterOpenTelemetryProperties(
         protocol,
         endpoint,
@@ -131,7 +174,8 @@ static ExporterOpenTelemetryProperties load(Map<Object, Object> properties)
         serviceNamespace,
         serviceInstanceId,
         serviceVersion,
-        resourceAttributes);
+        resourceAttributes,
+        preserveNames);
   }
 
   public static Builder builder() {
@@ -150,9 +194,18 @@ public static class Builder {
     @Nullable private String serviceInstanceId;
     @Nullable private String serviceVersion;
     private final Map<String, String> resourceAttributes = new HashMap<>();
+    @Nullable private Boolean preserveNames;
 
     private Builder() {}
 
+    /**
+     * The OTLP protocol to use.
+     *
+     * <p>Supported values: {@code "grpc"} or {@code "http/protobuf"}.
+     *
+     * <p>See OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/#otel_exporter_otlp_protocol">OTEL_EXPORTER_OTLP_PROTOCOL</a>.
+     */
     public Builder protocol(String protocol) {
       if (!protocol.equals("grpc") && !protocol.equals("http/protobuf")) {
         throw new IllegalArgumentException(
@@ -162,17 +215,43 @@ public Builder protocol(String protocol) {
       return this;
     }
 
+    /**
+     * The OTLP endpoint to send metric data to.
+     *
+     * <p>The default depends on the protocol:
+     *
+     * <ul>
+     *   <li>{@code "grpc"}: {@code "http://localhost:4317"}
+     *   <li>{@code "http/protobuf"}: {@code "http://localhost:4318/v1/metrics"}
+     * </ul>
+     *
+     * <p>See OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/#otel_exporter_otlp_metrics_endpoint">OTEL_EXPORTER_OTLP_METRICS_ENDPOINT</a>.
+     */
     public Builder endpoint(String endpoint) {
       this.endpoint = endpoint;
       return this;
     }
 
-    /** Add a request header. Call multiple times to add multiple headers. */
+    /**
+     * Add an HTTP header to be applied to outgoing requests. Call multiple times to add multiple
+     * headers.
+     *
+     * <p>See OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/#otel_exporter_otlp_headers">OTEL_EXPORTER_OTLP_HEADERS</a>.
+     */
     public Builder header(String name, String value) {
       this.headers.put(name, value);
       return this;
     }
 
+    /**
+     * The interval between the start of two export attempts. Default is 60 seconds.
+     *
+     * <p>Like OpenTelemetry's <a
+     * href="https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md#periodic-metric-reader">OTEL_METRIC_EXPORT_INTERVAL</a>
+     * (which defaults to 60000 milliseconds), but specified in seconds rather than milliseconds.
+     */
     public Builder intervalSeconds(int intervalSeconds) {
       if (intervalSeconds <= 0) {
         throw new IllegalArgumentException(intervalSeconds + ": Expecting intervalSeconds > 0");
@@ -181,6 +260,13 @@ public Builder intervalSeconds(int intervalSeconds) {
       return this;
     }
 
+    /**
+     * The timeout for outgoing requests. Default is 10.
+     *
+     * <p>Like OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/concepts/sdk-configuration/otlp-exporter-configuration/#otel_exporter_otlp_metrics_timeout">OTEL_EXPORTER_OTLP_METRICS_TIMEOUT</a>,
+     * but in seconds rather than milliseconds.
+     */
     public Builder timeoutSeconds(int timeoutSeconds) {
       if (timeoutSeconds <= 0) {
         throw new IllegalArgumentException(timeoutSeconds + ": Expecting timeoutSeconds > 0");
@@ -189,31 +275,77 @@ public Builder timeoutSeconds(int timeoutSeconds) {
       return this;
     }
 
+    /**
+     * The {@code service.name} resource attribute.
+     *
+     * <p>If not explicitly specified, {@code client_java} will try to initialize it with a
+     * reasonable default, like the JAR file name.
+     *
+     * <p>See {@code service.name} in OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/specs/otel/resource/semantic_conventions/#service">Resource
+     * Semantic Conventions</a>.
+     */
     public Builder serviceName(String serviceName) {
       this.serviceName = serviceName;
       return this;
     }
 
+    /**
+     * The {@code service.namespace} resource attribute.
+     *
+     * <p>See {@code service.namespace} in OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/specs/otel/resource/semantic_conventions/#service-experimental">Resource
+     * Semantic Conventions</a>.
+     */
     public Builder serviceNamespace(String serviceNamespace) {
       this.serviceNamespace = serviceNamespace;
       return this;
     }
 
+    /**
+     * The {@code service.instance.id} resource attribute.
+     *
+     * <p>See {@code service.instance.id} in OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/specs/otel/resource/semantic_conventions/#service-experimental">Resource
+     * Semantic Conventions</a>.
+     */
     public Builder serviceInstanceId(String serviceInstanceId) {
       this.serviceInstanceId = serviceInstanceId;
       return this;
     }
 
+    /**
+     * The {@code service.version} resource attribute.
+     *
+     * <p>See {@code service.version} in OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/specs/otel/resource/semantic_conventions/#service-experimental">Resource
+     * Semantic Conventions</a>.
+     */
     public Builder serviceVersion(String serviceVersion) {
       this.serviceVersion = serviceVersion;
       return this;
     }
 
+    /**
+     * Add a resource attribute. Call multiple times to add multiple resource attributes.
+     *
+     * <p>See OpenTelemetry's <a
+     * href="https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/#general-sdk-configuration">OTEL_RESOURCE_ATTRIBUTES</a>.
+     */
     public Builder resourceAttribute(String name, String value) {
       this.resourceAttributes.put(name, value);
       return this;
     }
 
+    /**
+     * When {@code true}, metric names are preserved as-is (including suffixes like {@code _total}).
+     * When {@code false} (default), standard OTel name normalization is applied.
+     */
+    public Builder preserveNames(boolean preserveNames) {
+      this.preserveNames = preserveNames;
+      return this;
+    }
+
     public ExporterOpenTelemetryProperties build() {
       return new ExporterOpenTelemetryProperties(
           protocol,
@@ -225,7 +357,8 @@ public ExporterOpenTelemetryProperties build() {
           serviceNamespace,
           serviceInstanceId,
           serviceVersion,
-          resourceAttributes);
+          resourceAttributes,
+          preserveNames);
     }
   }
 }
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterProperties.java
index 6b081816d..a1c67266a 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterProperties.java
@@ -1,15 +1,16 @@
 package io.prometheus.metrics.config;
 
-import java.util.Map;
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
 /** Properties starting with io.prometheus.exporter */
+@StableApi
 public class ExporterProperties {
 
-  private static final String INCLUDE_CREATED_TIMESTAMPS = "includeCreatedTimestamps";
+  private static final String INCLUDE_CREATED_TIMESTAMPS = "include_created_timestamps";
   // milliseconds is the default - we only provide a boolean flag to avoid a breaking change
-  private static final String PROMETHEUS_TIMESTAMPS_IN_MS = "prometheusTimestampsInMs";
-  private static final String EXEMPLARS_ON_ALL_METRIC_TYPES = "exemplarsOnAllMetricTypes";
+  private static final String PROMETHEUS_TIMESTAMPS_IN_MS = "prometheus_timestamps_in_ms";
+  private static final String EXEMPLARS_ON_ALL_METRIC_TYPES = "exemplars_on_all_metric_types";
   private static final String PREFIX = "io.prometheus.exporter";
 
   @Nullable private final Boolean includeCreatedTimestamps;
@@ -44,17 +45,16 @@ public boolean getExemplarsOnAllMetricTypes() {
   }
 
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
    */
-  static ExporterProperties load(Map<Object, Object> properties)
+  static ExporterProperties load(PropertySource propertySource)
       throws PrometheusPropertiesException {
     Boolean includeCreatedTimestamps =
-        Util.loadBoolean(PREFIX + "." + INCLUDE_CREATED_TIMESTAMPS, properties);
-    Boolean timestampsInMs =
-        Util.loadBoolean(PREFIX + "." + PROMETHEUS_TIMESTAMPS_IN_MS, properties);
+        Util.loadBoolean(PREFIX, INCLUDE_CREATED_TIMESTAMPS, propertySource);
+    Boolean timestampsInMs = Util.loadBoolean(PREFIX, PROMETHEUS_TIMESTAMPS_IN_MS, propertySource);
     Boolean exemplarsOnAllMetricTypes =
-        Util.loadBoolean(PREFIX + "." + EXEMPLARS_ON_ALL_METRIC_TYPES, properties);
+        Util.loadBoolean(PREFIX, EXEMPLARS_ON_ALL_METRIC_TYPES, propertySource);
     return new ExporterProperties(
         includeCreatedTimestamps, timestampsInMs, exemplarsOnAllMetricTypes);
   }
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterPushgatewayProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterPushgatewayProperties.java
index bd53f8b76..e97ade191 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterPushgatewayProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/ExporterPushgatewayProperties.java
@@ -1,17 +1,18 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.time.Duration;
-import java.util.Map;
 import javax.annotation.Nullable;
 
+@StableApi
 public class ExporterPushgatewayProperties {
 
   private static final String ADDRESS = "address";
   private static final String JOB = "job";
   private static final String SCHEME = "scheme";
-  private static final String ESCAPING_SCHEME = "escapingScheme";
-  private static final String READ_TIMEOUT = "readTimeoutSeconds";
-  private static final String CONNECT_TIMEOUT = "connectTimeoutSeconds";
+  private static final String ESCAPING_SCHEME = "escaping_scheme";
+  private static final String READ_TIMEOUT = "read_timeout_seconds";
+  private static final String CONNECT_TIMEOUT = "connect_timeout_seconds";
   private static final String PREFIX = "io.prometheus.exporter.pushgateway";
   @Nullable private final String scheme;
   @Nullable private final String address;
@@ -78,24 +79,23 @@ public Duration getReadTimeout() {
   }
 
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
    */
-  static ExporterPushgatewayProperties load(Map<Object, Object> properties)
+  static ExporterPushgatewayProperties load(PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String address = Util.loadString(PREFIX + "." + ADDRESS, properties);
-    String job = Util.loadString(PREFIX + "." + JOB, properties);
-    String scheme = Util.loadString(PREFIX + "." + SCHEME, properties);
-    String escapingScheme = Util.loadString(PREFIX + "." + ESCAPING_SCHEME, properties);
-    Duration connectTimeout = Util.loadOptionalDuration(PREFIX + "." + CONNECT_TIMEOUT, properties);
-    Duration readTimeout = Util.loadOptionalDuration(PREFIX + "." + READ_TIMEOUT, properties);
+    String address = Util.loadString(PREFIX, ADDRESS, propertySource);
+    String job = Util.loadString(PREFIX, JOB, propertySource);
+    String scheme = Util.loadString(PREFIX, SCHEME, propertySource);
+    String escapingScheme = Util.loadString(PREFIX, ESCAPING_SCHEME, propertySource);
+    Duration connectTimeout = Util.loadOptionalDuration(PREFIX, CONNECT_TIMEOUT, propertySource);
+    Duration readTimeout = Util.loadOptionalDuration(PREFIX, READ_TIMEOUT, propertySource);
 
     if (scheme != null) {
       if (!scheme.equals("http") && !scheme.equals("https")) {
         throw new PrometheusPropertiesException(
-            String.format(
-                "%s.%s: Illegal value. Expecting 'http' or 'https'. Found: %s",
-                PREFIX, SCHEME, scheme));
+            Util.invalidValueMessage(
+                PREFIX + "." + SCHEME, "Illegal value. Expecting 'http' or 'https'."));
       }
     }
 
@@ -118,10 +118,9 @@ static ExporterPushgatewayProperties load(Map<Object, Object> properties)
         return EscapingScheme.DOTS_ESCAPING;
       default:
         throw new PrometheusPropertiesException(
-            String.format(
-                "%s.%s: Illegal value. Expecting 'allow-utf-8', 'values', 'underscores', "
-                    + "or 'dots'. Found: %s",
-                PREFIX, ESCAPING_SCHEME, scheme));
+            Util.invalidValueMessage(
+                PREFIX + "." + ESCAPING_SCHEME,
+                "Illegal value. Expecting 'allow-utf-8', 'values', 'underscores', or 'dots'."));
     }
   }
 
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/MetricsProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/MetricsProperties.java
index 6c8942713..c2758bd87 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/MetricsProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/MetricsProperties.java
@@ -2,32 +2,54 @@
 
 import static java.util.Collections.unmodifiableList;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Nullable;
 
 /** Properties starting with io.prometheus.metrics */
+@StableApi
 public class MetricsProperties {
 
-  private static final String EXEMPLARS_ENABLED = "exemplarsEnabled";
-  private static final String HISTOGRAM_NATIVE_ONLY = "histogramNativeOnly";
-  private static final String HISTOGRAM_CLASSIC_ONLY = "histogramClassicOnly";
-  private static final String HISTOGRAM_CLASSIC_UPPER_BOUNDS = "histogramClassicUpperBounds";
-  private static final String HISTOGRAM_NATIVE_INITIAL_SCHEMA = "histogramNativeInitialSchema";
+  private static final String EXEMPLARS_ENABLED = "exemplars_enabled";
+  private static final String HISTOGRAM_NATIVE_ONLY = "histogram_native_only";
+  private static final String HISTOGRAM_CLASSIC_ONLY = "histogram_classic_only";
+  private static final String HISTOGRAM_CLASSIC_UPPER_BOUNDS = "histogram_classic_upper_bounds";
+  private static final String HISTOGRAM_NATIVE_INITIAL_SCHEMA = "histogram_native_initial_schema";
   private static final String HISTOGRAM_NATIVE_MIN_ZERO_THRESHOLD =
-      "histogramNativeMinZeroThreshold";
+      "histogram_native_min_zero_threshold";
   private static final String HISTOGRAM_NATIVE_MAX_ZERO_THRESHOLD =
-      "histogramNativeMaxZeroThreshold";
+      "histogram_native_max_zero_threshold";
   private static final String HISTOGRAM_NATIVE_MAX_NUMBER_OF_BUCKETS =
-      "histogramNativeMaxNumberOfBuckets"; // 0 means unlimited number of buckets
+      "histogram_native_max_number_of_buckets"; // 0 means unlimited number of buckets
   private static final String HISTOGRAM_NATIVE_RESET_DURATION_SECONDS =
-      "histogramNativeResetDurationSeconds"; // 0 means no reset
-  private static final String SUMMARY_QUANTILES = "summaryQuantiles";
-  private static final String SUMMARY_QUANTILE_ERRORS = "summaryQuantileErrors";
-  private static final String SUMMARY_MAX_AGE_SECONDS = "summaryMaxAgeSeconds";
-  private static final String SUMMARY_NUMBER_OF_AGE_BUCKETS = "summaryNumberOfAgeBuckets";
+      "histogram_native_reset_duration_seconds"; // 0 means no reset
+  private static final String SUMMARY_QUANTILES = "summary_quantiles";
+  private static final String SUMMARY_QUANTILE_ERRORS = "summary_quantile_errors";
+  private static final String SUMMARY_MAX_AGE_SECONDS = "summary_max_age_seconds";
+  private static final String SUMMARY_NUMBER_OF_AGE_BUCKETS = "summary_number_of_age_buckets";
+
+  /**
+   * All known property suffixes that can be configured for metrics.
+   *
+   * <p>This list is used to parse metric-specific configuration keys from environment variables.
+   */
+  static final String[] PROPERTY_SUFFIXES = {
+    EXEMPLARS_ENABLED,
+    HISTOGRAM_NATIVE_ONLY,
+    HISTOGRAM_CLASSIC_ONLY,
+    HISTOGRAM_CLASSIC_UPPER_BOUNDS,
+    HISTOGRAM_NATIVE_INITIAL_SCHEMA,
+    HISTOGRAM_NATIVE_MIN_ZERO_THRESHOLD,
+    HISTOGRAM_NATIVE_MAX_ZERO_THRESHOLD,
+    HISTOGRAM_NATIVE_MAX_NUMBER_OF_BUCKETS,
+    HISTOGRAM_NATIVE_RESET_DURATION_SECONDS,
+    SUMMARY_QUANTILES,
+    SUMMARY_QUANTILE_ERRORS,
+    SUMMARY_MAX_AGE_SECONDS,
+    SUMMARY_NUMBER_OF_AGE_BUCKETS
+  };
 
   @Nullable private final Boolean exemplarsEnabled;
   @Nullable private final Boolean histogramNativeOnly;
@@ -226,17 +248,16 @@ private void validate(String prefix) throws PrometheusPropertiesException {
                 + SUMMARY_QUANTILES);
       }
       if (summaryQuantileErrors.size() != summaryQuantiles.size()) {
+        String fullKey =
+            prefix.isEmpty() ? SUMMARY_QUANTILE_ERRORS : prefix + "." + SUMMARY_QUANTILE_ERRORS;
         throw new PrometheusPropertiesException(
-            prefix
-                + "."
-                + SUMMARY_QUANTILE_ERRORS
-                + ": must have the same length as "
-                + SUMMARY_QUANTILES);
+            fullKey + ": must have the same length as " + SUMMARY_QUANTILES);
       }
       for (double error : summaryQuantileErrors) {
         if (error < 0 || error > 1) {
-          throw new PrometheusPropertiesException(
-              prefix + "." + SUMMARY_QUANTILE_ERRORS + ": Expecting 0.0 <= error <= 1.0");
+          String fullKey =
+              prefix.isEmpty() ? SUMMARY_QUANTILE_ERRORS : prefix + "." + SUMMARY_QUANTILE_ERRORS;
+          throw new PrometheusPropertiesException(fullKey + ": Expecting 0.0 <= error <= 1.0");
         }
       }
     }
@@ -335,25 +356,25 @@ public Integer getSummaryNumberOfAgeBuckets() {
   }
 
   /**
-   * Note that this will remove entries from {@code properties}. This is because we want to know if
-   * there are unused properties remaining after all properties have been loaded.
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
    */
-  static MetricsProperties load(String prefix, Map<Object, Object> properties)
+  static MetricsProperties load(String prefix, PropertySource propertySource)
       throws PrometheusPropertiesException {
     return new MetricsProperties(
-        Util.loadBoolean(prefix + "." + EXEMPLARS_ENABLED, properties),
-        Util.loadBoolean(prefix + "." + HISTOGRAM_NATIVE_ONLY, properties),
-        Util.loadBoolean(prefix + "." + HISTOGRAM_CLASSIC_ONLY, properties),
-        Util.loadDoubleList(prefix + "." + HISTOGRAM_CLASSIC_UPPER_BOUNDS, properties),
-        Util.loadInteger(prefix + "." + HISTOGRAM_NATIVE_INITIAL_SCHEMA, properties),
-        Util.loadDouble(prefix + "." + HISTOGRAM_NATIVE_MIN_ZERO_THRESHOLD, properties),
-        Util.loadDouble(prefix + "." + HISTOGRAM_NATIVE_MAX_ZERO_THRESHOLD, properties),
-        Util.loadInteger(prefix + "." + HISTOGRAM_NATIVE_MAX_NUMBER_OF_BUCKETS, properties),
-        Util.loadLong(prefix + "." + HISTOGRAM_NATIVE_RESET_DURATION_SECONDS, properties),
-        Util.loadDoubleList(prefix + "." + SUMMARY_QUANTILES, properties),
-        Util.loadDoubleList(prefix + "." + SUMMARY_QUANTILE_ERRORS, properties),
-        Util.loadLong(prefix + "." + SUMMARY_MAX_AGE_SECONDS, properties),
-        Util.loadInteger(prefix + "." + SUMMARY_NUMBER_OF_AGE_BUCKETS, properties),
+        Util.loadBoolean(prefix, EXEMPLARS_ENABLED, propertySource),
+        Util.loadBoolean(prefix, HISTOGRAM_NATIVE_ONLY, propertySource),
+        Util.loadBoolean(prefix, HISTOGRAM_CLASSIC_ONLY, propertySource),
+        Util.loadDoubleList(prefix, HISTOGRAM_CLASSIC_UPPER_BOUNDS, propertySource),
+        Util.loadInteger(prefix, HISTOGRAM_NATIVE_INITIAL_SCHEMA, propertySource),
+        Util.loadDouble(prefix, HISTOGRAM_NATIVE_MIN_ZERO_THRESHOLD, propertySource),
+        Util.loadDouble(prefix, HISTOGRAM_NATIVE_MAX_ZERO_THRESHOLD, propertySource),
+        Util.loadInteger(prefix, HISTOGRAM_NATIVE_MAX_NUMBER_OF_BUCKETS, propertySource),
+        Util.loadLong(prefix, HISTOGRAM_NATIVE_RESET_DURATION_SECONDS, propertySource),
+        Util.loadDoubleList(prefix, SUMMARY_QUANTILES, propertySource),
+        Util.loadDoubleList(prefix, SUMMARY_QUANTILE_ERRORS, propertySource),
+        Util.loadLong(prefix, SUMMARY_MAX_AGE_SECONDS, propertySource),
+        Util.loadInteger(prefix, SUMMARY_NUMBER_OF_AGE_BUCKETS, propertySource),
         prefix);
   }
 
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/OpenMetrics2Properties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/OpenMetrics2Properties.java
new file mode 100644
index 000000000..1f5080f05
--- /dev/null
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/OpenMetrics2Properties.java
@@ -0,0 +1,141 @@
+package io.prometheus.metrics.config;
+
+import io.prometheus.metrics.annotations.StableApi;
+import javax.annotation.Nullable;
+
+/**
+ * Properties starting with io.prometheus.openmetrics2. These properties are experimental and
+ * subject to change.
+ */
+@StableApi
+public class OpenMetrics2Properties {
+
+  private static final String PREFIX = "io.prometheus.openmetrics2";
+  private static final String ENABLED = "enabled";
+  private static final String CONTENT_NEGOTIATION = "content_negotiation";
+  private static final String COMPOSITE_VALUES = "composite_values";
+  private static final String EXEMPLAR_COMPLIANCE = "exemplar_compliance";
+  private static final String NATIVE_HISTOGRAMS = "native_histograms";
+
+  @Nullable private final Boolean enabled;
+  @Nullable private final Boolean contentNegotiation;
+  @Nullable private final Boolean compositeValues;
+  @Nullable private final Boolean exemplarCompliance;
+  @Nullable private final Boolean nativeHistograms;
+
+  private OpenMetrics2Properties(
+      @Nullable Boolean enabled,
+      @Nullable Boolean contentNegotiation,
+      @Nullable Boolean compositeValues,
+      @Nullable Boolean exemplarCompliance,
+      @Nullable Boolean nativeHistograms) {
+    this.enabled = enabled;
+    this.contentNegotiation = contentNegotiation;
+    this.compositeValues = compositeValues;
+    this.exemplarCompliance = exemplarCompliance;
+    this.nativeHistograms = nativeHistograms;
+  }
+
+  /**
+   * Enable the OpenMetrics 2.0 text format writer. When {@code true}, the OM2 writer is used
+   * instead of OM1 for OpenMetrics responses. Default is {@code false}.
+   */
+  public boolean getEnabled() {
+    return enabled != null && enabled;
+  }
+
+  /** Gate OM2 features behind content negotiation. Default is {@code false}. */
+  public boolean getContentNegotiation() {
+    return contentNegotiation != null && contentNegotiation;
+  }
+
+  /** Single-line histogram/summary with {@code st@}. Default is {@code false}. */
+  public boolean getCompositeValues() {
+    return compositeValues != null && compositeValues;
+  }
+
+  /** Mandatory timestamps, no 128-char limit for exemplars. Default is {@code false}. */
+  public boolean getExemplarCompliance() {
+    return exemplarCompliance != null && exemplarCompliance;
+  }
+
+  /** Exponential buckets support for native histograms. Default is {@code false}. */
+  public boolean getNativeHistograms() {
+    return nativeHistograms != null && nativeHistograms;
+  }
+
+  /**
+   * Note that this will remove entries from {@code propertySource}. This is because we want to know
+   * if there are unused properties remaining after all properties have been loaded.
+   */
+  static OpenMetrics2Properties load(PropertySource propertySource)
+      throws PrometheusPropertiesException {
+    Boolean enabled = Util.loadBoolean(PREFIX, ENABLED, propertySource);
+    Boolean contentNegotiation = Util.loadBoolean(PREFIX, CONTENT_NEGOTIATION, propertySource);
+    Boolean compositeValues = Util.loadBoolean(PREFIX, COMPOSITE_VALUES, propertySource);
+    Boolean exemplarCompliance = Util.loadBoolean(PREFIX, EXEMPLAR_COMPLIANCE, propertySource);
+    Boolean nativeHistograms = Util.loadBoolean(PREFIX, NATIVE_HISTOGRAMS, propertySource);
+    return new OpenMetrics2Properties(
+        enabled, contentNegotiation, compositeValues, exemplarCompliance, nativeHistograms);
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static class Builder {
+
+    @Nullable private Boolean enabled;
+    @Nullable private Boolean contentNegotiation;
+    @Nullable private Boolean compositeValues;
+    @Nullable private Boolean exemplarCompliance;
+    @Nullable private Boolean nativeHistograms;
+
+    private Builder() {}
+
+    /** See {@link #getEnabled()} */
+    public Builder enabled(boolean enabled) {
+      this.enabled = enabled;
+      return this;
+    }
+
+    /** See {@link #getContentNegotiation()} */
+    public Builder contentNegotiation(boolean contentNegotiation) {
+      this.contentNegotiation = contentNegotiation;
+      return this;
+    }
+
+    /** See {@link #getCompositeValues()} */
+    public Builder compositeValues(boolean compositeValues) {
+      this.compositeValues = compositeValues;
+      return this;
+    }
+
+    /** See {@link #getExemplarCompliance()} */
+    public Builder exemplarCompliance(boolean exemplarCompliance) {
+      this.exemplarCompliance = exemplarCompliance;
+      return this;
+    }
+
+    /** See {@link #getNativeHistograms()} */
+    public Builder nativeHistograms(boolean nativeHistograms) {
+      this.nativeHistograms = nativeHistograms;
+      return this;
+    }
+
+    /** Enable all OpenMetrics 2.0 features */
+    public Builder enableAll() {
+      this.enabled = true;
+      this.contentNegotiation = true;
+      this.compositeValues = true;
+      this.exemplarCompliance = true;
+      this.nativeHistograms = true;
+      return this;
+    }
+
+    public OpenMetrics2Properties build() {
+      return new OpenMetrics2Properties(
+          enabled, contentNegotiation, compositeValues, exemplarCompliance, nativeHistograms);
+    }
+  }
+}
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java
index ab78b48e3..aa145d07c 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusProperties.java
@@ -1,7 +1,9 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Consumer;
 import javax.annotation.Nullable;
 
 /**
@@ -9,18 +11,81 @@
  *
  * <p>This class represents the runtime configuration.
  */
+@StableApi
 public class PrometheusProperties {
 
   private static final PrometheusProperties instance = PrometheusPropertiesLoader.load();
 
   private final MetricsProperties defaultMetricsProperties;
-  private final Map<String, MetricsProperties> metricProperties = new HashMap<>();
+  private final MetricPropertiesMap metricProperties;
   private final ExemplarsProperties exemplarProperties;
   private final ExporterProperties exporterProperties;
   private final ExporterFilterProperties exporterFilterProperties;
   private final ExporterHttpServerProperties exporterHttpServerProperties;
   private final ExporterOpenTelemetryProperties exporterOpenTelemetryProperties;
   private final ExporterPushgatewayProperties exporterPushgatewayProperties;
+  private final OpenMetrics2Properties openMetrics2Properties;
+
+  /**
+   * Map that stores metric-specific properties keyed by metric name in exposition format
+   * (underscores instead of dots).
+   *
+   * <p>This wrapper makes it explicit that metric names are normalized to underscore format for
+   * storage, so that environment variables and properties with dots in metric names can be
+   * correctly looked up using normalized names.
+   */
+  static class MetricPropertiesMap {
+    private final Map<String, MetricsProperties> map = new HashMap<>();
+
+    void set(Map<String, MetricsProperties> properties) {
+      map.clear();
+      properties.forEach(this::put);
+    }
+
+    void put(String metricName, MetricsProperties properties) {
+      map.put(normalize(metricName), properties);
+    }
+
+    /**
+     * Get metric properties by metric name.
+     *
+     * <p>Accepts metric names in any format (with dots or underscores) and automatically converts
+     * them to the normalized underscore format used for storage.
+     *
+     * @param metricName the metric name (dots will be converted to underscores)
+     * @return the metric properties, or null if not configured
+     */
+    @Nullable
+    MetricsProperties get(String metricName) {
+      return map.get(normalize(metricName));
+    }
+
+    // copied from PrometheusNaming - but we can't reuse that class here because it's in a module
+    // that
+    // depends on PrometheusProperties, which would create a circular dependency.
+    private static String normalize(String name) {
+      StringBuilder escaped = new StringBuilder();
+
+      for (int i = 0; i < name.length(); ) {
+        int c = name.codePointAt(i);
+        if (isValidLegacyChar(c, i)) {
+          escaped.appendCodePoint(c);
+        } else {
+          escaped.append('_');
+        }
+        i += Character.charCount(c);
+      }
+      return escaped.toString();
+    }
+  }
+
+  private static boolean isValidLegacyChar(int c, int i) {
+    return (c >= 'a' && c <= 'z')
+        || (c >= 'A' && c <= 'Z')
+        || c == '_'
+        || c == ':'
+        || (c >= '0' && c <= '9' && i > 0);
+  }
 
   /**
    * Get the properties instance. When called for the first time, {@code get()} loads the properties
@@ -41,23 +106,26 @@ public static Builder builder() {
     return new Builder();
   }
 
-  public PrometheusProperties(
+  // Package-private constructor for PrometheusPropertiesLoader and Builder
+  PrometheusProperties(
       MetricsProperties defaultMetricsProperties,
-      Map<String, MetricsProperties> metricProperties,
+      MetricPropertiesMap metricProperties,
       ExemplarsProperties exemplarProperties,
       ExporterProperties exporterProperties,
       ExporterFilterProperties exporterFilterProperties,
       ExporterHttpServerProperties httpServerConfig,
       ExporterPushgatewayProperties pushgatewayProperties,
-      ExporterOpenTelemetryProperties otelConfig) {
+      ExporterOpenTelemetryProperties otelConfig,
+      OpenMetrics2Properties openMetrics2Properties) {
     this.defaultMetricsProperties = defaultMetricsProperties;
-    this.metricProperties.putAll(metricProperties);
+    this.metricProperties = metricProperties;
     this.exemplarProperties = exemplarProperties;
     this.exporterProperties = exporterProperties;
     this.exporterFilterProperties = exporterFilterProperties;
     this.exporterHttpServerProperties = httpServerConfig;
     this.exporterPushgatewayProperties = pushgatewayProperties;
     this.exporterOpenTelemetryProperties = otelConfig;
+    this.openMetrics2Properties = openMetrics2Properties;
   }
 
   /**
@@ -72,10 +140,13 @@ public MetricsProperties getDefaultMetricProperties() {
    * Properties specific for one metric. Should be merged with {@link
    * #getDefaultMetricProperties()}. May return {@code null} if no metric-specific properties are
    * configured for a metric name.
+   *
+   * @param metricName the metric name (dots will be automatically converted to underscores to match
+   *     exposition format)
    */
   @Nullable
   public MetricsProperties getMetricProperties(String metricName) {
-    return metricProperties.get(metricName.replace(".", "_"));
+    return metricProperties.get(metricName);
   }
 
   public ExemplarsProperties getExemplarProperties() {
@@ -102,9 +173,13 @@ public ExporterOpenTelemetryProperties getExporterOpenTelemetryProperties() {
     return exporterOpenTelemetryProperties;
   }
 
+  public OpenMetrics2Properties getOpenMetrics2Properties() {
+    return openMetrics2Properties;
+  }
+
   public static class Builder {
     private MetricsProperties defaultMetricsProperties = MetricsProperties.builder().build();
-    private Map<String, MetricsProperties> metricProperties = new HashMap<>();
+    private final MetricPropertiesMap metricProperties = new MetricPropertiesMap();
     private ExemplarsProperties exemplarProperties = ExemplarsProperties.builder().build();
     private ExporterProperties exporterProperties = ExporterProperties.builder().build();
     private ExporterFilterProperties exporterFilterProperties =
@@ -115,6 +190,8 @@ public static class Builder {
         ExporterPushgatewayProperties.builder().build();
     private ExporterOpenTelemetryProperties otelConfig =
         ExporterOpenTelemetryProperties.builder().build();
+    private OpenMetrics2Properties openMetrics2Properties =
+        OpenMetrics2Properties.builder().build();
 
     private Builder() {}
 
@@ -124,7 +201,7 @@ public Builder defaultMetricsProperties(MetricsProperties defaultMetricsProperti
     }
 
     public Builder metricProperties(Map<String, MetricsProperties> metricProperties) {
-      this.metricProperties = metricProperties;
+      this.metricProperties.set(metricProperties);
       return this;
     }
 
@@ -166,6 +243,19 @@ public Builder exporterOpenTelemetryProperties(
       return this;
     }
 
+    public Builder enableOpenMetrics2(Consumer<OpenMetrics2Properties.Builder> configurator) {
+      OpenMetrics2Properties.Builder openMetrics2Builder =
+          OpenMetrics2Properties.builder().enabled(true);
+      configurator.accept(openMetrics2Builder);
+      this.openMetrics2Properties = openMetrics2Builder.build();
+      return this;
+    }
+
+    public Builder openMetrics2Properties(OpenMetrics2Properties openMetrics2Properties) {
+      this.openMetrics2Properties = openMetrics2Properties;
+      return this;
+    }
+
     public PrometheusProperties build() {
       return new PrometheusProperties(
           defaultMetricsProperties,
@@ -175,7 +265,8 @@ public PrometheusProperties build() {
           exporterFilterProperties,
           exporterHttpServerProperties,
           pushgatewayProperties,
-          otelConfig);
+          otelConfig,
+          openMetrics2Properties);
     }
   }
 }
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesException.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesException.java
index bdb024514..b6f6fac4b 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesException.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesException.java
@@ -1,5 +1,8 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
+
+@StableApi
 public class PrometheusPropertiesException extends RuntimeException {
 
   private static final long serialVersionUID = 0L;
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesLoader.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesLoader.java
index a847a8dba..04bbfe4a5 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesLoader.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PrometheusPropertiesLoader.java
@@ -1,16 +1,14 @@
 package io.prometheus.metrics.config;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * The Properties Loader is early stages.
@@ -20,6 +18,7 @@
  * Boot's Externalized Configuration</a>, like support for YAML, Properties, and env vars, or
  * support for Spring's naming conventions for properties.
  */
+@StableApi
 public class PrometheusPropertiesLoader {
 
   /** See {@link PrometheusProperties#get()}. */
@@ -29,20 +28,22 @@ public static PrometheusProperties load() throws PrometheusPropertiesException {
 
   public static PrometheusProperties load(Map<Object, Object> externalProperties)
       throws PrometheusPropertiesException {
-    Map<Object, Object> properties = loadProperties(externalProperties);
-    Map<String, MetricsProperties> metricsConfigs = loadMetricsConfigs(properties);
+    PropertySource propertySource = loadProperties(externalProperties);
+    PrometheusProperties.MetricPropertiesMap metricsConfigs = loadMetricsConfigs(propertySource);
     MetricsProperties defaultMetricsProperties =
-        MetricsProperties.load("io.prometheus.metrics", properties);
-    ExemplarsProperties exemplarConfig = ExemplarsProperties.load(properties);
-    ExporterProperties exporterProperties = ExporterProperties.load(properties);
-    ExporterFilterProperties exporterFilterProperties = ExporterFilterProperties.load(properties);
+        MetricsProperties.load("io.prometheus.metrics", propertySource);
+    ExemplarsProperties exemplarConfig = ExemplarsProperties.load(propertySource);
+    ExporterProperties exporterProperties = ExporterProperties.load(propertySource);
+    ExporterFilterProperties exporterFilterProperties =
+        ExporterFilterProperties.load(propertySource);
     ExporterHttpServerProperties exporterHttpServerProperties =
-        ExporterHttpServerProperties.load(properties);
+        ExporterHttpServerProperties.load(propertySource);
     ExporterPushgatewayProperties exporterPushgatewayProperties =
-        ExporterPushgatewayProperties.load(properties);
+        ExporterPushgatewayProperties.load(propertySource);
     ExporterOpenTelemetryProperties exporterOpenTelemetryProperties =
-        ExporterOpenTelemetryProperties.load(properties);
-    validateAllPropertiesProcessed(properties);
+        ExporterOpenTelemetryProperties.load(propertySource);
+    OpenMetrics2Properties openMetrics2Properties = OpenMetrics2Properties.load(propertySource);
+    validateAllPropertiesProcessed(propertySource);
     return new PrometheusProperties(
         defaultMetricsProperties,
         metricsConfigs,
@@ -51,31 +52,53 @@ public static PrometheusProperties load(Map<Object, Object> externalProperties)
         exporterFilterProperties,
         exporterHttpServerProperties,
         exporterPushgatewayProperties,
-        exporterOpenTelemetryProperties);
+        exporterOpenTelemetryProperties,
+        openMetrics2Properties);
   }
 
-  // This will remove entries from properties when they are processed.
-  private static Map<String, MetricsProperties> loadMetricsConfigs(Map<Object, Object> properties) {
-    Map<String, MetricsProperties> result = new HashMap<>();
+  // This will remove entries from propertySource when they are processed.
+  static PrometheusProperties.MetricPropertiesMap loadMetricsConfigs(
+      PropertySource propertySource) {
+    PrometheusProperties.MetricPropertiesMap result =
+        new PrometheusProperties.MetricPropertiesMap();
     // Note that the metric name in the properties file must be as exposed in the Prometheus
     // exposition formats,
     // i.e. all dots replaced with underscores.
-    Pattern pattern = Pattern.compile("io\\.prometheus\\.metrics\\.([^.]+)\\.");
-    // Create a copy of the keySet() for iterating. We cannot iterate directly over keySet()
-    // because entries are removed when MetricsConfig.load(...) is called.
-    Set<String> propertyNames = new HashSet<>();
-    for (Object key : properties.keySet()) {
-      propertyNames.add(key.toString());
-    }
+
+    // Get a snapshot of all keys for pattern matching. Entries will be removed
+    // when MetricsProperties.load(...) is called.
+    Set<String> propertyNames = propertySource.getAllKeys();
     for (String propertyName : propertyNames) {
-      Matcher matcher = pattern.matcher(propertyName);
-      if (matcher.find()) {
-        String metricName = matcher.group(1).replace(".", "_");
-        if (!result.containsKey(metricName)) {
-          result.put(
-              metricName,
-              MetricsProperties.load("io.prometheus.metrics." + metricName, properties));
+      String metricName = null;
+
+      if (propertyName.startsWith("io.prometheus.metrics.")) {
+        // Dot-separated format (from regular properties, system properties, or files)
+        String remainder = propertyName.substring("io.prometheus.metrics.".length());
+        // Try to match against known property suffixes
+        for (String suffix : MetricsProperties.PROPERTY_SUFFIXES) {
+          if (remainder.endsWith("." + suffix)) {
+            // Metric name in dot format, convert dots to underscores for exposition format
+            metricName =
+                remainder.substring(0, remainder.length() - suffix.length() - 1).replace(".", "_");
+            break;
+          }
         }
+      } else if (propertyName.startsWith("io_prometheus_metrics_")) {
+        // Underscore-separated format (from environment variables)
+        String remainder = propertyName.substring("io_prometheus_metrics_".length());
+        // Try to match against known property suffixes
+        for (String suffix : MetricsProperties.PROPERTY_SUFFIXES) {
+          if (remainder.endsWith("_" + suffix)) {
+            metricName = remainder.substring(0, remainder.length() - suffix.length() - 1);
+            break;
+          }
+        }
+      }
+
+      if (metricName != null && result.get(metricName) == null) {
+        result.put(
+            metricName,
+            MetricsProperties.load("io.prometheus.metrics." + metricName, propertySource));
       }
     }
     return result;
@@ -84,26 +107,43 @@ private static Map<String, MetricsProperties> loadMetricsConfigs(Map<Object, Obj
   // If there are properties left starting with io.prometheus it's likely a typo,
   // because we didn't use that property.
   // Throw a config error to let the user know that this property doesn't exist.
-  private static void validateAllPropertiesProcessed(Map<Object, Object> properties) {
-    for (Object key : properties.keySet()) {
-      if (key.toString().startsWith("io.prometheus")) {
+  private static void validateAllPropertiesProcessed(PropertySource propertySource) {
+    for (String key : propertySource.getRemainingKeys()) {
+      if (key.startsWith("io.prometheus") || key.startsWith("io_prometheus")) {
         throw new PrometheusPropertiesException(key + ": Unknown property");
       }
     }
   }
 
-  private static Map<Object, Object> loadProperties(Map<Object, Object> externalProperties) {
-    Map<Object, Object> properties = new HashMap<>();
-    properties.putAll(loadPropertiesFromClasspath());
-    properties.putAll(loadPropertiesFromFile()); // overriding the entries from the classpath file
+  private static PropertySource loadProperties(Map<Object, Object> externalProperties) {
+    // Regular properties (lowest priority): classpath, file, system properties
+    Map<Object, Object> regularProperties = new HashMap<>();
+    // Normalize all properties at load time to handle camelCase in files for backward compatibility
+    normalizeAndPutAll(regularProperties, loadPropertiesFromClasspath());
+    normalizeAndPutAll(
+        regularProperties,
+        loadPropertiesFromFile()); // overriding the entries from the classpath file
     // overriding the entries from the properties file
     // copy System properties to avoid ConcurrentModificationException
+    // normalize camelCase system properties to snake_case for backward compatibility
     System.getProperties().stringPropertyNames().stream()
         .filter(key -> key.startsWith("io.prometheus"))
-        .forEach(key -> properties.put(key, System.getProperty(key)));
-    properties.putAll(externalProperties); // overriding all the entries above
-    // TODO: Add environment variables like EXEMPLARS_ENABLED.
-    return properties;
+        .forEach(key -> regularProperties.put(normalizePropertyKey(key), System.getProperty(key)));
+
+    // Environment variables (second priority): just lowercase, keep underscores
+    Map<Object, Object> envVarProperties = loadPropertiesFromEnvironment();
+
+    // External properties (highest priority): normalize camelCase for backward compatibility
+    Map<Object, Object> normalizedExternalProperties = new HashMap<>();
+    externalProperties.forEach(
+        (key, value) ->
+            normalizedExternalProperties.put(normalizePropertyKey(key.toString()), value));
+
+    return new PropertySource(normalizedExternalProperties, envVarProperties, regularProperties);
+  }
+
+  private static void normalizeAndPutAll(Map<Object, Object> target, Map<Object, Object> source) {
+    source.forEach((key, value) -> target.put(normalizePropertyKey(key.toString()), value));
   }
 
   private static Properties loadPropertiesFromClasspath() {
@@ -129,10 +169,53 @@ private static Properties loadPropertiesFromFile() throws PrometheusPropertiesEx
       try (InputStream stream = Files.newInputStream(Paths.get(path))) {
         properties.load(stream);
       } catch (IOException e) {
-        throw new PrometheusPropertiesException(
-            "Failed to read Prometheus properties from " + path + ": " + e.getMessage(), e);
+        throw new PrometheusPropertiesException("Failed to read Prometheus properties file.", e);
       }
     }
     return properties;
   }
+
+  /**
+   * Load properties from environment variables.
+   *
+   * <p>Environment variables are converted to lowercase but keep underscores as-is. For example,
+   * the environment variable IO_PROMETHEUS_METRICS_EXEMPLARS_ENABLED becomes
+   * io_prometheus_metrics_exemplars_enabled.
+   *
+   * <p>The transformation to dot notation happens at access time in PropertySource.
+   *
+   * <p>Only environment variables starting with IO_PROMETHEUS are considered.
+   *
+   * @return properties loaded from environment variables (with lowercase keys and underscores)
+   */
+  private static Map<Object, Object> loadPropertiesFromEnvironment() {
+    Map<Object, Object> properties = new HashMap<>();
+    System.getenv()
+        .forEach(
+            (key, value) -> {
+              if (key.startsWith("IO_PROMETHEUS")) {
+                String normalizedKey = key.toLowerCase(java.util.Locale.ROOT);
+                properties.put(normalizedKey, value);
+              }
+            });
+    return properties;
+  }
+
+  /**
+   * Normalize a property key for consistent lookup.
+   *
+   * <p>Converts camelCase property keys to snake_case. This allows both snake_case (preferred) and
+   * camelCase (deprecated) property names to be used.
+   *
+   * <p>For example: exemplarsEnabled → exemplars_enabled exemplars_enabled → exemplars_enabled
+   * (unchanged)
+   *
+   * @param key the property key
+   * @return the normalized property key
+   */
+  static String normalizePropertyKey(String key) {
+    // Insert underscores before uppercase letters to convert camelCase to snake_case
+    String withUnderscores = key.replaceAll("([a-z])([A-Z])", "$1_$2");
+    return withUnderscores.toLowerCase(java.util.Locale.ROOT);
+  }
 }
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PropertySource.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PropertySource.java
new file mode 100644
index 000000000..a85212469
--- /dev/null
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/PropertySource.java
@@ -0,0 +1,165 @@
+package io.prometheus.metrics.config;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+/**
+ * PropertySource encapsulates three separate property maps with different priorities and
+ * transformation rules.
+ *
+ * <p>Properties are checked in the following order:
+ *
+ * <ol>
+ *   <li>External properties (highest priority) - exact key match
+ *   <li>Environment variables (second priority) - with dot-to-underscore transformation
+ *   <li>Regular properties (lowest priority) - from system properties, files, and classpath
+ * </ol>
+ *
+ * <p>Property lookups remove entries from the maps. This allows detecting unused properties at the
+ * end of configuration loading.
+ */
+class PropertySource {
+
+  private final Map<Object, Object> externalProperties; // Highest priority
+  private final Map<Object, Object> envVarProperties; // Second priority
+  private final Map<Object, Object> regularProperties; // Lowest priority
+
+  /**
+   * Creates a PropertySource with three separate property maps.
+   *
+   * @param externalProperties properties passed explicitly (e.g., from application code)
+   * @param envVarProperties properties from environment variables (keys in env var format with
+   *     underscores, lowercase)
+   * @param regularProperties properties from system properties, files, and classpath (keys
+   *     normalized to snake_case)
+   */
+  PropertySource(
+      Map<Object, Object> externalProperties,
+      Map<Object, Object> envVarProperties,
+      Map<Object, Object> regularProperties) {
+    this.externalProperties = externalProperties;
+    this.envVarProperties = envVarProperties;
+    this.regularProperties = regularProperties;
+  }
+
+  /**
+   * Creates a PropertySource with only regular properties (for testing).
+   *
+   * <p>Creates empty maps for external and environment variable properties.
+   *
+   * @param regularProperties properties from system properties, files, and classpath (keys
+   *     normalized to snake_case)
+   */
+  PropertySource(Map<Object, Object> regularProperties) {
+    this(new HashMap<>(), new HashMap<>(), regularProperties);
+  }
+
+  /**
+   * Gets a property value by key, checking all three sources in priority order.
+   *
+   * <p>For external and regular properties, performs exact key match. For environment variables,
+   * transforms dots to underscores before lookup (e.g., "io.prometheus.metrics.exemplars_enabled"
+   * becomes "io_prometheus_metrics_exemplars_enabled").
+   *
+   * <p>Removes the property from ALL source maps to prevent duplicate detection during validation.
+   *
+   * @param key the property key to look up
+   * @return the property value, or null if not found
+   */
+  @Nullable
+  String getProperty(String key) {
+    String result = null;
+
+    // Check external properties first (highest priority)
+    Object value = externalProperties.remove(key);
+    if (value != null) {
+      result = value.toString();
+    }
+
+    // Check env vars with transformation (second priority)
+    // Transform dots to underscores: io.prometheus.metrics.exemplars_enabled
+    // -> io_prometheus_metrics_exemplars_enabled
+    String envKey = key.replace(".", "_");
+    Object envValue = envVarProperties.remove(envKey);
+    if (result == null && envValue != null) {
+      result = envValue.toString();
+    }
+
+    // Check regular properties last (lowest priority)
+    Object regularValue = regularProperties.remove(key);
+    if (result == null && regularValue != null) {
+      result = regularValue.toString();
+    }
+
+    return result;
+  }
+
+  /**
+   * Gets a property value by prefix and property name.
+   *
+   * <p>This is a convenience method that concatenates the prefix and property name with a dot and
+   * calls {@link #getProperty(String)}.
+   *
+   * @param prefix the property prefix (e.g., "io.prometheus.metrics"), or empty string for no
+   *     prefix
+   * @param propertyName the property name (e.g., "exemplars_enabled")
+   * @return the property value, or null if not found
+   */
+  @Nullable
+  String getProperty(String prefix, String propertyName) {
+    String fullKey = prefix.isEmpty() ? propertyName : prefix + "." + propertyName;
+    return getProperty(fullKey);
+  }
+
+  /**
+   * Returns all keys from all three property sources.
+   *
+   * <p>Keys are returned in the format they are stored in each source: external and regular
+   * properties typically use dot-separated keys, while environment variables are exposed in their
+   * underscore form (e.g., "io_prometheus_metrics_exemplars_enabled").
+   *
+   * <p>This is used for pattern matching to find metric-specific configurations.
+   *
+   * @return a set of all property keys
+   */
+  Set<String> getAllKeys() {
+    Set<String> allKeys = new HashSet<>();
+    for (Object key : externalProperties.keySet()) {
+      allKeys.add(key.toString());
+    }
+    // Include env var keys as stored (underscore-separated, lowercase)
+    for (Object key : envVarProperties.keySet()) {
+      String envKey = key.toString();
+      allKeys.add(envKey);
+    }
+    for (Object key : regularProperties.keySet()) {
+      allKeys.add(key.toString());
+    }
+    return allKeys;
+  }
+
+  /**
+   * Returns all remaining keys from all three property sources.
+   *
+   * <p>This is used for validation to detect unused properties that might indicate configuration
+   * errors.
+   *
+   * @return a set of all remaining property keys
+   */
+  Set<String> getRemainingKeys() {
+    Set<String> remainingKeys = new HashSet<>();
+    for (Object key : externalProperties.keySet()) {
+      remainingKeys.add(key.toString());
+    }
+    for (Object key : envVarProperties.keySet()) {
+      remainingKeys.add(key.toString());
+    }
+    for (Object key : regularProperties.keySet()) {
+      remainingKeys.add(key.toString());
+    }
+    return remainingKeys;
+  }
+}
diff --git a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/Util.java b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/Util.java
index 04eb78a19..d90810faf 100644
--- a/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/Util.java
+++ b/prometheus-metrics-config/src/main/java/io/prometheus/metrics/config/Util.java
@@ -12,22 +12,19 @@
 class Util {
 
   @Nullable
-  static String getProperty(String name, Map<Object, Object> properties) {
-    Object object = properties.remove(name);
-    if (object != null) {
-      return object.toString();
-    }
-    return null;
+  static String getProperty(String prefix, String propertyName, PropertySource propertySource) {
+    return propertySource.getProperty(prefix, propertyName);
   }
 
   @Nullable
-  static Boolean loadBoolean(String name, Map<Object, Object> properties)
+  static Boolean loadBoolean(String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
+      String fullKey = prefix.isEmpty() ? propertyName : prefix + "." + propertyName;
       if (!"true".equalsIgnoreCase(property) && !"false".equalsIgnoreCase(property)) {
         throw new PrometheusPropertiesException(
-            String.format("%s: Expecting 'true' or 'false'. Found: %s", name, property));
+            invalidValueMessage(fullKey, "Expecting 'true' or 'false'."));
       }
       return Boolean.parseBoolean(property);
     }
@@ -47,24 +44,26 @@ static List<Double> toList(@Nullable double... values) {
   }
 
   @Nullable
-  static String loadString(String name, Map<Object, Object> properties)
+  static String loadString(String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    return getProperty(name, properties);
+    return getProperty(prefix, propertyName, propertySource);
   }
 
   @Nullable
-  static String loadStringAddSuffix(String name, Map<Object, Object> properties, String suffix) {
-    Object object = properties.remove(name);
-    if (object != null) {
-      return object + suffix;
+  static String loadStringAddSuffix(
+      String prefix, String propertyName, PropertySource propertySource, String suffix) {
+    String value = propertySource.getProperty(prefix, propertyName);
+    if (value != null) {
+      return value + suffix;
     }
     return null;
   }
 
   @Nullable
-  static List<String> loadStringList(String name, Map<Object, Object> properties)
+  static List<String> loadStringList(
+      String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
       return Arrays.asList(property.split("\\s*,\\s*"));
     }
@@ -72,10 +71,12 @@ static List<String> loadStringList(String name, Map<Object, Object> properties)
   }
 
   @Nullable
-  static List<Double> loadDoubleList(String name, Map<Object, Object> properties)
+  static List<Double> loadDoubleList(
+      String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
+      String fullKey = prefix.isEmpty() ? propertyName : prefix + "." + propertyName;
       String[] numbers = property.split("\\s*,\\s*");
       Double[] result = new Double[numbers.length];
       for (int i = 0; i < numbers.length; i++) {
@@ -87,7 +88,7 @@ static List<Double> loadDoubleList(String name, Map<Object, Object> properties)
           }
         } catch (NumberFormatException e) {
           throw new PrometheusPropertiesException(
-              name + "=" + property + ": Expecting comma separated list of double values");
+              invalidValueMessage(fullKey, "Expecting comma separated list of double values"));
         }
       }
       return Arrays.asList(result);
@@ -96,10 +97,11 @@ static List<Double> loadDoubleList(String name, Map<Object, Object> properties)
   }
 
   // Map is represented as "key1=value1,key2=value2"
-  static Map<String, String> loadMap(String name, Map<Object, Object> properties)
+  static Map<String, String> loadMap(
+      String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
     Map<String, String> result = new HashMap<>();
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
       String[] pairs = property.split(",");
       for (String pair : pairs) {
@@ -119,55 +121,61 @@ static Map<String, String> loadMap(String name, Map<Object, Object> properties)
   }
 
   @Nullable
-  static Integer loadInteger(String name, Map<Object, Object> properties)
+  static Integer loadInteger(String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
+      String fullKey = prefix.isEmpty() ? propertyName : prefix + "." + propertyName;
       try {
         return Integer.parseInt(property);
       } catch (NumberFormatException e) {
         throw new PrometheusPropertiesException(
-            name + "=" + property + ": Expecting integer value");
+            invalidValueMessage(fullKey, "Expecting integer value"));
       }
     }
     return null;
   }
 
   @Nullable
-  static Double loadDouble(String name, Map<Object, Object> properties)
+  static Double loadDouble(String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
+      String fullKey = prefix.isEmpty() ? propertyName : prefix + "." + propertyName;
       try {
         return Double.parseDouble(property);
       } catch (NumberFormatException e) {
-        throw new PrometheusPropertiesException(name + "=" + property + ": Expecting double value");
+        throw new PrometheusPropertiesException(
+            invalidValueMessage(fullKey, "Expecting double value"));
       }
     }
     return null;
   }
 
   @Nullable
-  static Long loadLong(String name, Map<Object, Object> properties)
+  static Long loadLong(String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
-    String property = getProperty(name, properties);
+    String property = getProperty(prefix, propertyName, propertySource);
     if (property != null) {
+      String fullKey = prefix.isEmpty() ? propertyName : prefix + "." + propertyName;
       try {
         return Long.parseLong(property);
       } catch (NumberFormatException e) {
-        throw new PrometheusPropertiesException(name + "=" + property + ": Expecting long value");
+        throw new PrometheusPropertiesException(
+            invalidValueMessage(fullKey, "Expecting long value"));
       }
     }
     return null;
   }
 
   @Nullable
-  static Duration loadOptionalDuration(String name, Map<Object, Object> properties)
+  static Duration loadOptionalDuration(
+      String prefix, String propertyName, PropertySource propertySource)
       throws PrometheusPropertiesException {
 
-    Long value = loadLong(name, properties);
+    Long value = loadLong(prefix, propertyName, propertySource);
 
-    assertValue(value, t -> t >= 0, "Expecting value >= 0.", null, name);
+    assertValue(value, t -> t >= 0, "Expecting value >= 0.", prefix, propertyName);
 
     if (value == null || value == 0) {
       return null;
@@ -180,12 +188,17 @@ static <T extends Number> void assertValue(
       Predicate<T> predicate,
       String message,
       @Nullable String prefix,
-      String name)
+      String propertyName)
       throws PrometheusPropertiesException {
     if (number != null && !predicate.test(number)) {
-      String fullKey = prefix == null ? name : prefix + "." + name;
+      String fullKey =
+          (prefix == null || prefix.isEmpty()) ? propertyName : prefix + "." + propertyName;
       String fullMessage = String.format("%s: %s Found: %s", fullKey, message, number);
       throw new PrometheusPropertiesException(fullMessage);
     }
   }
+
+  static String invalidValueMessage(String fullKey, String message) {
+    return fullKey + ": " + message;
+  }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExemplarsPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExemplarsPropertiesTest.java
index 53f7ae072..aa87ed105 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExemplarsPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExemplarsPropertiesTest.java
@@ -14,31 +14,35 @@ void load() {
     ExemplarsProperties properties =
         load(
             Map.of(
-                "io.prometheus.exemplars.minRetentionPeriodSeconds", "1",
-                "io.prometheus.exemplars.maxRetentionPeriodSeconds", "2",
-                "io.prometheus.exemplars.sampleIntervalMilliseconds", "3"));
+                "io.prometheus.exemplars.min_retention_period_seconds", "1",
+                "io.prometheus.exemplars.max_retention_period_seconds", "2",
+                "io.prometheus.exemplars.sample_interval_milliseconds", "3"));
     assertThat(properties.getMinRetentionPeriodSeconds()).isOne();
     assertThat(properties.getMaxRetentionPeriodSeconds()).isEqualTo(2);
     assertThat(properties.getSampleIntervalMilliseconds()).isEqualTo(3);
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(() -> load(Map.of("io.prometheus.exemplars.minRetentionPeriodSeconds", "-1")))
+        .isThrownBy(
+            () -> load(Map.of("io.prometheus.exemplars.min_retention_period_seconds", "-1")))
         .withMessage(
-            "io.prometheus.exemplars.minRetentionPeriodSeconds: Expecting value > 0. Found: -1");
+            "io.prometheus.exemplars.min_retention_period_seconds: Expecting value > 0. Found: -1");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(() -> load(Map.of("io.prometheus.exemplars.maxRetentionPeriodSeconds", "0")))
+        .isThrownBy(() -> load(Map.of("io.prometheus.exemplars.max_retention_period_seconds", "0")))
         .withMessage(
-            "io.prometheus.exemplars.maxRetentionPeriodSeconds: Expecting value > 0. Found: 0");
+            "io.prometheus.exemplars.max_retention_period_seconds: Expecting value > 0. Found: 0");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(() -> load(Map.of("io.prometheus.exemplars.sampleIntervalMilliseconds", "-1")))
+        .isThrownBy(
+            () -> load(Map.of("io.prometheus.exemplars.sample_interval_milliseconds", "-1")))
         .withMessage(
-            "io.prometheus.exemplars.sampleIntervalMilliseconds: Expecting value > 0. Found: -1");
+            "io.prometheus.exemplars.sample_interval_milliseconds: Expecting value > 0. Found: -1");
   }
 
   private static ExemplarsProperties load(Map<String, String> map) {
-    return ExemplarsProperties.load(new HashMap<>(map));
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return ExemplarsProperties.load(propertySource);
   }
 
   @Test
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterFilterPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterFilterPropertiesTest.java
index 0b30fbd43..c7b9124af 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterFilterPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterFilterPropertiesTest.java
@@ -13,10 +13,10 @@ void load() {
     ExporterFilterProperties properties =
         load(
             Map.of(
-                "io.prometheus.exporter.filter.metricNameMustBeEqualTo", "a,b,c",
-                "io.prometheus.exporter.filter.metricNameMustNotBeEqualTo", "d,e,f",
-                "io.prometheus.exporter.filter.metricNameMustStartWith", "g,h,i",
-                "io.prometheus.exporter.filter.metricNameMustNotStartWith", "j,k,l"));
+                "io.prometheus.exporter.filter.metric_name_must_be_equal_to", "a,b,c",
+                "io.prometheus.exporter.filter.metric_name_must_not_be_equal_to", "d,e,f",
+                "io.prometheus.exporter.filter.metric_name_must_start_with", "g,h,i",
+                "io.prometheus.exporter.filter.metric_name_must_not_start_with", "j,k,l"));
     assertThat(properties.getAllowedMetricNames()).containsExactly("a", "b", "c");
     assertThat(properties.getExcludedMetricNames()).containsExactly("d", "e", "f");
     assertThat(properties.getAllowedMetricNamePrefixes()).containsExactly("g", "h", "i");
@@ -24,7 +24,9 @@ void load() {
   }
 
   private static ExporterFilterProperties load(Map<String, String> map) {
-    return ExporterFilterProperties.load(new HashMap<>(map));
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return ExporterFilterProperties.load(propertySource);
   }
 
   @Test
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterHttpServerPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterHttpServerPropertiesTest.java
index 07b00a2a4..fc4faf141 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterHttpServerPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterHttpServerPropertiesTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -11,20 +12,30 @@ class ExporterHttpServerPropertiesTest {
   @Test
   void load() {
     ExporterHttpServerProperties properties =
-        load(Map.of("io.prometheus.exporter.httpServer.port", "1"));
+        load(Map.of("io.prometheus.exporter.http_server.port", "1"));
     assertThat(properties.getPort()).isOne();
+    assertThat(properties.isPreferUncompressedResponse()).isFalse();
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(() -> load(Map.of("io.prometheus.exporter.httpServer.port", "0")))
-        .withMessage("io.prometheus.exporter.httpServer.port: Expecting value > 0. Found: 0");
+        .isThrownBy(() -> load(Map.of("io.prometheus.exporter.http_server.port", "0")))
+        .withMessage("io.prometheus.exporter.http_server.port: Expecting value > 0. Found: 0");
   }
 
   @Test
   void builder() {
-    assertThat(ExporterHttpServerProperties.builder().port(1).build().getPort()).isOne();
+    ExporterHttpServerProperties properties =
+        ExporterHttpServerProperties.builder().port(1).build();
+
+    assertSoftly(
+        softly -> {
+          softly.assertThat(properties.getPort()).isOne();
+          softly.assertThat(properties.isPreferUncompressedResponse()).isFalse();
+        });
   }
 
   private static ExporterHttpServerProperties load(Map<String, String> map) {
-    return ExporterHttpServerProperties.load(new HashMap<>(map));
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return ExporterHttpServerProperties.load(propertySource);
   }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterOpenTelemetryPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterOpenTelemetryPropertiesTest.java
index 7ba275570..003fba0e6 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterOpenTelemetryPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterOpenTelemetryPropertiesTest.java
@@ -1,6 +1,7 @@
 package io.prometheus.metrics.config;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,13 +17,13 @@ void load() {
                 "io.prometheus.exporter.opentelemetry.protocol", "grpc",
                 "io.prometheus.exporter.opentelemetry.endpoint", "http://localhost:8080",
                 "io.prometheus.exporter.opentelemetry.headers", "key1=value1,key2=value2",
-                "io.prometheus.exporter.opentelemetry.intervalSeconds", "10",
-                "io.prometheus.exporter.opentelemetry.timeoutSeconds", "5",
-                "io.prometheus.exporter.opentelemetry.serviceName", "serviceName",
-                "io.prometheus.exporter.opentelemetry.serviceNamespace", "serviceNamespace",
-                "io.prometheus.exporter.opentelemetry.serviceInstanceId", "serviceInstanceId",
-                "io.prometheus.exporter.opentelemetry.serviceVersion", "serviceVersion",
-                "io.prometheus.exporter.opentelemetry.resourceAttributes",
+                "io.prometheus.exporter.opentelemetry.interval_seconds", "10",
+                "io.prometheus.exporter.opentelemetry.timeout_seconds", "5",
+                "io.prometheus.exporter.opentelemetry.service_name", "serviceName",
+                "io.prometheus.exporter.opentelemetry.service_namespace", "serviceNamespace",
+                "io.prometheus.exporter.opentelemetry.service_instance_id", "serviceInstanceId",
+                "io.prometheus.exporter.opentelemetry.service_version", "serviceVersion",
+                "io.prometheus.exporter.opentelemetry.resource_attributes",
                     "key1=value1,key2=value2"));
 
     assertValues(properties);
@@ -44,7 +45,9 @@ private static void assertValues(ExporterOpenTelemetryProperties properties) {
   }
 
   private static ExporterOpenTelemetryProperties load(Map<String, String> map) {
-    return ExporterOpenTelemetryProperties.load(new HashMap<>(map));
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return ExporterOpenTelemetryProperties.load(propertySource);
   }
 
   @Test
@@ -66,4 +69,40 @@ void builder() {
             .build();
     assertValues(properties);
   }
+
+  @Test
+  void builderWithHttpProtobuf() {
+    ExporterOpenTelemetryProperties properties =
+        ExporterOpenTelemetryProperties.builder().protocol("http/protobuf").build();
+    assertThat(properties.getProtocol()).isEqualTo("http/protobuf");
+  }
+
+  @Test
+  void builderWithInvalidProtocol() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> ExporterOpenTelemetryProperties.builder().protocol("invalid"))
+        .withMessage("invalid: Unsupported protocol. Expecting grpc or http/protobuf");
+  }
+
+  @Test
+  void builderWithInvalidIntervalSeconds() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> ExporterOpenTelemetryProperties.builder().intervalSeconds(0))
+        .withMessage("0: Expecting intervalSeconds > 0");
+
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> ExporterOpenTelemetryProperties.builder().intervalSeconds(-1))
+        .withMessage("-1: Expecting intervalSeconds > 0");
+  }
+
+  @Test
+  void builderWithInvalidTimeoutSeconds() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> ExporterOpenTelemetryProperties.builder().timeoutSeconds(0))
+        .withMessage("0: Expecting timeoutSeconds > 0");
+
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> ExporterOpenTelemetryProperties.builder().timeoutSeconds(-1))
+        .withMessage("-1: Expecting timeoutSeconds > 0");
+  }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPropertiesTest.java
index dec9e03a5..2f912ff77 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPropertiesTest.java
@@ -15,8 +15,8 @@ void load() {
         load(
             new HashMap<>(
                 Map.of(
-                    "io.prometheus.exporter.includeCreatedTimestamps", "true",
-                    "io.prometheus.exporter.exemplarsOnAllMetricTypes", "true")));
+                    "io.prometheus.exporter.include_created_timestamps", "true",
+                    "io.prometheus.exporter.exemplars_on_all_metric_types", "true")));
     assertThat(properties.getIncludeCreatedTimestamps()).isTrue();
     assertThat(properties.getExemplarsOnAllMetricTypes()).isTrue();
 
@@ -25,23 +25,23 @@ void load() {
             () ->
                 load(
                     new HashMap<>(
-                        Map.of("io.prometheus.exporter.includeCreatedTimestamps", "invalid"))))
+                        Map.of("io.prometheus.exporter.include_created_timestamps", "invalid"))))
         .withMessage(
-            "io.prometheus.exporter.includeCreatedTimestamps: Expecting 'true' or 'false'. Found:"
-                + " invalid");
+            "io.prometheus.exporter.include_created_timestamps: Expecting 'true' or 'false'.");
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(
             () ->
                 load(
                     new HashMap<>(
-                        Map.of("io.prometheus.exporter.exemplarsOnAllMetricTypes", "invalid"))))
+                        Map.of("io.prometheus.exporter.exemplars_on_all_metric_types", "invalid"))))
         .withMessage(
-            "io.prometheus.exporter.exemplarsOnAllMetricTypes: Expecting 'true' or 'false'. Found:"
-                + " invalid");
+            "io.prometheus.exporter.exemplars_on_all_metric_types: Expecting 'true' or 'false'.");
   }
 
   private static ExporterProperties load(Map<String, String> map) {
-    return ExporterProperties.load(new HashMap<>(map));
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return ExporterProperties.load(propertySource);
   }
 
   @Test
@@ -54,5 +54,34 @@ void builder() {
             .build();
     assertThat(properties.getIncludeCreatedTimestamps()).isTrue();
     assertThat(properties.getExemplarsOnAllMetricTypes()).isTrue();
+    assertThat(properties.getPrometheusTimestampsInMs()).isFalse();
+  }
+
+  @Test
+  void defaultValues() {
+    ExporterProperties properties = ExporterProperties.builder().build();
+    assertThat(properties.getIncludeCreatedTimestamps()).isFalse();
+    assertThat(properties.getExemplarsOnAllMetricTypes()).isFalse();
+    assertThat(properties.getPrometheusTimestampsInMs()).isFalse();
+  }
+
+  @Test
+  void prometheusTimestampsInMs() {
+    ExporterProperties properties =
+        ExporterProperties.builder().prometheusTimestampsInMs(true).build();
+    assertThat(properties.getPrometheusTimestampsInMs()).isTrue();
+
+    properties =
+        load(new HashMap<>(Map.of("io.prometheus.exporter.prometheus_timestamps_in_ms", "true")));
+    assertThat(properties.getPrometheusTimestampsInMs()).isTrue();
+
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () ->
+                load(
+                    new HashMap<>(
+                        Map.of("io.prometheus.exporter.prometheus_timestamps_in_ms", "invalid"))))
+        .withMessage(
+            "io.prometheus.exporter.prometheus_timestamps_in_ms: Expecting 'true' or 'false'.");
   }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPushgatewayPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPushgatewayPropertiesTest.java
index e1e06348a..4715662f3 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPushgatewayPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/ExporterPushgatewayPropertiesTest.java
@@ -27,11 +27,57 @@ void load() {
         .isThrownBy(() -> load(Map.of("io.prometheus.exporter.pushgateway.scheme", "foo")))
         .withMessage(
             "io.prometheus.exporter.pushgateway.scheme: Illegal value. Expecting 'http' or 'https'."
-                + " Found: foo");
+                + "");
+  }
+
+  @Test
+  void loadWithHttps() {
+    ExporterPushgatewayProperties properties =
+        load(Map.of("io.prometheus.exporter.pushgateway.scheme", "https"));
+    assertThat(properties.getScheme()).isEqualTo("https");
+  }
+
+  @Test
+  void loadWithEscapingSchemes() {
+    ExporterPushgatewayProperties properties =
+        load(Map.of("io.prometheus.exporter.pushgateway.escaping_scheme", "allow-utf-8"));
+    assertThat(properties.getEscapingScheme()).isEqualTo(EscapingScheme.ALLOW_UTF8);
+
+    properties = load(Map.of("io.prometheus.exporter.pushgateway.escaping_scheme", "values"));
+    assertThat(properties.getEscapingScheme()).isEqualTo(EscapingScheme.VALUE_ENCODING_ESCAPING);
+
+    properties = load(Map.of("io.prometheus.exporter.pushgateway.escaping_scheme", "underscores"));
+    assertThat(properties.getEscapingScheme()).isEqualTo(EscapingScheme.UNDERSCORE_ESCAPING);
+
+    properties = load(Map.of("io.prometheus.exporter.pushgateway.escaping_scheme", "dots"));
+    assertThat(properties.getEscapingScheme()).isEqualTo(EscapingScheme.DOTS_ESCAPING);
+  }
+
+  @Test
+  void loadWithInvalidEscapingScheme() {
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () -> load(Map.of("io.prometheus.exporter.pushgateway.escaping_scheme", "invalid")))
+        .withMessage(
+            "io.prometheus.exporter.pushgateway.escaping_scheme: Illegal value. Expecting"
+                + " 'allow-utf-8', 'values', 'underscores', or 'dots'.");
+  }
+
+  @Test
+  void loadWithTimeouts() {
+    ExporterPushgatewayProperties properties =
+        load(
+            Map.of(
+                "io.prometheus.exporter.pushgateway.connect_timeout_seconds", "5",
+                "io.prometheus.exporter.pushgateway.read_timeout_seconds", "10"));
+    assertThat(properties.getConnectTimeout()).isEqualTo(Duration.ofSeconds(5));
+    assertThat(properties.getReadTimeout()).isEqualTo(Duration.ofSeconds(10));
   }
 
   private static ExporterPushgatewayProperties load(Map<String, String> map) {
-    return ExporterPushgatewayProperties.load(new HashMap<>(map));
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return ExporterPushgatewayProperties.load(propertySource);
   }
 
   @Test
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/MetricsPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/MetricsPropertiesTest.java
index 4f4c56755..9f7684a8d 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/MetricsPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/MetricsPropertiesTest.java
@@ -47,17 +47,17 @@ void builder() {
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().summaryNumberOfAgeBuckets(0).build())
-        .withMessage(".summaryNumberOfAgeBuckets: Expecting value > 0. Found: 0");
+        .withMessage("summary_number_of_age_buckets: Expecting value > 0. Found: 0");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().summaryQuantiles(2L).build())
-        .withMessage(".summaryQuantiles: Expecting 0.0 <= quantile <= 1.0. Found: 2.0");
+        .withMessage(".summary_quantiles: Expecting 0.0 <= quantile <= 1.0. Found: 2.0");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().summaryQuantileErrors(0.9).build())
         .withMessage(
-            ".summaryQuantileErrors: Can't configure summaryQuantileErrors without configuring"
-                + " summaryQuantiles");
+            ".summary_quantile_errors: Can't configure summary_quantile_errors without configuring"
+                + " summary_quantiles");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(
@@ -66,7 +66,7 @@ void builder() {
                     .summaryQuantiles(0.1)
                     .summaryQuantileErrors(0.1, 0.9)
                     .build())
-        .withMessage(".summaryQuantileErrors: must have the same length as summaryQuantiles");
+        .withMessage("summary_quantile_errors: must have the same length as summary_quantiles");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(
@@ -75,7 +75,7 @@ void builder() {
                     .summaryQuantiles(0.1)
                     .summaryQuantileErrors(-0.9)
                     .build())
-        .withMessage(".summaryQuantileErrors: Expecting 0.0 <= error <= 1.0");
+        .withMessage("summary_quantile_errors: Expecting 0.0 <= error <= 1.0");
   }
 
   @Test
@@ -114,24 +114,24 @@ void nativeBuilder() {
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().histogramNativeInitialSchema(10).build())
         .withMessage(
-            ".histogramNativeInitialSchema: Expecting number between -4 and +8. Found: 10");
+            "histogram_native_initial_schema: Expecting number between -4 and +8. Found: 10");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().histogramNativeMinZeroThreshold(-1.0).build())
-        .withMessage(".histogramNativeMinZeroThreshold: Expecting value >= 0. Found: -1.0");
+        .withMessage("histogram_native_min_zero_threshold: Expecting value >= 0. Found: -1.0");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().histogramNativeMaxZeroThreshold(-1.0).build())
-        .withMessage(".histogramNativeMaxZeroThreshold: Expecting value >= 0. Found: -1.0");
+        .withMessage("histogram_native_max_zero_threshold: Expecting value >= 0. Found: -1.0");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(() -> MetricsProperties.builder().histogramNativeMaxNumberOfBuckets(-1).build())
-        .withMessage(".histogramNativeMaxNumberOfBuckets: Expecting value >= 0. Found: -1");
+        .withMessage("histogram_native_max_number_of_buckets: Expecting value >= 0. Found: -1");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(
             () -> MetricsProperties.builder().histogramNativeResetDurationSeconds(-1L).build())
-        .withMessage(".histogramNativeResetDurationSeconds: Expecting value >= 0. Found: -1");
+        .withMessage("histogram_native_reset_duration_seconds: Expecting value >= 0. Found: -1");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(
@@ -140,7 +140,7 @@ void nativeBuilder() {
                     .histogramNativeOnly(true)
                     .histogramClassicOnly(true)
                     .build())
-        .withMessage(".histogramNativeOnly and .histogramClassicOnly cannot both be true");
+        .withMessage(".histogram_native_only and .histogram_classic_only cannot both be true");
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
         .isThrownBy(
@@ -150,7 +150,7 @@ void nativeBuilder() {
                     .histogramNativeMaxZeroThreshold(0.01)
                     .build())
         .withMessage(
-            ".histogramNativeMinZeroThreshold cannot be greater than"
-                + " .histogramNativeMaxZeroThreshold");
+            ".histogram_native_min_zero_threshold cannot be greater than"
+                + " .histogram_native_max_zero_threshold");
   }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/OpenMetrics2PropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/OpenMetrics2PropertiesTest.java
new file mode 100644
index 000000000..0546a138f
--- /dev/null
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/OpenMetrics2PropertiesTest.java
@@ -0,0 +1,125 @@
+package io.prometheus.metrics.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class OpenMetrics2PropertiesTest {
+
+  @Test
+  void load() {
+    OpenMetrics2Properties properties =
+        load(
+            new HashMap<>(
+                Map.of(
+                    "io.prometheus.openmetrics2.enabled",
+                    "true",
+                    "io.prometheus.openmetrics2.content_negotiation",
+                    "true",
+                    "io.prometheus.openmetrics2.composite_values",
+                    "true",
+                    "io.prometheus.openmetrics2.exemplar_compliance",
+                    "true",
+                    "io.prometheus.openmetrics2.native_histograms",
+                    "true")));
+    assertThat(properties.getEnabled()).isTrue();
+    assertThat(properties.getContentNegotiation()).isTrue();
+    assertThat(properties.getCompositeValues()).isTrue();
+    assertThat(properties.getExemplarCompliance()).isTrue();
+    assertThat(properties.getNativeHistograms()).isTrue();
+  }
+
+  @Test
+  void loadInvalidValue() {
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () -> load(new HashMap<>(Map.of("io.prometheus.openmetrics2.enabled", "invalid"))))
+        .withMessage("io.prometheus.openmetrics2.enabled: Expecting 'true' or 'false'.");
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () ->
+                load(
+                    new HashMap<>(
+                        Map.of("io.prometheus.openmetrics2.content_negotiation", "invalid"))))
+        .withMessage(
+            "io.prometheus.openmetrics2.content_negotiation: Expecting 'true' or 'false'.");
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () ->
+                load(
+                    new HashMap<>(
+                        Map.of("io.prometheus.openmetrics2.composite_values", "invalid"))))
+        .withMessage("io.prometheus.openmetrics2.composite_values: Expecting 'true' or 'false'.");
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () ->
+                load(
+                    new HashMap<>(
+                        Map.of("io.prometheus.openmetrics2.exemplar_compliance", "invalid"))))
+        .withMessage(
+            "io.prometheus.openmetrics2.exemplar_compliance: Expecting 'true' or 'false'.");
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(
+            () ->
+                load(
+                    new HashMap<>(
+                        Map.of("io.prometheus.openmetrics2.native_histograms", "invalid"))))
+        .withMessage("io.prometheus.openmetrics2.native_histograms: Expecting 'true' or 'false'.");
+  }
+
+  private static OpenMetrics2Properties load(Map<String, String> map) {
+    Map<Object, Object> regularProperties = new HashMap<>(map);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    return OpenMetrics2Properties.load(propertySource);
+  }
+
+  @Test
+  void builder() {
+    OpenMetrics2Properties properties =
+        OpenMetrics2Properties.builder()
+            .enabled(true)
+            .contentNegotiation(true)
+            .compositeValues(false)
+            .exemplarCompliance(true)
+            .nativeHistograms(false)
+            .build();
+    assertThat(properties.getEnabled()).isTrue();
+    assertThat(properties.getContentNegotiation()).isTrue();
+    assertThat(properties.getCompositeValues()).isFalse();
+    assertThat(properties.getExemplarCompliance()).isTrue();
+    assertThat(properties.getNativeHistograms()).isFalse();
+  }
+
+  @Test
+  void builderEnableAll() {
+    OpenMetrics2Properties properties = OpenMetrics2Properties.builder().enableAll().build();
+    assertThat(properties.getEnabled()).isTrue();
+    assertThat(properties.getContentNegotiation()).isTrue();
+    assertThat(properties.getCompositeValues()).isTrue();
+    assertThat(properties.getExemplarCompliance()).isTrue();
+    assertThat(properties.getNativeHistograms()).isTrue();
+  }
+
+  @Test
+  void defaultValues() {
+    OpenMetrics2Properties properties = OpenMetrics2Properties.builder().build();
+    assertThat(properties.getEnabled()).isFalse();
+    assertThat(properties.getContentNegotiation()).isFalse();
+    assertThat(properties.getCompositeValues()).isFalse();
+    assertThat(properties.getExemplarCompliance()).isFalse();
+    assertThat(properties.getNativeHistograms()).isFalse();
+  }
+
+  @Test
+  void partialConfiguration() {
+    OpenMetrics2Properties properties =
+        OpenMetrics2Properties.builder().contentNegotiation(true).compositeValues(true).build();
+    assertThat(properties.getContentNegotiation()).isTrue();
+    assertThat(properties.getCompositeValues()).isTrue();
+    assertThat(properties.getExemplarCompliance()).isFalse();
+    assertThat(properties.getNativeHistograms()).isFalse();
+  }
+}
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesLoaderTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesLoaderTest.java
index cf4933acf..8f910cceb 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesLoaderTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesLoaderTest.java
@@ -3,6 +3,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.SetSystemProperty;
@@ -11,7 +13,7 @@
 class PrometheusPropertiesLoaderTest {
 
   @Test
-  public void propertiesShouldBeLoadedFromPropertiesFile() {
+  void propertiesShouldBeLoadedFromPropertiesFile() {
     PrometheusProperties prometheusProperties = PrometheusPropertiesLoader.load();
     assertThat(prometheusProperties.getDefaultMetricProperties().getHistogramClassicUpperBounds())
         .hasSize(11);
@@ -28,23 +30,19 @@ public void propertiesShouldBeLoadedFromPropertiesFile() {
   @SetSystemProperty(key = "prometheus.config", value = "nonexistent.properties")
   void cantLoadPropertiesFile() {
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(
-            () -> {
-              PrometheusPropertiesLoader.load(new Properties());
-            })
-        .withMessage(
-            "Failed to read Prometheus properties from nonexistent.properties:"
-                + " nonexistent.properties");
+        .isThrownBy(() -> PrometheusPropertiesLoader.load(new Properties()))
+        .withMessage("Failed to read Prometheus properties file.")
+        .withMessageNotContaining("nonexistent.properties");
   }
 
   @Test
-  public void externalPropertiesShouldOverridePropertiesFile() {
+  void externalPropertiesShouldOverridePropertiesFile() {
     Properties properties = new Properties();
-    properties.setProperty("io.prometheus.metrics.histogramClassicUpperBounds", ".005, .01");
+    properties.setProperty("io.prometheus.metrics.histogram_classic_upper_bounds", ".005, .01");
     properties.setProperty(
-        "io.prometheus.metrics.http_duration_seconds.histogramClassicUpperBounds",
+        "io.prometheus.metrics.http_duration_seconds.histogram_classic_upper_bounds",
         ".005, .01, .015");
-    properties.setProperty("io.prometheus.exporter.exemplarsOnAllMetricTypes", "false");
+    properties.setProperty("io.prometheus.exporter.exemplars_on_all_metric_types", "false");
 
     PrometheusProperties prometheusProperties = PrometheusPropertiesLoader.load(properties);
     assertThat(prometheusProperties.getDefaultMetricProperties().getHistogramClassicUpperBounds())
@@ -57,4 +55,148 @@ public void externalPropertiesShouldOverridePropertiesFile() {
     assertThat(prometheusProperties.getExporterProperties().getExemplarsOnAllMetricTypes())
         .isFalse();
   }
+
+  @Test
+  void environmentVariablesShouldConfigureMetrics() {
+    // Simulate environment variables as they would be loaded
+    Map<Object, Object> envVarProperties = new HashMap<>();
+    envVarProperties.put(
+        "io_prometheus_metrics_http_duration_seconds_histogram_classic_upper_bounds",
+        ".001, .005, .01");
+    envVarProperties.put("io_prometheus_metrics_exemplars_enabled", "false");
+
+    PropertySource propertySource =
+        new PropertySource(new HashMap<>(), envVarProperties, new HashMap<>());
+    PrometheusProperties.MetricPropertiesMap metricsConfigs =
+        PrometheusPropertiesLoader.loadMetricsConfigs(propertySource);
+
+    assertThat(metricsConfigs.get("http_duration_seconds").getHistogramClassicUpperBounds())
+        .hasSize(3)
+        .containsExactly(0.001, 0.005, 0.01);
+
+    MetricsProperties defaultMetrics =
+        MetricsProperties.load("io.prometheus.metrics", propertySource);
+    assertThat(defaultMetrics.getExemplarsEnabled()).isFalse();
+  }
+
+  @Test
+  void environmentVariablesShouldHandleSnakeCaseMetricNames() {
+    // Simulate environment variable for metric with snake_case name
+    Map<Object, Object> envVarProperties = new HashMap<>();
+    envVarProperties.put("io_prometheus_metrics_http_server_histogram_native_only", "true");
+
+    PropertySource propertySource =
+        new PropertySource(new HashMap<>(), envVarProperties, new HashMap<>());
+    PrometheusProperties.MetricPropertiesMap metricsConfigs =
+        PrometheusPropertiesLoader.loadMetricsConfigs(propertySource);
+
+    assertThat(metricsConfigs.get("http_server").getHistogramNativeOnly()).isTrue();
+  }
+
+  @Test
+  void environmentVariablesShouldHandleMultipleSnakeCaseSegments() {
+    // Simulate environment variable for metric with multiple snake_case segments
+    Map<Object, Object> envVarProperties = new HashMap<>();
+    envVarProperties.put("io_prometheus_metrics_my_custom_metric_histogram_native_only", "true");
+
+    PropertySource propertySource =
+        new PropertySource(new HashMap<>(), envVarProperties, new HashMap<>());
+    PrometheusProperties.MetricPropertiesMap metricsConfigs =
+        PrometheusPropertiesLoader.loadMetricsConfigs(propertySource);
+
+    assertThat(metricsConfigs.get("my_custom_metric").getHistogramNativeOnly()).isTrue();
+  }
+
+  @Test
+  void environmentVariablesShouldHandleMetricNamesContainingPropertyKeywords() {
+    // Metric names can contain words like "summary" or "histogram"
+    // This should not confuse the parser
+    Map<Object, Object> envVarProperties = new HashMap<>();
+    envVarProperties.put("io_prometheus_metrics_my_summary_metric_histogram_native_only", "true");
+    envVarProperties.put(
+        "io_prometheus_metrics_histogram_processor_summary_quantiles", "0.5, 0.95");
+
+    PropertySource propertySource =
+        new PropertySource(new HashMap<>(), envVarProperties, new HashMap<>());
+    PrometheusProperties.MetricPropertiesMap metricsConfigs =
+        PrometheusPropertiesLoader.loadMetricsConfigs(propertySource);
+
+    assertThat(metricsConfigs.get("my_summary_metric").getHistogramNativeOnly()).isTrue();
+    assertThat(metricsConfigs.get("histogram_processor").getSummaryQuantiles())
+        .containsExactly(0.5, 0.95);
+  }
+
+  @Test
+  void regularPropertiesShouldHandleComplexMetricNames() {
+    // Test that suffix-based matching works correctly for regular properties
+    // Metric names already use underscores (exposition format)
+    Properties properties = new Properties();
+    properties.setProperty(
+        "io.prometheus.metrics.http_server_requests_total.histogram_native_only", "true");
+    properties.setProperty(
+        "io.prometheus.metrics.my_app_custom_metric.summary_quantiles", "0.5, 0.99");
+
+    PropertySource propertySource = new PropertySource(properties);
+    PrometheusProperties.MetricPropertiesMap metricsConfigs =
+        PrometheusPropertiesLoader.loadMetricsConfigs(propertySource);
+
+    assertThat(metricsConfigs.get("http_server_requests_total").getHistogramNativeOnly()).isTrue();
+    assertThat(metricsConfigs.get("my_app_custom_metric").getSummaryQuantiles())
+        .containsExactly(0.5, 0.99);
+  }
+
+  @Test
+  void normalizePropertyKeyShouldConvertCamelCaseToSnakeCase() {
+    // Test that camelCase keys are correctly converted to snake_case for backward compatibility
+    assertThat(
+            PrometheusPropertiesLoader.normalizePropertyKey(
+                "io.prometheus.exporter.httpServer.port"))
+        .isEqualTo("io.prometheus.exporter.http_server.port");
+    assertThat(
+            PrometheusPropertiesLoader.normalizePropertyKey(
+                "io.prometheus.metrics.exemplarsEnabled"))
+        .isEqualTo("io.prometheus.metrics.exemplars_enabled");
+    assertThat(
+            PrometheusPropertiesLoader.normalizePropertyKey(
+                "io.prometheus.exporter.openTelemetry.serviceName"))
+        .isEqualTo("io.prometheus.exporter.open_telemetry.service_name");
+
+    // Test that snake_case keys remain unchanged
+    assertThat(
+            PrometheusPropertiesLoader.normalizePropertyKey(
+                "io.prometheus.exporter.http_server.port"))
+        .isEqualTo("io.prometheus.exporter.http_server.port");
+    assertThat(
+            PrometheusPropertiesLoader.normalizePropertyKey(
+                "io.prometheus.metrics.exemplars_enabled"))
+        .isEqualTo("io.prometheus.metrics.exemplars_enabled");
+  }
+
+  @Test
+  void environmentVariablesShouldHaveCorrectPrecedence() {
+    // Test that environment variables override system properties and files,
+    // but are overridden by external properties
+    Properties fileProperties = new Properties();
+    fileProperties.setProperty("io.prometheus.metrics.histogram_native_only", "false");
+
+    Map<Object, Object> envVarProperties = new HashMap<>();
+    envVarProperties.put("io_prometheus_metrics_histogram_native_only", "true");
+
+    Map<Object, Object> externalProperties = new HashMap<>();
+    externalProperties.put("io.prometheus.metrics.histogram_native_only", "false");
+
+    // Test that env vars override file properties
+    PropertySource propertySourceWithEnv =
+        new PropertySource(new HashMap<>(), envVarProperties, fileProperties);
+    MetricsProperties metricsWithEnv =
+        MetricsProperties.load("io.prometheus.metrics", propertySourceWithEnv);
+    assertThat(metricsWithEnv.getHistogramNativeOnly()).isTrue();
+
+    // Test that external properties override env vars
+    PropertySource propertySourceWithExternal =
+        new PropertySource(externalProperties, envVarProperties, fileProperties);
+    MetricsProperties metricsWithExternal =
+        MetricsProperties.load("io.prometheus.metrics", propertySourceWithExternal);
+    assertThat(metricsWithExternal.getHistogramNativeOnly()).isFalse();
+  }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesTest.java
index d0205b28e..2c6e11daf 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/PrometheusPropertiesTest.java
@@ -6,13 +6,14 @@
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Properties;
 import org.junit.jupiter.api.Test;
 
 class PrometheusPropertiesTest {
 
   @Test
-  public void testPrometheusConfig() {
+  void testPrometheusConfig() {
     PrometheusProperties result = PrometheusProperties.get();
     assertThat(result.getDefaultMetricProperties().getHistogramClassicUpperBounds()).hasSize(11);
     assertThat(result.getMetricProperties("http_duration_seconds").getHistogramClassicUpperBounds())
@@ -20,7 +21,7 @@ public void testPrometheusConfig() {
   }
 
   @Test
-  public void testEmptyUpperBounds() throws IOException {
+  void testEmptyUpperBounds() throws IOException {
     Properties properties = new Properties();
     try (InputStream stream =
         Thread.currentThread()
@@ -29,12 +30,14 @@ public void testEmptyUpperBounds() throws IOException {
       properties.load(stream);
     }
     assertThat(properties).hasSize(1);
-    MetricsProperties.load("io.prometheus.metrics", properties);
-    assertThat(properties).isEmpty();
+    Map<Object, Object> regularProperties = new HashMap<>(properties);
+    PropertySource propertySource = new PropertySource(regularProperties);
+    MetricsProperties.load("io.prometheus.metrics", propertySource);
+    assertThat(regularProperties).isEmpty();
   }
 
   @Test
-  public void testBuilder() {
+  void testBuilder() {
     PrometheusProperties defaults = PrometheusPropertiesLoader.load(new HashMap<>());
     PrometheusProperties.Builder builder = PrometheusProperties.builder();
     builder.defaultMetricsProperties(defaults.getDefaultMetricProperties());
@@ -67,4 +70,121 @@ public void testBuilder() {
     assertThat(result.getMetricProperties("unknown_metric")).isNull();
     assertThat(result.getExporterProperties()).isSameAs(defaults.getExporterProperties());
   }
+
+  @Test
+  void testMetricNameNormalization() {
+    PrometheusProperties.Builder builder = PrometheusProperties.builder();
+    MetricsProperties customProps =
+        MetricsProperties.builder().histogramClassicUpperBounds(0.1, 0.5).build();
+
+    // Test that metric names with dots are normalized to underscores
+    builder.putMetricProperty("my.metric.name", customProps);
+    PrometheusProperties result = builder.build();
+
+    // Should be able to retrieve with dots
+    assertThat(result.getMetricProperties("my.metric.name")).isSameAs(customProps);
+    // Should also be able to retrieve with underscores
+    assertThat(result.getMetricProperties("my_metric_name")).isSameAs(customProps);
+  }
+
+  @Test
+  void testMetricNameWithInvalidCharacters() {
+    PrometheusProperties.Builder builder = PrometheusProperties.builder();
+    MetricsProperties customProps =
+        MetricsProperties.builder().histogramClassicUpperBounds(0.1, 0.5).build();
+
+    // Test that invalid characters are converted to underscores
+    builder.putMetricProperty("metric-name@with#invalid$chars", customProps);
+    PrometheusProperties result = builder.build();
+
+    // Should normalize invalid characters to underscores
+    assertThat(result.getMetricProperties("metric-name@with#invalid$chars")).isSameAs(customProps);
+    assertThat(result.getMetricProperties("metric_name_with_invalid_chars")).isSameAs(customProps);
+  }
+
+  @Test
+  void testMetricNameWithValidCharacters() {
+    PrometheusProperties.Builder builder = PrometheusProperties.builder();
+    MetricsProperties customProps =
+        MetricsProperties.builder().histogramClassicUpperBounds(0.1, 0.5).build();
+
+    // Test valid characters: letters, numbers (not at start), underscore, colon
+    builder.putMetricProperty("my_metric:name123", customProps);
+    PrometheusProperties result = builder.build();
+
+    assertThat(result.getMetricProperties("my_metric:name123")).isSameAs(customProps);
+  }
+
+  @Test
+  void testMetricNameStartingWithNumber() {
+    PrometheusProperties.Builder builder = PrometheusProperties.builder();
+    MetricsProperties customProps =
+        MetricsProperties.builder().histogramClassicUpperBounds(0.1, 0.5).build();
+
+    // First digit is invalid (i=0), but subsequent digits are valid (i>0)
+    builder.putMetricProperty("123metric", customProps);
+    PrometheusProperties result = builder.build();
+
+    assertThat(result.getMetricProperties("123metric")).isSameAs(customProps);
+    assertThat(result.getMetricProperties("_23metric")).isSameAs(customProps);
+  }
+
+  @Test
+  void testOpenMetrics2ConsumerPattern() {
+    PrometheusProperties config =
+        PrometheusProperties.builder()
+            .enableOpenMetrics2(om2 -> om2.contentNegotiation(true).compositeValues(false))
+            .build();
+    assertThat(config.getOpenMetrics2Properties().getContentNegotiation()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getCompositeValues()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getExemplarCompliance()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getNativeHistograms()).isFalse();
+  }
+
+  @Test
+  void testOpenMetrics2EnableAll() {
+    PrometheusProperties config =
+        PrometheusProperties.builder()
+            .enableOpenMetrics2(OpenMetrics2Properties.Builder::enableAll)
+            .build();
+    assertThat(config.getOpenMetrics2Properties().getContentNegotiation()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getCompositeValues()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getExemplarCompliance()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getNativeHistograms()).isTrue();
+  }
+
+  @Test
+  void testOpenMetrics2DirectAssignment() {
+    OpenMetrics2Properties om2Props =
+        OpenMetrics2Properties.builder().contentNegotiation(true).nativeHistograms(true).build();
+    PrometheusProperties config =
+        PrometheusProperties.builder().openMetrics2Properties(om2Props).build();
+    assertThat(config.getOpenMetrics2Properties().getContentNegotiation()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getCompositeValues()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getExemplarCompliance()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getNativeHistograms()).isTrue();
+  }
+
+  @Test
+  void testOpenMetrics2Defaults() {
+    PrometheusProperties config = PrometheusProperties.builder().build();
+    assertThat(config.getOpenMetrics2Properties().getContentNegotiation()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getCompositeValues()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getExemplarCompliance()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getNativeHistograms()).isFalse();
+  }
+
+  @Test
+  void testOpenMetrics2PropertiesLoading() {
+    Map<Object, Object> properties = new HashMap<>();
+    properties.put("io.prometheus.openmetrics2.content_negotiation", "true");
+    properties.put("io.prometheus.openmetrics2.composite_values", "false");
+    properties.put("io.prometheus.openmetrics2.exemplar_compliance", "true");
+    properties.put("io.prometheus.openmetrics2.native_histograms", "false");
+    PrometheusProperties config = PrometheusPropertiesLoader.load(properties);
+    assertThat(config.getOpenMetrics2Properties().getContentNegotiation()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getCompositeValues()).isFalse();
+    assertThat(config.getOpenMetrics2Properties().getExemplarCompliance()).isTrue();
+    assertThat(config.getOpenMetrics2Properties().getNativeHistograms()).isFalse();
+  }
 }
diff --git a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/UtilTest.java b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/UtilTest.java
index 23ffbd33b..c3ed65ec7 100644
--- a/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/UtilTest.java
+++ b/prometheus-metrics-config/src/test/java/io/prometheus/metrics/config/UtilTest.java
@@ -11,40 +11,58 @@
 class UtilTest {
   @Test
   void loadOptionalDuration_positive() {
-    Map<Object, Object> properties = new HashMap<>(Map.of("foo", "5"));
+    Map<Object, Object> regularProperties = new HashMap<>(Map.of("foo", "5"));
+    PropertySource propertySource = new PropertySource(regularProperties);
 
-    assertThat(Util.loadOptionalDuration("foo", properties)).isEqualTo(Duration.ofSeconds(5));
+    assertThat(Util.loadOptionalDuration("", "foo", propertySource))
+        .isEqualTo(Duration.ofSeconds(5));
   }
 
   @Test
   void loadOptionalDuration_zero() {
-    Map<Object, Object> properties = new HashMap<>(Map.of("foo", "0"));
+    Map<Object, Object> regularProperties = new HashMap<>(Map.of("foo", "0"));
+    PropertySource propertySource = new PropertySource(regularProperties);
 
-    assertThat(Util.loadOptionalDuration("foo", properties)).isNull();
+    assertThat(Util.loadOptionalDuration("", "foo", propertySource)).isNull();
   }
 
   @Test
   void loadOptionalDuration_missing() {
-    Map<Object, Object> properties = new HashMap<>();
+    Map<Object, Object> regularProperties = new HashMap<>();
+    PropertySource propertySource = new PropertySource(regularProperties);
 
-    assertThat(Util.loadOptionalDuration("foo", properties)).isNull();
+    assertThat(Util.loadOptionalDuration("", "foo", propertySource)).isNull();
   }
 
   @Test
   void loadOptionalDuration_negative_throws() {
-    Map<Object, Object> properties = new HashMap<>(Map.of("foo", "-1"));
+    Map<Object, Object> regularProperties = new HashMap<>(Map.of("foo", "-1"));
+    PropertySource propertySource = new PropertySource(regularProperties);
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(() -> Util.loadOptionalDuration("foo", properties))
+        .isThrownBy(() -> Util.loadOptionalDuration("", "foo", propertySource))
         .withMessage("foo: Expecting value >= 0. Found: -1");
   }
 
   @Test
   void loadOptionalDuration_invalidNumber_throws() {
-    Map<Object, Object> properties = new HashMap<>(Map.of("foo", "abc"));
+    Map<Object, Object> regularProperties = new HashMap<>(Map.of("foo", "abc"));
+    PropertySource propertySource = new PropertySource(regularProperties);
 
     assertThatExceptionOfType(PrometheusPropertiesException.class)
-        .isThrownBy(() -> Util.loadOptionalDuration("foo", properties))
-        .withMessage("foo=abc: Expecting long value");
+        .isThrownBy(() -> Util.loadOptionalDuration("", "foo", propertySource))
+        .withMessage("foo: Expecting long value");
+  }
+
+  @Test
+  void invalidValueMessageRedactsRawValue() {
+    String secret = "bad\n\"secret-value";
+    Map<Object, Object> regularProperties = new HashMap<>(Map.of("foo", secret));
+    PropertySource propertySource = new PropertySource(regularProperties);
+
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(() -> Util.loadBoolean("", "foo", propertySource))
+        .withMessage("foo: Expecting 'true' or 'false'.")
+        .withMessageNotContaining(secret);
   }
 }
diff --git a/prometheus-metrics-config/src/test/resources/emptyUpperBounds.properties b/prometheus-metrics-config/src/test/resources/emptyUpperBounds.properties
index c019761ca..d8c1a3515 100644
--- a/prometheus-metrics-config/src/test/resources/emptyUpperBounds.properties
+++ b/prometheus-metrics-config/src/test/resources/emptyUpperBounds.properties
@@ -1 +1 @@
-io.prometheus.metrics.histogramClassicUpperBounds =,
+io.prometheus.metrics.histogram_classic_upper_bounds =,
diff --git a/prometheus-metrics-config/src/test/resources/prometheus.properties b/prometheus-metrics-config/src/test/resources/prometheus.properties
index 13a5d9e39..e5469803f 100644
--- a/prometheus-metrics-config/src/test/resources/prometheus.properties
+++ b/prometheus-metrics-config/src/test/resources/prometheus.properties
@@ -1,26 +1,26 @@
-io.prometheus.metrics.histogramClassicUpperBounds = .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10
-io.prometheus.metrics.http_duration_seconds.histogramClassicUpperBounds = .005, .01, .015, .02
-io.prometheus.metrics.summaryQuantiles = 0.5, 0.95, 0.99
-io.prometheus.metrics.summaryQuantileErrors = 0.01, 0.01, 0.001
+io.prometheus.metrics.histogram_classic_upper_bounds = .005, .01, .025, .05, .1, .25, .5, 1, 2.5, 5, 10
+io.prometheus.metrics.http_duration_seconds.histogram_classic_upper_bounds = .005, .01, .015, .02
+io.prometheus.metrics.summary_quantiles = 0.5, 0.95, 0.99
+io.prometheus.metrics.summary_quantile_errors = 0.01, 0.01, 0.001
 
-io.prometheus.metrics.exemplarsEnabled = true
-io.prometheus.metrics.http_duration_seconds.exemplarsEnabled = true
+io.prometheus.metrics.exemplars_enabled = true
+io.prometheus.metrics.http_duration_seconds.exemplars_enabled = true
 
-io.prometheus.exporter.includeCreatedTimestamps = false
-io.prometheus.exporter.exemplarsOnAllMetricTypes = true
-io.prometheus.exporter.filter.metricNameMustBeEqualTo = a, b, c
+io.prometheus.exporter.include_created_timestamps = false
+io.prometheus.exporter.exemplars_on_all_metric_types = true
+io.prometheus.exporter.filter.metric_name_must_be_equal_to = a, b, c
 
 
-io.prometheus.exemplars.minRetentionPeriodSeconds = 30
-io.prometheus.exemplars.maxRetentionPeriodSeconds = 30
-io.prometheus.exemplars.sampleIntervalMilliseconds = 30
+io.prometheus.exemplars.min_retention_period_seconds = 30
+io.prometheus.exemplars.max_retention_period_seconds = 30
+io.prometheus.exemplars.sample_interval_milliseconds = 30
 
-io.prometheus.exporter.httpServer.port = 9000
+io.prometheus.exporter.http_server.port = 9000
 
 io.prometheus.exporter.opentelemetry.endpoint=http://localhost:4318
-io.prometheus.exporter.opentelemetry.intervalSeconds=30
-io.prometheus.exporter.opentelemetry.serviceName=hello-world-app
-io.prometheus.exporter.opentelemetry.serviceNamespace=prod
-io.prometheus.exporter.opentelemetry.serviceInstanceId=localhost:8081
+io.prometheus.exporter.opentelemetry.interval_seconds=30
+io.prometheus.exporter.opentelemetry.service_name=hello-world-app
+io.prometheus.exporter.opentelemetry.service_namespace=prod
+io.prometheus.exporter.opentelemetry.service_instance_id=localhost:8081
 
-# io.prometheus.metrics.unusedLabelsRetentionTimeSeconds = 0
+# io.prometheus.metrics.unused_labels_retention_time_seconds = 0
diff --git a/prometheus-metrics-core/pom.xml b/prometheus-metrics-core/pom.xml
index 3a61050de..236a3d34a 100644
--- a/prometheus-metrics-core/pom.xml
+++ b/prometheus-metrics-core/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-core</artifactId>
@@ -22,6 +21,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-model</artifactId>
@@ -38,10 +43,10 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!-- test dependencies -->
+    <!-- test dependencies: use no-protobuf so tests get com.google.protobuf, not shaded -->
     <dependency>
       <groupId>io.prometheus</groupId>
-      <artifactId>prometheus-metrics-exposition-formats</artifactId>
+      <artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
@@ -51,5 +56,17 @@
       <version>3.6.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.awaitility</groupId>
+      <artifactId>awaitility</artifactId>
+      <version>${awaitility.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/CounterDataPoint.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/CounterDataPoint.java
index 7055d7565..4c5c2d28f 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/CounterDataPoint.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/CounterDataPoint.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.snapshots.Labels;
 
 /**
@@ -56,6 +57,7 @@
  * CounterDataPoint counterData = counterWithoutLabels;
  * }</pre>
  */
+@StableApi
 public interface CounterDataPoint extends DataPoint {
 
   /** Add one. */
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DataPoint.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DataPoint.java
index 5b6017ddf..cfdc84df3 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DataPoint.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DataPoint.java
@@ -1,3 +1,6 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
+
+@StableApi
 public interface DataPoint {}
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DistributionDataPoint.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DistributionDataPoint.java
index 0f2a072de..f87bede40 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DistributionDataPoint.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/DistributionDataPoint.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.snapshots.Labels;
 
 /**
@@ -17,6 +18,7 @@
  * <p>See JavaDoc of {@link CounterDataPoint} on how using data points directly can improve
  * performance.
  */
+@StableApi
 public interface DistributionDataPoint extends DataPoint, TimerApi {
 
   /** Get the count of observations. */
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/GaugeDataPoint.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/GaugeDataPoint.java
index eec0304c7..8d917985e 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/GaugeDataPoint.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/GaugeDataPoint.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.snapshots.Labels;
 
 /**
@@ -9,6 +10,7 @@
  * <p>See JavaDoc of {@link CounterDataPoint} on how using data points directly can improve
  * performance.
  */
+@StableApi
 public interface GaugeDataPoint extends DataPoint, TimerApi {
 
   /** Add one. */
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/StateSetDataPoint.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/StateSetDataPoint.java
index bf13b5214..f08876cae 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/StateSetDataPoint.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/StateSetDataPoint.java
@@ -1,11 +1,14 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 /**
  * Represents a single StateSet data point.
  *
  * <p>See JavaDoc of {@link CounterDataPoint} on how using data points directly can improve
  * performance.
  */
+@StableApi
 public interface StateSetDataPoint extends DataPoint {
 
   /**
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/Timer.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/Timer.java
index d860bfa08..ee302a4c5 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/Timer.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/Timer.java
@@ -1,10 +1,12 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.io.Closeable;
 import java.util.function.DoubleConsumer;
 
 /** Helper class for observing durations. */
+@StableApi
 public class Timer implements Closeable {
 
   private final DoubleConsumer observeFunction;
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/TimerApi.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/TimerApi.java
index 8267f7f78..00729503e 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/TimerApi.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/datapoints/TimerApi.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.datapoints;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
@@ -11,6 +12,7 @@
  * must use base units (e.g. seconds, bytes) and leave converting them to something more readable to
  * graphing tools".</i>
  */
+@StableApi
 public interface TimerApi {
 
   /**
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarLabelsSupplier.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarLabelsSupplier.java
new file mode 100644
index 000000000..672df100c
--- /dev/null
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarLabelsSupplier.java
@@ -0,0 +1,55 @@
+package io.prometheus.metrics.core.exemplars;
+
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.model.snapshots.Labels;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+import javax.annotation.Nullable;
+
+/**
+ * Global holder for a {@link Supplier} of additional {@link Labels} that are merged into every
+ * automatically-sampled Exemplar across the entire application.
+ *
+ * <p>This is the global counterpart to the per-metric {@code exemplarLabelsSupplier(...)} builder
+ * method. Registering a supplier here affects <em>all</em> metrics, including metrics registered by
+ * third-party libraries that the application does not control. This makes it the right tool when
+ * you cannot modify the code that creates the metrics.
+ *
+ * <p>The supplier is invoked on the metric hot path (rate-limited by the exemplar sampler), each
+ * time an Exemplar is sampled from a valid, sampled span context. It should therefore be cheap and
+ * non-blocking. It may return dynamic, request-scoped values, for example an identifier read from a
+ * thread-local:
+ *
+ * <pre>{@code
+ * ExemplarLabelsSupplier.setExemplarLabelsSupplier(
+ *     () -> Labels.of("management_id", currentManagementId()));
+ * }</pre>
+ *
+ * <p>Labels returned by the supplier that collide with {@code trace_id}/{@code span_id} (or, when a
+ * per-metric supplier is also configured, with that supplier's labels) are silently dropped rather
+ * than causing an error: the per-metric supplier takes precedence over the global one, and the
+ * reserved {@code trace_id}/{@code span_id} labels always win. If the supplier throws, the
+ * exception is swallowed and the Exemplar is created without the additional labels, so a
+ * misbehaving supplier never breaks metric collection.
+ */
+@StableApi
+public class ExemplarLabelsSupplier {
+
+  private static final AtomicReference<Supplier<Labels>> supplierRef = new AtomicReference<>();
+
+  private ExemplarLabelsSupplier() {}
+
+  /**
+   * Register a global supplier of additional exemplar labels. Pass {@code null} to remove a
+   * previously registered supplier. The most recently registered supplier wins.
+   */
+  public static void setExemplarLabelsSupplier(@Nullable Supplier<Labels> supplier) {
+    supplierRef.set(supplier);
+  }
+
+  /** Returns the registered global supplier, or {@code null} if none has been set. */
+  @Nullable
+  public static Supplier<Labels> getExemplarLabelsSupplier() {
+    return supplierRef.get();
+  }
+}
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSampler.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSampler.java
index 1219b2a09..202ffe019 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSampler.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSampler.java
@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.core.util.Scheduler;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Exemplars;
@@ -12,6 +13,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.LongSupplier;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -31,8 +33,14 @@
  *
  * <p>See {@link ExemplarSamplerConfig} for configuration options.
  */
+@StableApi
 public class ExemplarSampler {
 
+  @SuppressWarnings("ReferenceEquality")
+  private static boolean sameObject(Object left, Object right) {
+    return left == right;
+  }
+
   private final ExemplarSamplerConfig config;
   private final Exemplar[] exemplars;
   private final Exemplar[]
@@ -45,8 +53,10 @@ public class ExemplarSampler {
   private final SpanContext
       spanContext; // may be null, in that case SpanContextSupplier.getSpanContext() is used.
 
+  @Nullable private final Supplier<Labels> additionalLabelsSupplier;
+
   public ExemplarSampler(ExemplarSamplerConfig config) {
-    this(config, null);
+    this(config, null, null);
   }
 
   /**
@@ -58,10 +68,24 @@ public ExemplarSampler(ExemplarSamplerConfig config) {
    * SpanContextSupplier.getSpanContext()} is called to find a span context.
    */
   public ExemplarSampler(ExemplarSamplerConfig config, @Nullable SpanContext spanContext) {
+    this(config, spanContext, null);
+  }
+
+  /**
+   * Constructor that additionally accepts a supplier of labels to be merged into every
+   * automatically-sampled exemplar. The supplier is called each time an exemplar is sampled from a
+   * span context, so it can return dynamic values (e.g. a request-scoped identifier). The supplier
+   * is only called when a valid, sampled span context is present.
+   */
+  public ExemplarSampler(
+      ExemplarSamplerConfig config,
+      @Nullable SpanContext spanContext,
+      @Nullable Supplier<Labels> additionalLabelsSupplier) {
     this.config = config;
     this.exemplars = new Exemplar[config.getNumberOfExemplars()];
     this.customExemplars = new Exemplar[exemplars.length];
     this.spanContext = spanContext;
+    this.additionalLabelsSupplier = additionalLabelsSupplier;
   }
 
   public Exemplars collect() {
@@ -204,7 +228,7 @@ private long doObserveWithoutUpperBounds(double value) {
     int oldestIndex = -1;
     for (int i = 0; i < exemplars.length; i++) {
       Exemplar exemplar = exemplars[i];
-      if (exemplar != null && exemplar != smallest && exemplar != largest) {
+      if (exemplar != null && !sameObject(exemplar, smallest) && !sameObject(exemplar, largest)) {
         if (oldestTimestamp == 0 || exemplar.getTimestampMillis() < oldestTimestamp) {
           oldestTimestamp = exemplar.getTimestampMillis();
           oldestIndex = i;
@@ -320,7 +344,7 @@ private long durationUntilNextExemplarExpires(long now) {
 
   private long updateCustomExemplar(int index, double value, Labels labels, long now) {
     if (!labels.contains(Exemplar.TRACE_ID) && !labels.contains(Exemplar.SPAN_ID)) {
-      labels = labels.merge(doSampleExemplar());
+      labels = mergeLabels(labels, sampleTraceContextLabels());
     }
     customExemplars[index] =
         Exemplar.builder().value(value).labels(labels).timestampMillis(now).build();
@@ -339,6 +363,19 @@ private long updateExemplar(int index, double value, long now) {
   }
 
   private Labels doSampleExemplar() {
+    Labels labels = sampleTraceContextLabels();
+    if (labels.isEmpty()) {
+      return labels;
+    }
+    // Per-metric supplier first (more specific), then the global supplier. On a name
+    // collision the earlier (more specific) value is kept; the reserved trace_id/span_id
+    // labels always win over both.
+    labels = mergeAdditionalLabels(labels, additionalLabelsSupplier);
+    labels = mergeAdditionalLabels(labels, ExemplarLabelsSupplier.getExemplarLabelsSupplier());
+    return labels;
+  }
+
+  private Labels sampleTraceContextLabels() {
     // Using the qualified name so that Micrometer can exclude the dependency on
     // prometheus-metrics-tracer-initializer
     // as they provide their own implementation of SpanContextSupplier.
@@ -364,4 +401,68 @@ private Labels doSampleExemplar() {
     }
     return Labels.EMPTY;
   }
+
+  /**
+   * Merge labels from {@code supplier} into {@code base}, dropping any label whose name already
+   * exists in {@code base}. Never throws: a {@code null} supplier, a {@code null}/empty result, a
+   * colliding label name, or an exception thrown by the supplier all result in {@code base} being
+   * returned unchanged (minus the offending labels). A misbehaving supplier must never break metric
+   * collection.
+   */
+  private static Labels mergeAdditionalLabels(Labels base, @Nullable Supplier<Labels> supplier) {
+    if (supplier == null) {
+      return base;
+    }
+    Labels extra;
+    try {
+      extra = supplier.get();
+    } catch (Throwable ignored) {
+      // A misbehaving supplier (any RuntimeException or Error) must never break metric collection.
+      return base;
+    }
+    if (extra == null || extra.isEmpty()) {
+      return base;
+    }
+    return mergeLabels(base, extra);
+  }
+
+  /**
+   * Merge {@code extra} into {@code base}, dropping any label whose name already exists in {@code
+   * base}.
+   */
+  private static Labels mergeLabels(Labels base, Labels extra) {
+    if (extra.isEmpty()) {
+      return base;
+    }
+    // Count name collisions with base in a single pass so we can merge exactly once below: base
+    // (trace_id/span_id and any more-specific supplier) always wins, so colliding labels are
+    // dropped. extra is itself a valid Labels (no internal duplicates), so the surviving labels
+    // never collide with each other and merge() cannot throw on a duplicate name.
+    int size = extra.size();
+    int collisions = 0;
+    for (int i = 0; i < size; i++) {
+      if (base.contains(extra.getName(i))) {
+        collisions++;
+      }
+    }
+    if (collisions == 0) {
+      return base.merge(extra);
+    }
+    if (collisions == size) {
+      return base;
+    }
+    int kept = size - collisions;
+    String[] names = new String[kept];
+    String[] values = new String[kept];
+    int j = 0;
+    for (int i = 0; i < size; i++) {
+      String name = extra.getName(i);
+      if (!base.contains(name)) {
+        names[j] = name;
+        values[j] = extra.getValue(i);
+        j++;
+      }
+    }
+    return base.merge(names, values);
+  }
 }
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerConfig.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerConfig.java
index 5bf642e7e..f1afd1453 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerConfig.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerConfig.java
@@ -1,10 +1,12 @@
 package io.prometheus.metrics.core.exemplars;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.ExemplarsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Nullable;
 
+@StableApi
 public class ExemplarSamplerConfig {
 
   /** See {@link ExemplarsProperties#getMinRetentionPeriodSeconds()} */
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Buffer.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Buffer.java
index d4ff33a37..c2017995e 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Buffer.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Buffer.java
@@ -18,7 +18,15 @@
 class Buffer {
 
   private static final long bufferActiveBit = 1L << 63;
-  private final AtomicLong observationCount = new AtomicLong(0);
+  // Tracking observation counts requires an AtomicLong for coordination between recording and
+  // collecting. AtomicLong does much worse under contention than the LongAdder instances used
+  // elsewhere to hold aggregated state. To improve, we stripe the AtomicLong into N instances,
+  // where N is the number of available processors. Each record operation chooses the appropriate
+  // instance to use based on the modulo of its thread id and N. This is a more naive / simple
+  // implementation compared to the striping used under the hood in java.util.concurrent classes
+  // like LongAdder - contention and hot spots can still occur if recording thread ids happen to
+  // resolve to the same index. Further improvement is possible.
+  private final AtomicLong[] stripedObservationCounts;
   private double[] observationBuffer = new double[0];
   private int bufferPos = 0;
   private boolean reset = false;
@@ -27,8 +35,17 @@ class Buffer {
   ReentrantLock runLock = new ReentrantLock();
   Condition bufferFilled = appendLock.newCondition();
 
+  Buffer() {
+    stripedObservationCounts = new AtomicLong[Runtime.getRuntime().availableProcessors()];
+    for (int i = 0; i < stripedObservationCounts.length; i++) {
+      stripedObservationCounts[i] = new AtomicLong(0);
+    }
+  }
+
   boolean append(double value) {
-    long count = observationCount.incrementAndGet();
+    int index = stripeIndex(Thread.currentThread().getId(), stripedObservationCounts.length);
+    AtomicLong observationCountForThread = stripedObservationCounts[index];
+    long count = observationCountForThread.incrementAndGet();
     if ((count & bufferActiveBit) == 0) {
       return false; // sign bit not set -> buffer not active.
     } else {
@@ -37,6 +54,10 @@ boolean append(double value) {
     }
   }
 
+  static int stripeIndex(long threadId, int stripeCount) {
+    return (int) Math.floorMod(threadId, stripeCount);
+  }
+
   private void doAppend(double amount) {
     appendLock.lock();
     try {
@@ -69,7 +90,10 @@ <T extends DataPointSnapshot> T run(
     runLock.lock();
     try {
       // Signal that the buffer is active.
-      Long expectedCount = observationCount.getAndAdd(bufferActiveBit);
+      long expectedCount = 0L;
+      for (AtomicLong observationCount : stripedObservationCounts) {
+        expectedCount += observationCount.getAndAdd(bufferActiveBit);
+      }
 
       while (!complete.apply(expectedCount)) {
         // Wait until all in-flight threads have added their observations to the histogram /
@@ -81,14 +105,18 @@ <T extends DataPointSnapshot> T run(
       result = createResult.get();
 
       // Signal that the buffer is inactive.
-      int expectedBufferSize;
+      long expectedBufferSize = 0;
       if (reset) {
-        expectedBufferSize =
-            (int) ((observationCount.getAndSet(0) & ~bufferActiveBit) - expectedCount);
+        for (AtomicLong observationCount : stripedObservationCounts) {
+          expectedBufferSize += observationCount.getAndSet(0) & ~bufferActiveBit;
+        }
         reset = false;
       } else {
-        expectedBufferSize = (int) (observationCount.addAndGet(bufferActiveBit) - expectedCount);
+        for (AtomicLong observationCount : stripedObservationCounts) {
+          expectedBufferSize += observationCount.addAndGet(bufferActiveBit);
+        }
       }
+      expectedBufferSize -= expectedCount;
 
       appendLock.lock();
       try {
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CKMSQuantiles.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CKMSQuantiles.java
index 74ce18e72..83c8cfdc3 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CKMSQuantiles.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CKMSQuantiles.java
@@ -34,6 +34,11 @@
  */
 final class CKMSQuantiles {
 
+  @SuppressWarnings("ReferenceEquality")
+  private static boolean sameObject(Object left, Object right) {
+    return left == right;
+  }
+
   final Quantile[] quantiles;
 
   /** Total number of observations (not including those that are still in the buffer). */
@@ -203,7 +208,7 @@ void compress() {
       right = left;
       left = descendingIterator.next();
       r = r - left.g;
-      if (left == samples.getFirst()) {
+      if (sameObject(left, samples.getFirst())) {
         // The min sample must never be merged.
         break;
       }
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java
index a2bac20d2..1c614bdf3 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Counter.java
@@ -1,10 +1,12 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.CounterDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Labels;
@@ -13,6 +15,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -30,10 +33,12 @@
  * requestCount.labelValues("/hello-world", "500").inc();
  * }</pre>
  */
+@StableApi
 public class Counter extends StatefulMetric<CounterDataPoint, Counter.DataPoint>
     implements CounterDataPoint {
 
   @Nullable private final ExemplarSamplerConfig exemplarSamplerConfig;
+  @Nullable private final Supplier<Labels> exemplarLabelsSupplier;
 
   private Counter(Builder builder, PrometheusProperties prometheusProperties) {
     super(builder);
@@ -46,6 +51,7 @@ private Counter(Builder builder, PrometheusProperties prometheusProperties) {
     } else {
       exemplarSamplerConfig = null;
     }
+    exemplarLabelsSupplier = builder.exemplarLabelsSupplier;
   }
 
   @Override
@@ -89,13 +95,24 @@ protected CounterSnapshot collect(List<Labels> labels, List<DataPoint> metricDat
     for (int i = 0; i < labels.size(); i++) {
       data.add(metricData.get(i).collect(labels.get(i)));
     }
-    return new CounterSnapshot(getMetadata(), data);
+    return new CounterSnapshot(metadata, data);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.COUNTER;
   }
 
   @Override
   protected DataPoint newDataPoint() {
     if (exemplarSamplerConfig != null) {
-      return new DataPoint(new ExemplarSampler(exemplarSamplerConfig));
+      return new DataPoint(
+          new ExemplarSampler(exemplarSamplerConfig, null, exemplarLabelsSupplier));
     } else {
       return new DataPoint(null);
     }
@@ -235,7 +252,7 @@ private Builder(PrometheusProperties properties) {
      */
     @Override
     public Builder name(String name) {
-      return super.name(stripTotalSuffix(name));
+      return super.nameWithOriginal(stripTotalSuffix(name), name);
     }
 
     @Override
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CounterWithCallback.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CounterWithCallback.java
index 044644ec5..514a13d26 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CounterWithCallback.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/CounterWithCallback.java
@@ -1,6 +1,8 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,6 +23,7 @@
  *         .register();
  * }</pre>
  */
+@StableApi
 public class CounterWithCallback extends CallbackMetric {
 
   @FunctionalInterface
@@ -47,7 +50,17 @@ public CounterSnapshot collect() {
               new CounterSnapshot.CounterDataPointSnapshot(
                   value, makeLabels(labelValues), null, 0L));
         });
-    return new CounterSnapshot(getMetadata(), dataPoints);
+    return new CounterSnapshot(metadata, dataPoints);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.COUNTER;
   }
 
   public static Builder builder() {
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java
index 5850a1cfe..ca743c859 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Gauge.java
@@ -1,10 +1,12 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.GaugeDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
@@ -12,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -37,10 +40,12 @@
  * }
  * }</pre>
  */
+@StableApi
 public class Gauge extends StatefulMetric<GaugeDataPoint, Gauge.DataPoint>
     implements GaugeDataPoint {
 
   @Nullable private final ExemplarSamplerConfig exemplarSamplerConfig;
+  @Nullable private final Supplier<Labels> exemplarLabelsSupplier;
 
   private Gauge(Builder builder, PrometheusProperties prometheusProperties) {
     super(builder);
@@ -53,6 +58,7 @@ private Gauge(Builder builder, PrometheusProperties prometheusProperties) {
     } else {
       exemplarSamplerConfig = null;
     }
+    exemplarLabelsSupplier = builder.exemplarLabelsSupplier;
   }
 
   @Override
@@ -91,13 +97,24 @@ protected GaugeSnapshot collect(List<Labels> labels, List<DataPoint> metricData)
     for (int i = 0; i < labels.size(); i++) {
       dataPointSnapshots.add(metricData.get(i).collect(labels.get(i)));
     }
-    return new GaugeSnapshot(getMetadata(), dataPointSnapshots);
+    return new GaugeSnapshot(metadata, dataPointSnapshots);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.GAUGE;
   }
 
   @Override
   protected DataPoint newDataPoint() {
     if (exemplarSamplerConfig != null) {
-      return new DataPoint(new ExemplarSampler(exemplarSamplerConfig));
+      return new DataPoint(
+          new ExemplarSampler(exemplarSamplerConfig, null, exemplarLabelsSupplier));
     } else {
       return new DataPoint(null);
     }
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/GaugeWithCallback.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/GaugeWithCallback.java
index 82f26afe1..6c81e2d89 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/GaugeWithCallback.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/GaugeWithCallback.java
@@ -1,6 +1,8 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,6 +28,7 @@
  *     .register();
  * }</pre>
  */
+@StableApi
 public class GaugeWithCallback extends CallbackMetric {
 
   @FunctionalInterface
@@ -51,7 +54,17 @@ public GaugeSnapshot collect() {
           dataPoints.add(
               new GaugeSnapshot.GaugeDataPointSnapshot(value, makeLabels(labelValues), null, 0L));
         });
-    return new GaugeSnapshot(getMetadata(), dataPoints);
+    return new GaugeSnapshot(metadata, dataPoints);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.GAUGE;
   }
 
   public static Builder builder() {
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java
index 85f6225d3..c4bb1f5fe 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Histogram.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.ExemplarsProperties;
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
@@ -7,6 +8,7 @@
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
 import io.prometheus.metrics.core.util.Scheduler;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.Exemplars;
 import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
@@ -24,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -60,6 +63,7 @@
  * <p>If you want the classic representation only, use {@link Histogram.Builder#classicOnly}. If you
  * want the native representation only, use {@link Histogram.Builder#nativeOnly}.
  */
+@StableApi
 public class Histogram extends StatefulMetric<DistributionDataPoint, Histogram.DataPoint>
     implements DistributionDataPoint {
 
@@ -70,6 +74,7 @@ public class Histogram extends StatefulMetric<DistributionDataPoint, Histogram.D
   private static final double[][] NATIVE_BOUNDS;
 
   @Nullable private final ExemplarSamplerConfig exemplarSamplerConfig;
+  @Nullable private final Supplier<Labels> exemplarLabelsSupplier;
 
   // Upper bounds for the classic histogram buckets. Contains at least +Inf.
   // An empty array indicates that this is a native histogram only.
@@ -168,6 +173,7 @@ private Histogram(Histogram.Builder builder, PrometheusProperties prometheusProp
     } else {
       exemplarSamplerConfig = null;
     }
+    exemplarLabelsSupplier = builder.exemplarLabelsSupplier;
   }
 
   @Override
@@ -209,7 +215,7 @@ public class DataPoint implements DistributionDataPoint {
 
     private DataPoint() {
       if (exemplarSamplerConfig != null) {
-        exemplarSampler = new ExemplarSampler(exemplarSamplerConfig);
+        exemplarSampler = new ExemplarSampler(exemplarSamplerConfig, null, exemplarLabelsSupplier);
       } else {
         exemplarSampler = null;
       }
@@ -608,7 +614,7 @@ private void doubleBucketWidth(Map<Integer, LongAdder> buckets) {
       }
       buckets.clear();
       for (i = 0; i < keys.length; i++) {
-        int index = (keys[i] + 1) / 2;
+        int index = (keys[i] > 0 ? keys[i] + 1 : keys[i]) / 2;
         LongAdder count = buckets.computeIfAbsent(index, k -> new LongAdder());
         count.add(values[i]);
       }
@@ -646,7 +652,17 @@ protected HistogramSnapshot collect(List<Labels> labels, List<DataPoint> metricD
     for (int i = 0; i < labels.size(); i++) {
       data.add(metricData.get(i).collect(labels.get(i)));
     }
-    return new HistogramSnapshot(getMetadata(), data);
+    return new HistogramSnapshot(metadata, data);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.HISTOGRAM;
   }
 
   @Override
@@ -962,11 +978,18 @@ public Builder nativeMaxNumberOfBuckets(int nativeMaxBuckets) {
      * <p>Default is no reset.
      */
     public Builder nativeResetDuration(long duration, TimeUnit unit) {
-      // TODO: reset interval isn't tested yet
       if (duration <= 0) {
         throw new IllegalArgumentException(duration + ": value > 0 expected");
       }
-      nativeResetDurationSeconds = unit.toSeconds(duration);
+      long seconds = unit.toSeconds(duration);
+      if (seconds == 0) {
+        throw new IllegalArgumentException(
+            duration
+                + " "
+                + unit
+                + ": duration must be at least 1 second. Sub-second durations are not supported.");
+      }
+      nativeResetDurationSeconds = seconds;
       return this;
     }
 
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Info.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Info.java
index d7aa6be70..69be33e9d 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Info.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Info.java
@@ -1,6 +1,8 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.InfoSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
@@ -29,6 +31,7 @@
  * info.addLabelValues("dev", version, vendor, runtime);
  * }</pre>
  */
+@StableApi
 public class Info extends MetricWithFixedMetadata {
 
   private final Set<Labels> labels = new CopyOnWriteArraySet<>();
@@ -47,7 +50,7 @@ public void setLabelValues(String... labelValues) {
       throw new IllegalArgumentException(
           getClass().getSimpleName()
               + " "
-              + getMetadata().getName()
+              + metadata.getName()
               + " was created with "
               + labelNames.length
               + " label names, but you called setLabelValues() with "
@@ -65,7 +68,7 @@ public void addLabelValues(String... labelValues) {
       throw new IllegalArgumentException(
           getClass().getSimpleName()
               + " "
-              + getMetadata().getName()
+              + metadata.getName()
               + " was created with "
               + labelNames.length
               + " label names, but you called addLabelValues() with "
@@ -81,7 +84,7 @@ public void remove(String... labelValues) {
       throw new IllegalArgumentException(
           getClass().getSimpleName()
               + " "
-              + getMetadata().getName()
+              + metadata.getName()
               + " was created with "
               + labelNames.length
               + " label names, but you called remove() with "
@@ -102,7 +105,17 @@ public InfoSnapshot collect() {
         data.add(new InfoSnapshot.InfoDataPointSnapshot(label.merge(constLabels)));
       }
     }
-    return new InfoSnapshot(getMetadata(), data);
+    return new InfoSnapshot(metadata, data);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.INFO;
   }
 
   public static Builder builder() {
@@ -140,7 +153,7 @@ private Builder(PrometheusProperties config) {
      */
     @Override
     public Builder name(String name) {
-      return super.name(stripInfoSuffix(name));
+      return super.nameWithOriginal(stripInfoSuffix(name), name);
     }
 
     /** Throws an {@link UnsupportedOperationException} because Info metrics cannot have a unit. */
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Metric.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Metric.java
index d3c00eca0..64c03c825 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Metric.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Metric.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.Collector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
@@ -10,6 +11,7 @@
 import java.util.List;
 
 /** Common base class for all metrics. */
+@StableApi
 public abstract class Metric implements Collector {
 
   protected final Labels constLabels;
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadata.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadata.java
index 6f6afa482..c639bf317 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadata.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadata.java
@@ -1,12 +1,18 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.model.registry.MetricType;
+import io.prometheus.metrics.model.snapshots.Label;
 import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor;
 import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import javax.annotation.Nullable;
 
 /**
@@ -15,19 +21,49 @@
  * <p>An exception would be a metric that is a bridge to a 3rd party metric library, where the
  * metric name has to be retrieved from the 3rd party metric library at scrape time.
  */
+@StableApi
 public abstract class MetricWithFixedMetadata extends Metric {
 
-  private final MetricMetadata metadata;
+  protected final MetricMetadata metadata;
   protected final String[] labelNames;
 
   protected MetricWithFixedMetadata(Builder<?, ?> builder) {
     super(builder);
+    String name = makeName(builder.name, builder.unit);
+    if (builder.originalName == null) {
+      throw new IllegalArgumentException("Missing required field: name is null");
+    }
+    String originalName = builder.originalName;
+    String expositionBaseName = makeExpositionBaseName(originalName, builder.unit);
     this.metadata =
-        new MetricMetadata(makeName(builder.name, builder.unit), builder.help, builder.unit);
+        MetricMetadata.builder()
+            .name(name)
+            .expositionBaseName(expositionBaseName)
+            .originalName(originalName)
+            .help(builder.help)
+            .unit(builder.unit)
+            .build();
     this.labelNames = Arrays.copyOf(builder.labelNames, builder.labelNames.length);
   }
 
-  protected MetricMetadata getMetadata() {
+  @Override
+  @Nullable
+  @SuppressWarnings("deprecation")
+  public MetricFamilyDescriptor getMetricFamilyDescriptor() {
+    MetricType metricType = getMetricType();
+    if (metricType == null) {
+      return null;
+    }
+    return MetricFamilyDescriptor.of(metricType, metadata, getPrometheusLabels());
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricMetadata getMetadata() {
     return metadata;
   }
 
@@ -43,15 +79,54 @@ private String makeName(@Nullable String name, @Nullable Unit unit) {
     return name;
   }
 
+  private String makeExpositionBaseName(@Nullable String expositionBaseName, @Nullable Unit unit) {
+    if (expositionBaseName == null) {
+      throw new IllegalArgumentException("Missing required field: name is null");
+    }
+    if (unit != null) {
+      if (!expositionBaseName.endsWith("_" + unit) && !expositionBaseName.endsWith("." + unit)) {
+        expositionBaseName += "_" + unit;
+      }
+    }
+    return expositionBaseName;
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
   @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   public String getPrometheusName() {
     return metadata.getPrometheusName();
   }
 
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public Set<String> getLabelNames() {
+    return getPrometheusLabels();
+  }
+
+  private Set<String> getPrometheusLabels() {
+    Set<String> names = new HashSet<>();
+    for (String labelName : labelNames) {
+      names.add(PrometheusNaming.prometheusName(labelName));
+    }
+    for (Label label : constLabels) {
+      names.add(PrometheusNaming.prometheusName(label.getName()));
+    }
+    return names;
+  }
+
   public abstract static class Builder<B extends Builder<B, M>, M extends MetricWithFixedMetadata>
       extends Metric.Builder<B, M> {
 
     @Nullable private String name;
+    @Nullable private String originalName;
     @Nullable private Unit unit;
     @Nullable private String help;
     private String[] labelNames = new String[0];
@@ -66,6 +141,25 @@ public B name(String name) {
         throw new IllegalArgumentException("'" + name + "': Illegal metric name: " + error);
       }
       this.name = name;
+      this.originalName = name;
+      return self();
+    }
+
+    /**
+     * Set the metric name and original name separately. Used by Counter and Info builders which
+     * strip type suffixes from the name but preserve the original for exposition.
+     */
+    protected B nameWithOriginal(String name, String originalName) {
+      String error = PrometheusNaming.validateMetricName(name);
+      if (error != null) {
+        throw new IllegalArgumentException("'" + name + "': Illegal metric name: " + error);
+      }
+      error = PrometheusNaming.validateMetricName(originalName);
+      if (error != null) {
+        throw new IllegalArgumentException("'" + originalName + "': Illegal metric name: " + error);
+      }
+      this.name = name;
+      this.originalName = originalName;
       return self();
     }
 
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SlidingWindow.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SlidingWindow.java
index 5360e3349..4940e1e6d 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SlidingWindow.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SlidingWindow.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.lang.reflect.Array;
 import java.util.concurrent.TimeUnit;
 import java.util.function.LongSupplier;
@@ -15,9 +16,18 @@
  * <p>It is implemented in a generic way so that 3rd party libraries can use it for implementing
  * sliding windows.
  *
- * <p>TODO: The current implementation is {@code synchronized}. There is likely room for
- * optimization.
+ * <p><b>Thread Safety:</b> This class uses coarse-grained {@code synchronized} methods for
+ * simplicity and correctness. All public methods ({@link #current()} and {@link #observe(double)})
+ * are synchronized, which ensures thread-safe access to the ring buffer and rotation logic.
+ *
+ * <p><b>Performance Note:</b> The synchronized approach may cause contention under high-frequency
+ * observations.
+ *
+ * <p>However, given that Summary metrics are less commonly used (Histogram is generally preferred),
+ * and the observation frequency is typically lower than Counter increments, the current
+ * implementation provides an acceptable trade-off between simplicity and performance.
  */
+@StableApi
 public class SlidingWindow<T> {
 
   private final Supplier<T> constructor;
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java
index 4dbaf8ad5..c62aecb77 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StateSet.java
@@ -2,8 +2,10 @@
 
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.StateSetDataPoint;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
 import java.util.ArrayList;
@@ -50,6 +52,7 @@
  * The example above shows how to use a StateSet with an enum. You don't have to use enum, you can
  * use regular strings as well.
  */
+@StableApi
 public class StateSet extends StatefulMetric<StateSetDataPoint, StateSet.DataPoint>
     implements StateSetDataPoint {
 
@@ -59,7 +62,7 @@ private StateSet(Builder builder, String[] names) {
     super(builder);
     this.names = names;
     for (String name : names) {
-      if (this.getMetadata().getPrometheusName().equals(prometheusName(name))) {
+      if (metadata.getPrometheusName().equals(prometheusName(name))) {
         throw new IllegalArgumentException(
             "Label name "
                 + name
@@ -81,7 +84,17 @@ protected StateSetSnapshot collect(List<Labels> labels, List<DataPoint> metricDa
           new StateSetSnapshot.StateSetDataPointSnapshot(
               names, metricDataList.get(i).values, labels.get(i)));
     }
-    return new StateSetSnapshot(getMetadata(), data);
+    return new StateSetSnapshot(metadata, data);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.STATESET;
   }
 
   @Override
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java
index 386e92292..6ad26fda3 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.DataPoint;
@@ -13,6 +14,7 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -30,6 +32,7 @@
  * because in Java <i>synchronous</i> and <i>asynchronous</i> usually refers to multi-threading, but
  * this has nothing to do with multi-threading.
  */
+@StableApi
 public abstract class StatefulMetric<D extends DataPoint, T extends D>
     extends MetricWithFixedMetadata {
 
@@ -105,7 +108,7 @@ public D labelValues(String... labelValues) {
         throw new IllegalArgumentException(
             getClass().getSimpleName()
                 + " "
-                + getMetadata().getName()
+                + metadata.getName()
                 + " was created with label names, so you must call labelValues(...)"
                 + " when using it.");
       } else {
@@ -120,7 +123,7 @@ public D labelValues(String... labelValues) {
             if (l.get(i) == null) {
               throw new IllegalArgumentException(
                   "null label value for metric "
-                      + getMetadata().getName()
+                      + metadata.getName()
                       + " and label "
                       + labelNames[i]);
             }
@@ -171,7 +174,7 @@ protected MetricsProperties[] getMetricProperties(
     if (Objects.equals(builder.exemplarsEnabled, false)) {
       properties.add(MetricsProperties.builder().exemplarsEnabled(false).build());
     }
-    String metricName = getMetadata().getName();
+    String metricName = metadata.getName();
     if (prometheusProperties.getMetricProperties(metricName) != null) {
       properties.add(prometheusProperties.getMetricProperties(metricName));
     }
@@ -198,11 +201,31 @@ abstract static class Builder<B extends Builder<B, M>, M extends StatefulMetric<
       extends MetricWithFixedMetadata.Builder<B, M> {
 
     @Nullable protected Boolean exemplarsEnabled;
+    @Nullable protected Supplier<Labels> exemplarLabelsSupplier;
 
     protected Builder(List<String> illegalLabelNames, PrometheusProperties config) {
       super(illegalLabelNames, config);
     }
 
+    /**
+     * Provide additional labels to be merged into every automatically-sampled exemplar of <em>this
+     * metric</em>. The supplier is called each time an exemplar is sampled, so it can return
+     * dynamic values (e.g. a request-scoped identifier from a thread-local). The supplier is only
+     * invoked when a valid, sampled span context is present; it has no effect when tracing is not
+     * active.
+     *
+     * <p>For a global supplier that applies to all metrics (including metrics registered by
+     * third-party libraries you do not control), see {@link
+     * io.prometheus.metrics.core.exemplars.ExemplarLabelsSupplier}. When both are configured, this
+     * per-metric supplier takes precedence over the global one on a label-name collision, and the
+     * reserved {@code trace_id}/{@code span_id} labels always win over both. Labels that collide
+     * are silently dropped.
+     */
+    public B exemplarLabelsSupplier(Supplier<Labels> supplier) {
+      this.exemplarLabelsSupplier = supplier;
+      return self();
+    }
+
     /** Allow Exemplars for this metric. */
     public B withExemplars() {
       this.exemplarsEnabled = true;
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java
index 7d964dbb6..043f31129 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/Summary.java
@@ -2,11 +2,13 @@
 
 import static java.util.Objects.requireNonNull;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSampler;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfig;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Exemplars;
 import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Quantile;
@@ -18,6 +20,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
+import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 /**
@@ -41,6 +44,7 @@
  *
  * See {@link Summary.Builder} for configuration options.
  */
+@StableApi
 public class Summary extends StatefulMetric<DistributionDataPoint, Summary.DataPoint>
     implements DistributionDataPoint {
 
@@ -49,6 +53,7 @@ public class Summary extends StatefulMetric<DistributionDataPoint, Summary.DataP
   private final long maxAgeSeconds;
   private final int ageBuckets;
   @Nullable private final ExemplarSamplerConfig exemplarSamplerConfig;
+  @Nullable private final Supplier<Labels> exemplarLabelsSupplier;
 
   private Summary(Builder builder, PrometheusProperties prometheusProperties) {
     super(builder);
@@ -64,6 +69,7 @@ private Summary(Builder builder, PrometheusProperties prometheusProperties) {
     } else {
       exemplarSamplerConfig = null;
     }
+    exemplarLabelsSupplier = builder.exemplarLabelsSupplier;
   }
 
   private List<CKMSQuantiles.Quantile> makeQuantiles(MetricsProperties[] properties) {
@@ -115,7 +121,17 @@ protected SummarySnapshot collect(List<Labels> labels, List<DataPoint> metricDat
     for (int i = 0; i < labels.size(); i++) {
       data.add(metricData.get(i).collect(labels.get(i)));
     }
-    return new SummarySnapshot(getMetadata(), data);
+    return new SummarySnapshot(metadata, data);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.SUMMARY;
   }
 
   @Override
@@ -147,7 +163,7 @@ private DataPoint() {
                 ageBuckets);
       }
       if (exemplarSamplerConfig != null) {
-        exemplarSampler = new ExemplarSampler(exemplarSamplerConfig);
+        exemplarSampler = new ExemplarSampler(exemplarSamplerConfig, null, exemplarLabelsSupplier);
       } else {
         exemplarSampler = null;
       }
@@ -202,7 +218,13 @@ private void doObserve(double amount) {
     private SummarySnapshot.SummaryDataPointSnapshot collect(Labels labels) {
       return buffer.run(
           expectedCount -> count.sum() == expectedCount,
-          // TODO Exemplars (are hard-coded as empty in the line below)
+          // Note: Exemplars are currently hard-coded as empty for Summary metrics.
+          // While exemplars are sampled during observe() and observeWithExemplar() calls
+          // via the exemplarSampler field, they are not included in the snapshot to maintain
+          // consistency with the buffering mechanism. The buffer.run() ensures atomic
+          // collection of count, sum, and quantiles. Adding exemplars would require
+          // coordination between the buffer and exemplarSampler, which could impact
+          // performance. Consider using Histogram instead if exemplars are needed.
           () ->
               new SummarySnapshot.SummaryDataPointSnapshot(
                   count.sum(),
diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SummaryWithCallback.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SummaryWithCallback.java
index 3c4a910ea..0980f0d19 100644
--- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SummaryWithCallback.java
+++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/SummaryWithCallback.java
@@ -1,6 +1,8 @@
 package io.prometheus.metrics.core.metrics;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.model.registry.MetricType;
 import io.prometheus.metrics.model.snapshots.Exemplars;
 import io.prometheus.metrics.model.snapshots.Quantiles;
 import io.prometheus.metrics.model.snapshots.SummarySnapshot;
@@ -34,6 +36,7 @@
  *         .register();
  * }</pre>
  */
+@StableApi
 public class SummaryWithCallback extends CallbackMetric {
 
   @FunctionalInterface
@@ -60,7 +63,17 @@ public SummarySnapshot collect() {
               new SummarySnapshot.SummaryDataPointSnapshot(
                   count, sum, quantiles, makeLabels(labelValues), Exemplars.EMPTY, 0L));
         });
-    return new SummarySnapshot(getMetadata(), dataPoints);
+    return new SummarySnapshot(metadata, dataPoints);
+  }
+
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
+  public MetricType getMetricType() {
+    return MetricType.SUMMARY;
   }
 
   public static Builder builder() {
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerTest.java
index 059929c22..8ba1370da 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/ExemplarSamplerTest.java
@@ -52,24 +52,24 @@ public void markCurrentSpanAsExemplar() {}
   }
 
   @Test
-  public void testCustomExemplarsBuckets() throws Exception {
+  void testCustomExemplarsBuckets() throws Exception {
     // TODO
   }
 
   private io.prometheus.metrics.tracer.common.SpanContext origContext;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     origContext = SpanContextSupplier.getSpanContext();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     SpanContextSupplier.setSpanContext(origContext);
   }
 
   @Test
-  public void testIsSampled() throws Exception {
+  void testIsSampled() throws Exception {
     SpanContext context = new SpanContext();
     context.isSampled = false;
     ExemplarSampler sampler = new ExemplarSampler(makeConfig(), context);
@@ -79,7 +79,7 @@ public void testIsSampled() throws Exception {
   }
 
   @Test
-  public void testDefaultConfigHasFourExemplars() throws Exception {
+  void testDefaultConfigHasFourExemplars() throws Exception {
     ExemplarSampler sampler = new ExemplarSampler(makeConfig(), new SpanContext());
     Thread.sleep(tick); // t = 1 tick
     sampler.observe(0.3);
@@ -96,7 +96,7 @@ public void testDefaultConfigHasFourExemplars() throws Exception {
   }
 
   @Test
-  public void testEmptyBuckets() throws Exception {
+  void testEmptyBuckets() throws Exception {
     ExemplarSampler sampler =
         new ExemplarSampler(makeConfig(Double.POSITIVE_INFINITY), new SpanContext());
     Thread.sleep(tick); // t = 1 tick
@@ -108,7 +108,7 @@ public void testEmptyBuckets() throws Exception {
   }
 
   @Test
-  public void testDefaultExemplarsBuckets() throws Exception {
+  void testDefaultExemplarsBuckets() throws Exception {
     ExemplarSampler sampler =
         new ExemplarSampler(
             makeConfig(0.2, 0.4, 0.6, 0.8, 1.0, Double.POSITIVE_INFINITY), new SpanContext());
@@ -136,12 +136,12 @@ public void testDefaultExemplarsBuckets() throws Exception {
   }
 
   @Test
-  public void testCustomExemplarsNoBuckets() throws Exception {
+  void testCustomExemplarsNoBuckets() throws Exception {
     // TODO
   }
 
   @Test
-  public void testDefaultExemplarsNoBuckets() throws Exception {
+  void testDefaultExemplarsNoBuckets() throws Exception {
     ExemplarSampler sampler = new ExemplarSampler(makeConfig(), new SpanContext());
     Scheduler.awaitInitialization();
     Thread.sleep(tick); // t = 1 tick
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/SpanContextSupplierTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/SpanContextSupplierTest.java
index 6c89b48a5..5ddfb2ad5 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/SpanContextSupplierTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/exemplars/SpanContextSupplierTest.java
@@ -51,12 +51,12 @@ public void markCurrentSpanAsExemplar() {}
           );
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     origSpanContext = SpanContextSupplier.getSpanContext();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     SpanContextSupplier.setSpanContext(origSpanContext);
   }
 
@@ -66,7 +66,7 @@ public void tearDown() {
    * SpanContextSupplier}.
    */
   @Test
-  public void testConstructorInjection() {
+  void testConstructorInjection() {
     ExemplarsProperties properties = ExemplarsProperties.builder().build();
     ExemplarSamplerConfig config = new ExemplarSamplerConfig(properties, 1);
     ExemplarSampler exemplarSampler = new ExemplarSampler(config, spanContextA);
@@ -86,7 +86,7 @@ public void testConstructorInjection() {
    * ExemplarSampler}).
    */
   @Test
-  public void testUpdateSpanContext() throws InterruptedException {
+  void testUpdateSpanContext() throws InterruptedException {
     ExemplarSampler exemplarSampler = new ExemplarSampler(config);
 
     SpanContextSupplier.setSpanContext(spanContextB);
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/BufferTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/BufferTest.java
new file mode 100644
index 000000000..dccd3b4eb
--- /dev/null
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/BufferTest.java
@@ -0,0 +1,15 @@
+package io.prometheus.metrics.core.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class BufferTest {
+
+  @Test
+  void stripeIndexDoesNotOverflowWhenThreadIdNarrowsToIntegerMinValue() {
+    assertThat(Buffer.stripeIndex(2_147_483_648L, 3)).isEqualTo(2);
+    assertThat(Buffer.stripeIndex(2_147_483_648L, 6)).isEqualTo(2);
+    assertThat(Buffer.stripeIndex(2_147_483_648L, 12)).isEqualTo(8);
+  }
+}
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CKMSQuantilesTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CKMSQuantilesTest.java
index bd6b177a4..5a7fd7f48 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CKMSQuantilesTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CKMSQuantilesTest.java
@@ -20,13 +20,13 @@ class CKMSQuantilesTest {
   private final Quantile qMax = new Quantile(1.0, 0.00);
 
   @Test
-  public void testGetOnEmptyValues() {
+  void testGetOnEmptyValues() {
     CKMSQuantiles ckms = new CKMSQuantiles(q50, q95, q99);
     assertThat(Double.isNaN(ckms.get(q95.quantile))).isTrue();
   }
 
   @Test
-  public void testGet() {
+  void testGet() {
     Random random = new Random(0);
     CKMSQuantiles ckms = new CKMSQuantiles(q50, q95, q99);
     List<Double> input = shuffledValues(100, random);
@@ -37,7 +37,7 @@ public void testGet() {
   }
 
   @Test
-  public void testBatchInsert() {
+  void testBatchInsert() {
     Random random = new Random(1);
     testInsertBatch(1, 1, 100, random);
     testInsertBatch(1, 10, 100, random);
@@ -87,7 +87,7 @@ private void testInsertBatch(
   }
 
   @Test
-  public void testGetWithAMillionElements() {
+  void testGetWithAMillionElements() {
     Random random = new Random(2);
     List<Double> input = shuffledValues(1000 * 1000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(q50, q95, q99);
@@ -99,7 +99,7 @@ public void testGetWithAMillionElements() {
   }
 
   @Test
-  public void testMin() {
+  void testMin() {
     Random random = new Random(3);
     List<Double> input = shuffledValues(1000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(qMin);
@@ -112,7 +112,7 @@ public void testMin() {
   }
 
   @Test
-  public void testMax() {
+  void testMax() {
     Random random = new Random(4);
     List<Double> input = shuffledValues(1000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(qMax);
@@ -125,7 +125,7 @@ public void testMax() {
   }
 
   @Test
-  public void testMinMax() {
+  void testMinMax() {
     Random random = new Random(5);
     List<Double> input = shuffledValues(1000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(qMin, qMax);
@@ -138,7 +138,7 @@ public void testMinMax() {
   }
 
   @Test
-  public void testMinAndOthers() {
+  void testMinAndOthers() {
     Random random = new Random(6);
     List<Double> input = shuffledValues(1000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(q95, qMin);
@@ -150,7 +150,7 @@ public void testMinAndOthers() {
   }
 
   @Test
-  public void testMaxAndOthers() {
+  void testMaxAndOthers() {
     Random random = new Random(7);
     List<Double> input = shuffledValues(10000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(q50, q95, qMax);
@@ -162,7 +162,7 @@ public void testMaxAndOthers() {
   }
 
   @Test
-  public void testMinMaxAndOthers() {
+  void testMinMaxAndOthers() {
     Random random = new Random(8);
     List<Double> input = shuffledValues(10000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(qMin, q50, q95, q99, qMax);
@@ -174,7 +174,7 @@ public void testMinMaxAndOthers() {
   }
 
   @Test
-  public void testExactQuantile() {
+  void testExactQuantile() {
     Random random = new Random(9);
     List<Double> input = shuffledValues(10000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(new Quantile(0.95, 0));
@@ -187,7 +187,7 @@ public void testExactQuantile() {
   }
 
   @Test
-  public void testExactAndOthers() {
+  void testExactAndOthers() {
     Random random = new Random(10);
     List<Double> input = shuffledValues(10000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(q50, new Quantile(0.95, 0), q99);
@@ -200,7 +200,7 @@ public void testExactAndOthers() {
   }
 
   @Test
-  public void testExactAndMin() {
+  void testExactAndMin() {
     Random random = new Random(11);
     List<Double> input = shuffledValues(10000, random);
     CKMSQuantiles ckms = new CKMSQuantiles(qMin, q50, new Quantile(0.95, 0));
@@ -213,7 +213,7 @@ public void testExactAndMin() {
   }
 
   @Test
-  public void testMaxEpsilon() {
+  void testMaxEpsilon() {
     Random random = new Random(12);
     List<Double> input = shuffledValues(10000, random);
     // epsilon == 1 basically gives you random results, but it should still not throw an exception.
@@ -225,7 +225,7 @@ public void testMaxEpsilon() {
   }
 
   @Test
-  public void testGetGaussian() {
+  void testGetGaussian() {
     RandomGenerator rand = new JDKRandomGenerator();
     rand.setSeed(0);
 
@@ -284,7 +284,7 @@ public void testGetGaussian() {
   }
 
   @Test
-  public void testIllegalArgumentException() {
+  void testIllegalArgumentException() {
     try {
       new Quantile(-1, 0);
     } catch (IllegalArgumentException e) {
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java
index c151ffde8..e86842190 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java
@@ -8,17 +8,22 @@
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.config.MetricsProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.core.exemplars.ExemplarLabelsSupplier;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Label;
 import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import io.prometheus.metrics.model.snapshots.Unit;
 import io.prometheus.metrics.tracer.common.SpanContext;
 import io.prometheus.metrics.tracer.initializer.SpanContextSupplier;
+import java.io.ByteArrayOutputStream;
 import java.util.Arrays;
 import java.util.Iterator;
 import org.junit.jupiter.api.AfterEach;
@@ -36,7 +41,7 @@ class CounterTest {
   private SpanContext origSpanContext;
 
   @BeforeEach
-  public void setUp() throws NoSuchFieldException, IllegalAccessException {
+  void setUp() throws NoSuchFieldException, IllegalAccessException {
     noLabels = Counter.builder().name("nolabels").build();
     labels =
         Counter.builder().name("labels").help("help").unit(Unit.SECONDS).labelNames("l").build();
@@ -48,8 +53,39 @@ public void setUp() throws NoSuchFieldException, IllegalAccessException {
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     SpanContextSupplier.setSpanContext(origSpanContext);
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(null);
+  }
+
+  /** A {@link SpanContext} that always returns a fixed, sampled span. */
+  private static SpanContext sampledSpanContext(String traceId, String spanId) {
+    return new SpanContext() {
+      @Override
+      public String getCurrentTraceId() {
+        return traceId;
+      }
+
+      @Override
+      public String getCurrentSpanId() {
+        return spanId;
+      }
+
+      @Override
+      public boolean isCurrentSpanSampled() {
+        return true;
+      }
+
+      @Override
+      public void markCurrentSpanAsExemplar() {}
+    };
+  }
+
+  private static String openMetrics(Counter counter) throws Exception {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    new OpenMetricsTextFormatWriter(false, true)
+        .write(out, MetricSnapshots.of(counter.collect()), EscapingScheme.ALLOW_UTF8);
+    return out.toString();
   }
 
   private CounterSnapshot.CounterDataPointSnapshot getData(Counter counter, String... labels) {
@@ -71,7 +107,7 @@ private int getNumberOfLabels(Counter counter) {
   }
 
   @Test
-  public void testIncrement() {
+  void testIncrement() {
     noLabels.inc();
     assertThat(getValue(noLabels)).isCloseTo(1.0, offset(.001));
     noLabels.inc(2);
@@ -83,20 +119,20 @@ public void testIncrement() {
   }
 
   @Test
-  public void testNegativeIncrementFails() {
+  void testNegativeIncrementFails() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> noLabels.inc(-1))
         .withMessage("Negative increment -1 is illegal for Counter metrics.");
   }
 
   @Test
-  public void testEmptyCountersHaveNoLabels() {
+  void testEmptyCountersHaveNoLabels() {
     assertThat(getNumberOfLabels(noLabels)).isOne();
     assertThat(getNumberOfLabels(labels)).isZero();
   }
 
   @Test
-  public void testLabels() {
+  void testLabels() {
     assertThat(getNumberOfLabels(labels)).isZero();
     labels.labelValues("a").inc();
     assertThat(getNumberOfLabels(labels)).isOne();
@@ -115,17 +151,18 @@ public void testLabels() {
         "my_counter",
         "my_counter_seconds",
       })
-  public void testTotalStrippedFromName(String name) {
+  void testTotalStrippedFromName(String name) {
     Counter counter = Counter.builder().name(name).unit(Unit.SECONDS).build();
     Metrics.MetricFamily protobufData =
         new PrometheusProtobufWriterImpl().convert(counter.collect(), EscapingScheme.ALLOW_UTF8);
     assertThat(ProtobufUtil.shortDebugString(protobufData))
         .matches(
-            "^name: \"my_counter_seconds_total\" type: COUNTER metric \\{ counter \\{ value: 0.0 created_timestamp \\{ seconds: \\d+ nanos: \\d+ } } }$");
+            "^name: \"my_counter_seconds_total\" type: COUNTER metric \\{ counter \\{ value: 0.0"
+                + " created_timestamp \\{ seconds: \\d+( nanos: \\d+)? } } }$");
   }
 
   @Test
-  public void testSnapshotComplete() {
+  void testSnapshotComplete() {
     long before = System.currentTimeMillis();
     Counter counter =
         Counter.builder()
@@ -180,7 +217,7 @@ public void testSnapshotComplete() {
   }
 
   @Test
-  public void testIncWithExemplar() throws Exception {
+  void testIncWithExemplar() throws Exception {
     noLabels.incWithExemplar(Labels.of("key", "value"));
     assertExemplar(noLabels, 1.0, "key", "value");
 
@@ -202,7 +239,7 @@ private void assertExemplar(Counter counter, double value, String... labels) {
   }
 
   @Test
-  public void testExemplarSampler() throws Exception {
+  void testExemplarSampler() throws Exception {
     Exemplar exemplar1 = Exemplar.builder().value(2.0).traceId("abc").spanId("123").build();
     Exemplar exemplar2 = Exemplar.builder().value(1.0).traceId("def").spanId("456").build();
     Exemplar exemplar3 = Exemplar.builder().value(1.0).traceId("123").spanId("abc").build();
@@ -320,7 +357,184 @@ void incWithExemplar2() {
   }
 
   @Test
-  public void testExemplarSamplerDisabled() {
+  void incWithExemplarCustomMetadataInExposition() throws Exception {
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.incWithExemplar(
+        Labels.of(
+            Exemplar.TRACE_ID, "abc123", Exemplar.SPAN_ID, "def456", "management_id", "mgmt-42"));
+
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    new OpenMetricsTextFormatWriter(false, true)
+        .write(out, MetricSnapshots.of(counter.collect()), EscapingScheme.ALLOW_UTF8);
+
+    assertThat(out.toString())
+        .contains("management_id=\"mgmt-42\"")
+        .contains("trace_id=\"abc123\"")
+        .contains("span_id=\"def456\"");
+  }
+
+  @Test
+  void exemplarLabelsSupplierAppearsInAutomaticallySampledExemplar() throws Exception {
+    SpanContextSupplier.setSpanContext(
+        new SpanContext() {
+          @Override
+          public String getCurrentTraceId() {
+            return "trace-abc";
+          }
+
+          @Override
+          public String getCurrentSpanId() {
+            return "span-def";
+          }
+
+          @Override
+          public boolean isCurrentSpanSampled() {
+            return true;
+          }
+
+          @Override
+          public void markCurrentSpanAsExemplar() {}
+        });
+
+    Counter counter =
+        Counter.builder()
+            .name("requests_total")
+            .exemplarLabelsSupplier(() -> Labels.of("management_id", "mgmt-42"))
+            .build();
+    counter.inc(); // automatic sampling path
+
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    new OpenMetricsTextFormatWriter(false, true)
+        .write(out, MetricSnapshots.of(counter.collect()), EscapingScheme.ALLOW_UTF8);
+
+    assertThat(out.toString())
+        .contains("management_id=\"mgmt-42\"")
+        .contains("trace_id=\"trace-abc\"")
+        .contains("span_id=\"span-def\"");
+  }
+
+  @Test
+  void globalExemplarLabelsSupplierAppearsInAutomaticallySampledExemplar() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(() -> Labels.of("management_id", "mgmt-42"));
+
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.inc(); // automatic sampling path
+
+    assertThat(openMetrics(counter))
+        .contains("management_id=\"mgmt-42\"")
+        .contains("trace_id=\"trace-abc\"")
+        .contains("span_id=\"span-def\"");
+  }
+
+  @Test
+  void globalAndPerMetricSuppliersBothApply() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(() -> Labels.of("global_k", "g"));
+
+    Counter counter =
+        Counter.builder()
+            .name("requests_total")
+            .exemplarLabelsSupplier(() -> Labels.of("metric_k", "m"))
+            .build();
+    counter.inc();
+
+    assertThat(openMetrics(counter))
+        .contains("global_k=\"g\"")
+        .contains("metric_k=\"m\"")
+        .contains("trace_id=\"trace-abc\"")
+        .contains("span_id=\"span-def\"");
+  }
+
+  @Test
+  void perMetricSupplierWinsOverGlobalOnCollision() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(() -> Labels.of("k", "global"));
+
+    Counter counter =
+        Counter.builder()
+            .name("requests_total")
+            .exemplarLabelsSupplier(() -> Labels.of("k", "metric"))
+            .build();
+    counter.inc();
+
+    assertThat(openMetrics(counter)).contains("k=\"metric\"").doesNotContain("k=\"global\"");
+  }
+
+  @Test
+  void globalSupplierCollidingWithTraceIdIsDropped() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(() -> Labels.of(Exemplar.TRACE_ID, "evil"));
+
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.inc();
+
+    assertThat(openMetrics(counter))
+        .contains("trace_id=\"trace-abc\"")
+        .doesNotContain("trace_id=\"evil\"");
+  }
+
+  @Test
+  void globalSupplierThrowingDoesNotBreakCollection() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(
+        () -> {
+          throw new RuntimeException("boom");
+        });
+
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.inc();
+
+    assertThat(openMetrics(counter))
+        .contains("trace_id=\"trace-abc\"")
+        .contains("span_id=\"span-def\"");
+  }
+
+  @Test
+  void globalSupplierWithoutSpanContextProducesNoExemplar() {
+    SpanContextSupplier.setSpanContext(null);
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(() -> Labels.of("management_id", "mgmt-42"));
+
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.inc();
+
+    assertThat(getData(counter).getExemplar()).isNull();
+  }
+
+  @Test
+  void globalSupplierDoesNotApplyToCustomExemplar() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(() -> Labels.of("management_id", "mgmt-42"));
+
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.incWithExemplar(Labels.of("k", "v"));
+
+    assertThat(openMetrics(counter))
+        .contains("k=\"v\"")
+        .contains("trace_id=\"trace-abc\"")
+        .contains("span_id=\"span-def\"")
+        .doesNotContain("management_id=\"mgmt-42\"");
+  }
+
+  @Test
+  void callerControlsCustomExemplarLabels() throws Exception {
+    SpanContextSupplier.setSpanContext(sampledSpanContext("trace-abc", "span-def"));
+    ExemplarLabelsSupplier.setExemplarLabelsSupplier(
+        () -> Labels.of("k", "global", "management_id", "mgmt-42"));
+
+    Counter counter = Counter.builder().name("requests_total").build();
+    counter.incWithExemplar(Labels.of("k", "caller"));
+
+    assertThat(openMetrics(counter))
+        .contains("k=\"caller\"")
+        .contains("trace_id=\"trace-abc\"")
+        .contains("span_id=\"span-def\"")
+        .doesNotContain("k=\"global\"")
+        .doesNotContain("management_id=\"mgmt-42\"");
+  }
+
+  @Test
+  void testExemplarSamplerDisabled() {
     Counter counter = Counter.builder().name("count_total").withoutExemplars().build();
     counter.incWithExemplar(3.0, Labels.of("a", "b"));
     assertThat(getData(counter).getExemplar()).isNull();
@@ -329,7 +543,7 @@ public void testExemplarSamplerDisabled() {
   }
 
   @Test
-  public void testExemplarSamplerDisabled_enabledByDefault() {
+  void testExemplarSamplerDisabled_enabledByDefault() {
     PrometheusProperties properties =
         PrometheusProperties.builder()
             .defaultMetricsProperties(MetricsProperties.builder().exemplarsEnabled(true).build())
@@ -342,7 +556,7 @@ public void testExemplarSamplerDisabled_enabledByDefault() {
   }
 
   @Test
-  public void testExemplarSamplerDisabledInBuilder_enabledByPropertiesOnMetric() {
+  void testExemplarSamplerDisabledInBuilder_enabledByPropertiesOnMetric() {
     PrometheusProperties properties =
         PrometheusProperties.builder()
             .putMetricProperty("count", MetricsProperties.builder().exemplarsEnabled(true).build())
@@ -355,7 +569,7 @@ public void testExemplarSamplerDisabledInBuilder_enabledByPropertiesOnMetric() {
   }
 
   @Test
-  public void testConstLabelsFirst() {
+  void testConstLabelsFirst() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -367,7 +581,7 @@ public void testConstLabelsFirst() {
   }
 
   @Test
-  public void testConstLabelsSecond() {
+  void testConstLabelsSecond() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -377,4 +591,17 @@ public void testConstLabelsSecond() {
                     .constLabels(Labels.of("const_a", "const_b"))
                     .build());
   }
+
+  @Test
+  void testLabelNormalizationInRegistration() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Counter.builder().name("requests").labelNames("request.count").register(registry);
+
+    // request.count and request_count normalize to the same name
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(
+            () -> Counter.builder().name("requests").labelNames("request_count").register(registry))
+        .withMessageContaining("duplicate metric name with identical label schema");
+  }
 }
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterWithCallbackTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterWithCallbackTest.java
index 47c5f5c57..2907a8a02 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterWithCallbackTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterWithCallbackTest.java
@@ -13,7 +13,7 @@
 class CounterWithCallbackTest {
 
   @Test
-  public void testCounter() {
+  void testCounter() {
     final AtomicInteger value = new AtomicInteger(1);
     List<String> labelValues = Arrays.asList("v1", "v2");
     CounterWithCallback counter =
@@ -38,7 +38,7 @@ public void testCounter() {
   }
 
   @Test
-  public void testCounterNoCallback() {
+  void testCounterNoCallback() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () -> CounterWithCallback.builder().name("counter").labelNames("l1", "l2").build());
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CustomBucketsHistogramTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CustomBucketsHistogramTest.java
new file mode 100644
index 000000000..668135f2e
--- /dev/null
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CustomBucketsHistogramTest.java
@@ -0,0 +1,470 @@
+package io.prometheus.metrics.core.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
+
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
+import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
+import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;
+import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Comprehensive tests to verify that client_java supports native histograms with custom buckets
+ * (NHCB).
+ *
+ * <p>According to the Prometheus specification
+ * (https://prometheus.io/docs/specs/native_histograms/), native histograms with custom buckets
+ * (schema -53) are exposed as classic histograms with custom bucket boundaries. Prometheus servers
+ * can then convert these to NHCB upon ingestion when configured with
+ * convert_classic_histograms_to_nhcb.
+ *
+ * <p>These tests verify that:
+ *
+ * <ul>
+ *   <li>Histograms with custom bucket boundaries can be created
+ *   <li>Custom buckets are properly exposed in both text and protobuf formats
+ *   <li>Both classic-only and dual (classic+native) histograms work with custom buckets
+ *   <li>Various custom bucket configurations (linear, exponential, arbitrary) work correctly
+ * </ul>
+ *
+ * <p>See issue #1838 for more context.
+ */
+class CustomBucketsHistogramTest {
+
+  @Test
+  void testCustomBucketsWithArbitraryBoundaries() {
+    // Create a histogram with arbitrary custom bucket boundaries
+    Histogram histogram =
+        Histogram.builder()
+            .name("http_request_duration_seconds")
+            .help("HTTP request duration with custom buckets")
+            .classicUpperBounds(0.01, 0.05, 0.1, 0.5, 1.0, 5.0, 10.0)
+            .build();
+
+    // Observe some values
+    histogram.observe(0.008);
+    histogram.observe(0.045);
+    histogram.observe(0.3);
+    histogram.observe(2.5);
+    histogram.observe(7.8);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify custom bucket boundaries are set correctly
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds)
+        .containsExactly(0.01, 0.05, 0.1, 0.5, 1.0, 5.0, 10.0, Double.POSITIVE_INFINITY);
+
+    // Verify observations are distributed correctly across buckets
+    // Note: counts are non-cumulative (count for that specific bucket only)
+    ClassicHistogramBuckets buckets = data.getClassicBuckets();
+    assertThat(buckets.getCount(0)).isEqualTo(1); // <= 0.01: (0.008)
+    assertThat(buckets.getCount(1)).isEqualTo(1); // (0.01, 0.05]: (0.045)
+    assertThat(buckets.getCount(2)).isEqualTo(0); // (0.05, 0.1]: none
+    assertThat(buckets.getCount(3)).isEqualTo(1); // (0.1, 0.5]: (0.3)
+    assertThat(buckets.getCount(4)).isEqualTo(0); // (0.5, 1.0]: none
+    assertThat(buckets.getCount(5)).isEqualTo(1); // (1.0, 5.0]: (2.5)
+    assertThat(buckets.getCount(6)).isEqualTo(1); // (5.0, 10.0]: (7.8)
+    assertThat(buckets.getCount(7)).isEqualTo(0); // (10.0, +Inf]: none
+
+    // Verify count and sum
+    assertThat(data.getCount()).isEqualTo(5);
+    assertThat(data.getSum()).isCloseTo(10.653, offset(0.01));
+  }
+
+  @Test
+  void testCustomBucketsWithLinearBoundaries() {
+    // Create a histogram with linear custom bucket boundaries
+    // This represents a use case where equal-width buckets are needed
+    Histogram histogram =
+        Histogram.builder()
+            .name("queue_size")
+            .help("Queue size with linear buckets")
+            .classicLinearUpperBounds(10.0, 10.0, 10) // start=10, width=10, count=10
+            .build();
+
+    // Observe some values
+    for (int i = 5; i <= 95; i += 10) {
+      histogram.observe(i);
+    }
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify linear bucket boundaries
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds)
+        .containsExactly(
+            10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, Double.POSITIVE_INFINITY);
+
+    // Verify observations
+    assertThat(data.getCount()).isEqualTo(10);
+  }
+
+  @Test
+  void testCustomBucketsWithExponentialBoundaries() {
+    // Create a histogram with exponential custom bucket boundaries
+    // This is useful for metrics that span multiple orders of magnitude
+    Histogram histogram =
+        Histogram.builder()
+            .name("response_size_bytes")
+            .help("Response size with exponential buckets")
+            .classicExponentialUpperBounds(100.0, 10.0, 5) // start=100, factor=10, count=5
+            .build();
+
+    // Observe some values across different magnitudes
+    histogram.observe(50);
+    histogram.observe(500);
+    histogram.observe(5000);
+    histogram.observe(50000);
+    histogram.observe(500000);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify exponential bucket boundaries
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds)
+        .containsExactly(100.0, 1000.0, 10000.0, 100000.0, 1000000.0, Double.POSITIVE_INFINITY);
+
+    // Verify observations
+    assertThat(data.getCount()).isEqualTo(5);
+  }
+
+  @Test
+  void testCustomBucketsClassicOnlyHistogram() {
+    // Verify that custom buckets work with classic-only histograms
+    Histogram histogram =
+        Histogram.builder()
+            .name("test_classic_only")
+            .help("Classic-only histogram with custom buckets")
+            .classicOnly()
+            .classicUpperBounds(1.0, 5.0, 10.0)
+            .build();
+
+    histogram.observe(2.0);
+    histogram.observe(7.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify it's a classic-only histogram
+    assertThat(data.getNativeSchema()).isEqualTo(HistogramSnapshot.CLASSIC_HISTOGRAM);
+
+    // Verify custom buckets
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds).containsExactly(1.0, 5.0, 10.0, Double.POSITIVE_INFINITY);
+  }
+
+  @Test
+  void testCustomBucketsDualModeHistogram() {
+    // Verify that custom buckets work with dual-mode (classic+native) histograms
+    // This is the default mode and most relevant for NHCB support
+    Histogram histogram =
+        Histogram.builder()
+            .name("test_dual_mode")
+            .help("Dual-mode histogram with custom buckets")
+            .classicUpperBounds(0.1, 1.0, 10.0)
+            .build();
+
+    histogram.observe(0.5);
+    histogram.observe(5.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify it has both classic and native representations
+    assertThat(data.getClassicBuckets().size()).isGreaterThan(0);
+    assertThat(data.getNativeSchema()).isNotEqualTo(HistogramSnapshot.CLASSIC_HISTOGRAM);
+
+    // Verify custom classic buckets
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds).containsExactly(0.1, 1.0, 10.0, Double.POSITIVE_INFINITY);
+
+    // Verify native histogram is also populated
+    long nativeTotalCount =
+        data.getNativeBucketsForPositiveValues().stream()
+            .mapToLong(bucket -> bucket.getCount())
+            .sum();
+    assertThat(nativeTotalCount).isEqualTo(2);
+  }
+
+  @Test
+  void testCustomBucketsTextFormatOutput() throws IOException {
+    // Verify that custom buckets are correctly serialized in text format
+    Histogram histogram =
+        Histogram.builder()
+            .name("test_custom_buckets")
+            .help("Test histogram with custom buckets")
+            .classicUpperBounds(0.5, 1.0, 2.0)
+            .build();
+
+    histogram.observe(0.3);
+    histogram.observe(0.7);
+    histogram.observe(1.5);
+
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(false, true);
+    writer.write(out, MetricSnapshots.of(histogram.collect()), EscapingScheme.ALLOW_UTF8);
+
+    String output = out.toString(StandardCharsets.UTF_8);
+
+    // Verify the output contains the custom bucket boundaries
+    assertThat(output).contains("le=\"0.5\"");
+    assertThat(output).contains("le=\"1.0\"");
+    assertThat(output).contains("le=\"2.0\"");
+    assertThat(output).contains("le=\"+Inf\"");
+
+    // Verify bucket counts
+    assertThat(output).containsPattern("le=\"0.5\".*1"); // 1 observation <= 0.5
+    assertThat(output).containsPattern("le=\"1.0\".*2"); // 2 observations <= 1.0
+    assertThat(output).containsPattern("le=\"2.0\".*3"); // 3 observations <= 2.0
+    assertThat(output).containsPattern("le=\"\\+Inf\".*3"); // 3 observations total
+  }
+
+  @Test
+  void testCustomBucketsProtobufFormatOutput() {
+    // Verify that custom buckets are correctly serialized in Prometheus protobuf format
+    Histogram histogram =
+        Histogram.builder()
+            .name("test_custom_buckets_protobuf")
+            .help("Test histogram with custom buckets for protobuf")
+            .classicUpperBounds(1.0, 5.0, 10.0)
+            .build();
+
+    histogram.observe(0.5);
+    histogram.observe(3.0);
+    histogram.observe(7.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    Metrics.MetricFamily metricFamily =
+        new PrometheusProtobufWriterImpl().convert(snapshot, EscapingScheme.ALLOW_UTF8);
+
+    assertThat(metricFamily).isNotNull();
+    assertThat(metricFamily.getName()).isEqualTo("test_custom_buckets_protobuf");
+    assertThat(metricFamily.getType()).isEqualTo(Metrics.MetricType.HISTOGRAM);
+
+    Metrics.Histogram protoHistogram = metricFamily.getMetric(0).getHistogram();
+
+    // Verify classic buckets in protobuf
+    assertThat(protoHistogram.getBucketCount()).isEqualTo(4); // 3 custom + +Inf
+
+    // Verify bucket upper bounds
+    assertThat(protoHistogram.getBucket(0).getUpperBound()).isEqualTo(1.0);
+    assertThat(protoHistogram.getBucket(1).getUpperBound()).isEqualTo(5.0);
+    assertThat(protoHistogram.getBucket(2).getUpperBound()).isEqualTo(10.0);
+    assertThat(protoHistogram.getBucket(3).getUpperBound()).isEqualTo(Double.POSITIVE_INFINITY);
+
+    // Verify bucket counts (cumulative)
+    assertThat(protoHistogram.getBucket(0).getCumulativeCount()).isEqualTo(1); // <= 1.0
+    assertThat(protoHistogram.getBucket(1).getCumulativeCount()).isEqualTo(2); // <= 5.0
+    assertThat(protoHistogram.getBucket(2).getCumulativeCount()).isEqualTo(3); // <= 10.0
+    assertThat(protoHistogram.getBucket(3).getCumulativeCount()).isEqualTo(3); // +Inf
+
+    // Verify native histogram fields are also present (for dual-mode)
+    assertThat(protoHistogram.hasSchema()).isTrue();
+    assertThat(protoHistogram.getSchema()).isNotEqualTo(HistogramSnapshot.CLASSIC_HISTOGRAM);
+  }
+
+  @Test
+  void testCustomBucketsWithNegativeValues() {
+    // Verify that custom buckets work correctly with negative values
+    Histogram histogram =
+        Histogram.builder()
+            .name("temperature_celsius")
+            .help("Temperature readings with custom buckets")
+            .classicUpperBounds(-20.0, -10.0, 0.0, 10.0, 20.0, 30.0)
+            .build();
+
+    histogram.observe(-15.0);
+    histogram.observe(-5.0);
+    histogram.observe(5.0);
+    histogram.observe(15.0);
+    histogram.observe(25.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify bucket boundaries
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds)
+        .containsExactly(-20.0, -10.0, 0.0, 10.0, 20.0, 30.0, Double.POSITIVE_INFINITY);
+
+    // Verify observations are distributed correctly
+    // Note: counts are non-cumulative
+    ClassicHistogramBuckets buckets = data.getClassicBuckets();
+    assertThat(buckets.getCount(0)).isEqualTo(0); // <= -20: none
+    assertThat(buckets.getCount(1)).isEqualTo(1); // (-20, -10]: (-15.0)
+    assertThat(buckets.getCount(2)).isEqualTo(1); // (-10, 0]: (-5.0)
+    assertThat(buckets.getCount(3)).isEqualTo(1); // (0, 10]: (5.0)
+    assertThat(buckets.getCount(4)).isEqualTo(1); // (10, 20]: (15.0)
+    assertThat(buckets.getCount(5)).isEqualTo(1); // (20, 30]: (25.0)
+
+    assertThat(data.getCount()).isEqualTo(5);
+  }
+
+  @Test
+  void testCustomBucketsWithLabels() {
+    // Verify that custom buckets work correctly with labeled histograms
+    Histogram histogram =
+        Histogram.builder()
+            .name("api_request_duration_seconds")
+            .help("API request duration with custom buckets")
+            .classicUpperBounds(0.01, 0.1, 1.0, 10.0)
+            .labelNames("method", "endpoint")
+            .build();
+
+    histogram.labelValues("GET", "/users").observe(0.05);
+    histogram.labelValues("GET", "/users").observe(0.5);
+    histogram.labelValues("POST", "/users").observe(2.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+
+    // Verify we have 2 data points (one for each unique label combination)
+    assertThat(snapshot.getDataPoints()).hasSize(2);
+
+    // Verify both data points have the correct custom buckets
+    for (HistogramSnapshot.HistogramDataPointSnapshot data : snapshot.getDataPoints()) {
+      List<Double> upperBounds =
+          data.getClassicBuckets().stream()
+              .map(ClassicHistogramBucket::getUpperBound)
+              .collect(Collectors.toList());
+
+      assertThat(upperBounds).containsExactly(0.01, 0.1, 1.0, 10.0, Double.POSITIVE_INFINITY);
+    }
+
+    // Verify GET /users data point
+    HistogramSnapshot.HistogramDataPointSnapshot getData =
+        getData(histogram, "method", "GET", "endpoint", "/users");
+
+    assertThat(getData.getCount()).isEqualTo(2);
+
+    // Verify POST /users data point
+    HistogramSnapshot.HistogramDataPointSnapshot postData =
+        getData(histogram, "method", "POST", "endpoint", "/users");
+
+    assertThat(postData.getCount()).isEqualTo(1);
+  }
+
+  private HistogramSnapshot.HistogramDataPointSnapshot getData(
+      Histogram histogram, String... labels) {
+    return histogram.collect().getDataPoints().stream()
+        .filter(d -> d.getLabels().equals(Labels.of(labels)))
+        .findAny()
+        .orElseThrow(() -> new RuntimeException("histogram with labels not found"));
+  }
+
+  @Test
+  void testCustomBucketsBoundaryEdgeCases() {
+    // Test edge cases: observations exactly on bucket boundaries
+    Histogram histogram =
+        Histogram.builder()
+            .name("test_boundaries")
+            .help("Test bucket boundary edge cases")
+            .classicUpperBounds(1.0, 5.0, 10.0)
+            .build();
+
+    // Observe values exactly on the boundaries
+    histogram.observe(1.0);
+    histogram.observe(5.0);
+    histogram.observe(10.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Values on boundaries should be included in their respective buckets
+    // Buckets are inclusive of upper bound
+    // Note: counts are non-cumulative
+    ClassicHistogramBuckets buckets = data.getClassicBuckets();
+    assertThat(buckets.getCount(0)).isEqualTo(1); // <= 1.0: (1.0)
+    assertThat(buckets.getCount(1)).isEqualTo(1); // (1.0, 5.0]: (5.0)
+    assertThat(buckets.getCount(2)).isEqualTo(1); // (5.0, 10.0]: (10.0)
+
+    assertThat(data.getCount()).isEqualTo(3);
+  }
+
+  @Test
+  void testCustomBucketsFineBoundaries() {
+    // Test with very fine-grained custom bucket boundaries
+    // This simulates a use case where precise bucket boundaries are needed
+    Histogram histogram =
+        Histogram.builder()
+            .name("precise_measurement")
+            .help("Histogram with fine-grained custom buckets")
+            .classicUpperBounds(0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008, 0.009, 0.01)
+            .build();
+
+    histogram.observe(0.0015);
+    histogram.observe(0.0045);
+    histogram.observe(0.0075);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    HistogramSnapshot.HistogramDataPointSnapshot data = snapshot.getDataPoints().get(0);
+
+    // Verify fine-grained buckets are set correctly
+    List<Double> upperBounds =
+        data.getClassicBuckets().stream()
+            .map(ClassicHistogramBucket::getUpperBound)
+            .collect(Collectors.toList());
+
+    assertThat(upperBounds)
+        .containsExactly(
+            0.001,
+            0.002,
+            0.003,
+            0.004,
+            0.005,
+            0.006,
+            0.007,
+            0.008,
+            0.009,
+            0.01,
+            Double.POSITIVE_INFINITY);
+
+    // Verify observations are in correct buckets
+    // Note: counts are non-cumulative
+    ClassicHistogramBuckets buckets = data.getClassicBuckets();
+    assertThat(buckets.getCount(0)).isEqualTo(0); // <= 0.001: none
+    assertThat(buckets.getCount(1)).isEqualTo(1); // (0.001, 0.002]: (0.0015)
+    assertThat(buckets.getCount(4)).isEqualTo(1); // (0.004, 0.005]: (0.0045)
+    assertThat(buckets.getCount(7)).isEqualTo(1); // (0.007, 0.008]: (0.0075)
+
+    assertThat(data.getCount()).isEqualTo(3);
+  }
+}
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeTest.java
index 108fc05ce..93ea1d5e5 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeTest.java
@@ -27,14 +27,14 @@ class GaugeTest {
   private SpanContext origSpanContext;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     noLabels = Gauge.builder().name("nolabels").build();
     labels = Gauge.builder().name("labels").labelNames("l").build();
     origSpanContext = SpanContextSupplier.getSpanContext();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     SpanContextSupplier.setSpanContext(origSpanContext);
   }
 
@@ -50,7 +50,7 @@ private double getValue(Gauge gauge, String... labels) {
   }
 
   @Test
-  public void testIncrement() {
+  void testIncrement() {
     noLabels.inc();
     assertThat(getValue(noLabels)).isCloseTo(1.0, offset(.001));
     noLabels.inc(2);
@@ -62,7 +62,7 @@ public void testIncrement() {
   }
 
   @Test
-  public void testDecrement() {
+  void testDecrement() {
     noLabels.dec();
     assertThat(getValue(noLabels)).isCloseTo(-1.0, offset(.001));
     noLabels.dec(2);
@@ -74,7 +74,7 @@ public void testDecrement() {
   }
 
   @Test
-  public void testSet() {
+  void testSet() {
     noLabels.set(42);
     assertThat(getValue(noLabels)).isCloseTo(42, offset(.001));
     noLabels.set(7);
@@ -82,22 +82,20 @@ public void testSet() {
   }
 
   @Test
-  @SuppressWarnings("try")
-  public void testTimer() throws InterruptedException {
-    try (Timer ignored = noLabels.startTimer()) {
-      Thread.sleep(12);
-    }
-    assertThat(getValue(noLabels))
-        .isCloseTo(0.012, offset(0.005)); // 5ms delta should be enough so this isn't flaky
+  void testTimer() {
+    Timer timer = noLabels.startTimer();
+    double duration = timer.observeDuration();
+    assertThat(duration).isPositive();
+    assertThat(getValue(noLabels)).isEqualTo(duration);
   }
 
   @Test
-  public void noLabelsDefaultZeroValue() {
+  void noLabelsDefaultZeroValue() {
     assertThat(getValue(noLabels)).isCloseTo(0.0, offset(.001));
   }
 
   @Test
-  public void testLabels() {
+  void testLabels() {
     labels.labelValues("a").inc();
     labels.labelValues("b").inc(3);
     assertThat(getValue(labels, "l", "a")).isCloseTo(1.0, offset(.001));
@@ -105,7 +103,7 @@ public void testLabels() {
   }
 
   @Test
-  public void testExemplarSampler() throws Exception {
+  void testExemplarSampler() throws Exception {
     Exemplar exemplar1 = Exemplar.builder().value(2.0).traceId("abc").spanId("123").build();
     Exemplar exemplar2 = Exemplar.builder().value(6.5).traceId("def").spanId("456").build();
     Exemplar exemplar3 = Exemplar.builder().value(7.0).traceId("123").spanId("abc").build();
@@ -222,7 +220,7 @@ void decWithExemplar() {
   }
 
   @Test
-  public void testExemplarSamplerDisabled() {
+  void testExemplarSamplerDisabled() {
     Gauge gauge = Gauge.builder().name("test").withoutExemplars().build();
     gauge.setWithExemplar(3.0, Labels.of("a", "b"));
     assertThat(getData(gauge).getExemplar()).isNull();
@@ -231,7 +229,7 @@ public void testExemplarSamplerDisabled() {
   }
 
   @Test
-  public void testExemplarSamplerDisabledByBuilder_enabledByPropertiesOnMetric() {
+  void testExemplarSamplerDisabledByBuilder_enabledByPropertiesOnMetric() {
     PrometheusProperties properties =
         PrometheusProperties.builder()
             .putMetricProperty("test", MetricsProperties.builder().exemplarsEnabled(true).build())
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeWithCallbackTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeWithCallbackTest.java
index 92a2d605e..f89fd70d2 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeWithCallbackTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeWithCallbackTest.java
@@ -13,7 +13,7 @@
 class GaugeWithCallbackTest {
 
   @Test
-  public void testGauge() {
+  void testGauge() {
     final AtomicInteger value = new AtomicInteger(1);
     List<String> labelValues = Arrays.asList("v1", "v2");
     GaugeWithCallback gauge =
@@ -38,7 +38,7 @@ public void testGauge() {
   }
 
   @Test
-  public void testGaugeNoCallback() {
+  void testGaugeNoCallback() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> GaugeWithCallback.builder().name("gauge").labelNames("l1", "l2").build());
   }
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java
index 688bf786e..cbfd5fade 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java
@@ -1,9 +1,11 @@
 package io.prometheus.metrics.core.metrics;
 
 import static io.prometheus.metrics.core.metrics.TestUtil.assertExemplarEquals;
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.data.Offset.offset;
+import static org.awaitility.Awaitility.await;
 
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.config.MetricsProperties;
@@ -11,7 +13,7 @@
 import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
 import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.*;
@@ -26,7 +28,9 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.CountDownLatch;
@@ -37,6 +41,7 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.LongAdder;
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -51,12 +56,12 @@ class HistogramTest {
   private SpanContext origSpanContext;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     origSpanContext = SpanContextSupplier.getSpanContext();
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     SpanContextSupplier.setSpanContext(origSpanContext);
   }
 
@@ -99,7 +104,7 @@ private void run() throws NoSuchFieldException, IllegalAccessException {
 
   /** Test cases copied from histogram_test.go in client_golang. */
   @Test
-  public void testGolangTests() throws NoSuchFieldException, IllegalAccessException {
+  void testGolangTests() throws NoSuchFieldException, IllegalAccessException {
     GolangTestCase[] testCases =
         new GolangTestCase[] {
           new GolangTestCase(
@@ -763,7 +768,7 @@ public void testGolangTests() throws NoSuchFieldException, IllegalAccessExceptio
 
   /** Additional tests that are not part of client_golang's test suite. */
   @Test
-  public void testAdditional() throws NoSuchFieldException, IllegalAccessException {
+  void testAdditional() throws NoSuchFieldException, IllegalAccessException {
     GolangTestCase[] testCases =
         new GolangTestCase[] {
           new GolangTestCase(
@@ -797,7 +802,7 @@ public void testAdditional() throws NoSuchFieldException, IllegalAccessException
    * <p>This test is ported from client_golang's TestGetLe().
    */
   @Test
-  public void testNativeBucketIndexToUpperBound()
+  void testNativeBucketIndexToUpperBound()
       throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
     int[] indexes = new int[] {-1, 0, 1, 512, 513, -1, 0, 1, 1024, 1025, -1, 0, 1, 4096, 4097};
     int[] schemas = new int[] {-1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2};
@@ -834,12 +839,42 @@ public void testNativeBucketIndexToUpperBound()
     }
   }
 
+  @Test
+  void testDoubleBucketWidthMergesNegativeIndexesCorrectly()
+      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+    Histogram histogram = Histogram.builder().name("test").nativeOnly().build();
+    Histogram.DataPoint dataPoint = histogram.newDataPoint();
+
+    Method doubleBucketWidth =
+        Histogram.DataPoint.class.getDeclaredMethod("doubleBucketWidth", Map.class);
+    doubleBucketWidth.setAccessible(true);
+
+    int[] keys = {-5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5};
+    int[] expectedMergedIndexes = {-2, -2, -1, -1, 0, 0, 1, 1, 2, 2, 3};
+
+    for (int i = 0; i < keys.length; i++) {
+      Map<Integer, LongAdder> buckets = new HashMap<>();
+      LongAdder adder = new LongAdder();
+      adder.add(7);
+      buckets.put(keys[i], adder);
+
+      doubleBucketWidth.invoke(dataPoint, buckets);
+
+      assertThat(buckets.keySet())
+          .as("merged index for original key " + keys[i])
+          .containsExactly(expectedMergedIndexes[i]);
+      assertThat(buckets.get(expectedMergedIndexes[i]).sum())
+          .as("count preserved for original key " + keys[i])
+          .isEqualTo(7);
+    }
+  }
+
   /**
    * Test if lowerBound < value <= upperBound is true for the bucket index returned by
    * findBucketIndex()
    */
   @Test
-  public void testFindBucketIndex()
+  void testFindBucketIndex()
       throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
     Random rand = new Random();
     Method findBucketIndex =
@@ -884,7 +919,7 @@ public void testFindBucketIndex()
   }
 
   @Test
-  public void testDefaults() throws IOException {
+  void testDefaults() throws IOException {
     Histogram histogram = Histogram.builder().name("test").build();
     histogram.observe(0.5);
     HistogramSnapshot snapshot = histogram.collect();
@@ -955,7 +990,7 @@ public void testDefaults() throws IOException {
   }
 
   @Test
-  public void testExemplarsClassicHistogram() throws Exception {
+  void testExemplarsClassicHistogram() throws Exception {
     SpanContext spanContext =
         new SpanContext() {
           int callCount = 0;
@@ -1020,10 +1055,18 @@ public void markCurrentSpanAsExemplar() {}
     assertThat(getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/hello")).isNull();
     assertThat(getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/world")).isNull();
 
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(4.5);
     histogram.labelValues("/world").observe(4.5);
 
+    await()
+        .atMost(2, SECONDS)
+        .until(
+            () -> {
+              HistogramSnapshot s = histogram.collect();
+              return getExemplar(s, Double.POSITIVE_INFINITY, "path", "/hello") != null
+                  && getExemplar(s, Double.POSITIVE_INFINITY, "path", "/world") != null;
+            });
     snapshot = histogram.collect();
     assertExemplarEquals(ex1a, getExemplar(snapshot, 1.0, "path", "/hello"));
     assertExemplarEquals(ex1b, getExemplar(snapshot, 1.0, "path", "/world"));
@@ -1036,16 +1079,28 @@ public void markCurrentSpanAsExemplar() {}
     assertExemplarEquals(ex2a, getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/hello"));
     assertExemplarEquals(ex2b, getExemplar(snapshot, Double.POSITIVE_INFINITY, "path", "/world"));
 
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(1.5);
     histogram.labelValues("/world").observe(1.5);
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(2.5);
     histogram.labelValues("/world").observe(2.5);
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram.labelValues("/hello").observe(3.5);
     histogram.labelValues("/world").observe(3.5);
 
+    await()
+        .atMost(2, SECONDS)
+        .until(
+            () -> {
+              HistogramSnapshot s = histogram.collect();
+              return getExemplar(s, 2.0, "path", "/hello") != null
+                  && getExemplar(s, 2.0, "path", "/world") != null
+                  && getExemplar(s, 3.0, "path", "/hello") != null
+                  && getExemplar(s, 3.0, "path", "/world") != null
+                  && getExemplar(s, 4.0, "path", "/hello") != null
+                  && getExemplar(s, 4.0, "path", "/world") != null;
+            });
     snapshot = histogram.collect();
     assertExemplarEquals(ex1a, getExemplar(snapshot, 1.0, "path", "/hello"));
     assertExemplarEquals(ex1b, getExemplar(snapshot, 1.0, "path", "/world"));
@@ -1072,15 +1127,32 @@ public void markCurrentSpanAsExemplar() {}
                     "span_id",
                     "spanId-11"))
             .build();
-    Thread.sleep(sampleIntervalMillis + 1);
+    waitForSampleInterval(sampleIntervalMillis);
     histogram
         .labelValues("/hello")
         .observeWithExemplar(3.4, Labels.of("key1", "value1", "key2", "value2"));
+    await()
+        .atMost(2, SECONDS)
+        .until(
+            () -> {
+              Exemplar actual = getExemplar(histogram.collect(), 4.0, "path", "/hello");
+              return actual != null && Math.abs(actual.getValue() - 3.4) < 0.00001;
+            });
     snapshot = histogram.collect();
     // custom exemplars have preference, so the automatic exemplar is replaced
     assertExemplarEquals(custom, getExemplar(snapshot, 4.0, "path", "/hello"));
   }
 
+  /** Waits for the exemplar sampler's rate limit window so the next observation is accepted. */
+  private static void waitForSampleInterval(long sampleIntervalMillis) {
+    try {
+      Thread.sleep(2 * sampleIntervalMillis);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new AssertionError("Interrupted while waiting for sample interval", e);
+    }
+  }
+
   private Exemplar getExemplar(HistogramSnapshot snapshot, double le, String... labels) {
     HistogramSnapshot.HistogramDataPointSnapshot data =
         snapshot.getDataPoints().stream()
@@ -1099,7 +1171,7 @@ private Exemplar getExemplar(HistogramSnapshot snapshot, double le, String... la
   }
 
   @Test
-  public void testCustomExemplarsClassicHistogram()
+  void testCustomExemplarsClassicHistogram()
       throws InterruptedException, NoSuchFieldException, IllegalAccessException {
 
     // TODO: This was copied from the old simpleclient, can probably be refactored.
@@ -1167,7 +1239,7 @@ private void assertExemplar(Histogram histogram, double value, String... labels)
   }
 
   @Test
-  public void testExemplarsNativeHistogram() throws NoSuchFieldException, IllegalAccessException {
+  void testExemplarsNativeHistogram() throws NoSuchFieldException, IllegalAccessException {
 
     SpanContext spanContext =
         new SpanContext() {
@@ -1236,13 +1308,13 @@ public void markCurrentSpanAsExemplar() {}
   }
 
   @Test
-  public void testIllegalLabelName() {
+  void testIllegalLabelName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Histogram.builder().name("test").labelNames("label", "le"));
   }
 
   @Test
-  public void testIllegalLabelNameConstLabels() {
+  void testIllegalLabelNameConstLabels() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -1252,25 +1324,25 @@ public void testIllegalLabelNameConstLabels() {
   }
 
   @Test
-  public void testIllegalLabelNamePrefix() {
+  void testIllegalLabelNamePrefix() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Histogram.builder().name("test").labelNames("__hello"));
   }
 
   @Test
-  public void testNoName() {
+  void testNoName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Histogram.builder().build());
   }
 
   @Test
-  public void testNullName() {
+  void testNullName() {
     assertThatExceptionOfType(NullPointerException.class)
         .isThrownBy(() -> Histogram.builder().name(null));
   }
 
   @Test
-  public void testDuplicateClassicBuckets() {
+  void testDuplicateClassicBuckets() {
     Histogram histogram =
         Histogram.builder().name("test").classicUpperBounds(0, 3, 17, 3, 21).build();
     List<Double> upperBounds =
@@ -1282,7 +1354,7 @@ public void testDuplicateClassicBuckets() {
   }
 
   @Test
-  public void testUnsortedBuckets() {
+  void testUnsortedBuckets() {
     Histogram histogram = Histogram.builder().name("test").classicUpperBounds(0.2, 0.1).build();
     List<Double> upperBounds =
         getData(histogram).getClassicBuckets().stream()
@@ -1292,7 +1364,7 @@ public void testUnsortedBuckets() {
   }
 
   @Test
-  public void testEmptyBuckets() {
+  void testEmptyBuckets() {
     Histogram histogram = Histogram.builder().name("test").classicUpperBounds().build();
     List<Double> upperBounds =
         getData(histogram).getClassicBuckets().stream()
@@ -1302,7 +1374,7 @@ public void testEmptyBuckets() {
   }
 
   @Test
-  public void testBucketsIncludePositiveInfinity() {
+  void testBucketsIncludePositiveInfinity() {
     Histogram histogram =
         Histogram.builder()
             .name("test")
@@ -1316,7 +1388,7 @@ public void testBucketsIncludePositiveInfinity() {
   }
 
   @Test
-  public void testLinearBuckets() {
+  void testLinearBuckets() {
     Histogram histogram =
         Histogram.builder().name("test").classicLinearUpperBounds(0.1, 0.1, 10).build();
     List<Double> upperBounds =
@@ -1330,7 +1402,7 @@ public void testLinearBuckets() {
   }
 
   @Test
-  public void testExponentialBuckets() {
+  void testExponentialBuckets() {
     Histogram histogram =
         Histogram.builder().classicExponentialUpperBounds(2, 2.5, 3).name("test").build();
     List<Double> upperBounds =
@@ -1341,14 +1413,14 @@ public void testExponentialBuckets() {
   }
 
   @Test
-  public void testBucketsIncludeNaN() {
+  void testBucketsIncludeNaN() {
     assertThatExceptionOfType(RuntimeException.class)
         .isThrownBy(
             () -> Histogram.builder().name("test").classicUpperBounds(0.01, 0.1, 1.0, Double.NaN));
   }
 
   @Test
-  public void testNoLabelsDefaultZeroValue() {
+  void testNoLabelsDefaultZeroValue() {
     Histogram noLabels = Histogram.builder().name("test").build();
     assertThat(getBucket(noLabels, 0.005).getCount()).isZero();
     assertThat(getData(noLabels).getCount()).isZero();
@@ -1363,7 +1435,7 @@ private ClassicHistogramBucket getBucket(Histogram histogram, double le, String.
   }
 
   @Test
-  public void testObserve() {
+  void testObserve() {
     Histogram noLabels = Histogram.builder().name("test").build();
     noLabels.observe(2);
     assertThat(noLabels.getCount()).isOne();
@@ -1384,7 +1456,7 @@ public void testObserve() {
 
   @Test
   // See https://github.com/prometheus/client_java/issues/646
-  public void testNegativeAmount() {
+  void testNegativeAmount() {
     Histogram histogram =
         Histogram.builder()
             .name("histogram")
@@ -1410,7 +1482,7 @@ public void testNegativeAmount() {
   }
 
   @Test
-  public void testBoundaryConditions() {
+  void testBoundaryConditions() {
     Histogram histogram = Histogram.builder().name("test").build();
     histogram.observe(2.5);
     assertThat(getBucket(histogram, 1).getCount()).isZero();
@@ -1425,14 +1497,14 @@ public void testBoundaryConditions() {
   }
 
   @Test
-  public void testExemplarsDisabledInBuilder() {
+  void testExemplarsDisabledInBuilder() {
     Histogram histogram = Histogram.builder().withoutExemplars().name("test").build();
     histogram.observeWithExemplar(2.5, Labels.EMPTY);
     assertThat(getData(histogram).getExemplars().size()).isZero();
   }
 
   @Test
-  public void testExemplarsDisabledInBuilder_enabledByPropertiesOnMetric() {
+  void testExemplarsDisabledInBuilder_enabledByPropertiesOnMetric() {
     PrometheusProperties properties =
         PrometheusProperties.builder()
             .putMetricProperty("test", MetricsProperties.builder().exemplarsEnabled(true).build())
@@ -1444,7 +1516,7 @@ public void testExemplarsDisabledInBuilder_enabledByPropertiesOnMetric() {
   }
 
   @Test
-  public void testObserveWithLabels() {
+  void testObserveWithLabels() {
     Histogram histogram =
         Histogram.builder()
             .name("test")
@@ -1475,7 +1547,7 @@ public void testObserveWithLabels() {
   }
 
   @Test
-  public void testObserveMultithreaded()
+  void testObserveMultithreaded()
       throws InterruptedException, ExecutionException, TimeoutException {
     // Hard to test concurrency, but let's run a couple of observations in parallel and assert none
     // gets lost.
@@ -1526,6 +1598,70 @@ public void testObserveMultithreaded()
     assertThat(executor.awaitTermination(5, TimeUnit.SECONDS)).isTrue();
   }
 
+  @Test
+  void testNativeResetDuration() {
+    // Test that nativeResetDuration can be configured without error and the histogram
+    // functions correctly. The reset duration schedules internal reset behavior but
+    // is not directly observable in the snapshot.
+    Histogram histogram =
+        Histogram.builder()
+            .name("test_histogram_with_reset")
+            .nativeOnly()
+            .nativeResetDuration(24, TimeUnit.HOURS)
+            .build();
+
+    histogram.observe(1.0);
+    histogram.observe(2.0);
+    histogram.observe(3.0);
+
+    HistogramSnapshot snapshot = histogram.collect();
+    assertThat(snapshot.getDataPoints()).hasSize(1);
+    HistogramSnapshot.HistogramDataPointSnapshot dataPoint = snapshot.getDataPoints().get(0);
+    assertThat(dataPoint.hasNativeHistogramData()).isTrue();
+    assertThat(dataPoint.getCount()).isEqualTo(3);
+    assertThat(dataPoint.getSum()).isEqualTo(6.0);
+  }
+
+  @Test
+  void testNativeResetDurationNegativeValue() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(
+            () ->
+                Histogram.builder()
+                    .name("test_histogram")
+                    .nativeOnly()
+                    .nativeResetDuration(-1, TimeUnit.HOURS)
+                    .build())
+        .withMessageContaining("value > 0 expected");
+  }
+
+  @Test
+  void testNativeResetDurationZeroValue() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(
+            () ->
+                Histogram.builder()
+                    .name("test_histogram")
+                    .nativeOnly()
+                    .nativeResetDuration(0, TimeUnit.HOURS)
+                    .build())
+        .withMessageContaining("value > 0 expected");
+  }
+
+  @Test
+  void testNativeResetDurationSubSecond() {
+    // Sub-second durations should be rejected as they truncate to 0 seconds
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(
+            () ->
+                Histogram.builder()
+                    .name("test_histogram")
+                    .nativeOnly()
+                    .nativeResetDuration(500, TimeUnit.MILLISECONDS)
+                    .build())
+        .withMessageContaining("duration must be at least 1 second");
+  }
+
   private HistogramSnapshot.HistogramDataPointSnapshot getData(
       Histogram histogram, String... labels) {
     return histogram.collect().getDataPoints().stream()
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java
index e0db237a6..61cd38805 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java
@@ -5,7 +5,7 @@
 
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
 import io.prometheus.metrics.model.snapshots.Labels;
@@ -34,7 +34,7 @@ public void testInfoStrippedFromName(String name) {
   }
 
   @Test
-  public void testAddAndRemove() {
+  void testAddAndRemove() {
     Info info = Info.builder().name("test_info").labelNames("a", "b").build();
     assertThat(info.collect().getDataPoints()).isEmpty();
     info.addLabelValues("val1", "val2");
@@ -58,7 +58,7 @@ public void testAddAndRemove() {
   }
 
   @Test
-  public void testSet() throws IOException {
+  void testSet() throws IOException {
     Info info =
         Info.builder()
             .name("target_info")
@@ -88,7 +88,7 @@ public void testSet() throws IOException {
   }
 
   @Test
-  public void testConstLabelsOnly() throws IOException {
+  void testConstLabelsOnly() throws IOException {
     Info info =
         Info.builder()
             .name("target_info")
@@ -106,14 +106,14 @@ void unit() {
   }
 
   @Test
-  public void testConstLabelsDuplicate1() {
+  void testConstLabelsDuplicate1() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () -> Info.builder().constLabels(Labels.of("a_1", "val1")).labelNames("a.1").build());
   }
 
   @Test
-  public void testConstLabelsDuplicate2() {
+  void testConstLabelsDuplicate2() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () -> Info.builder().labelNames("a_1").constLabels(Labels.of("a.1", "val1")).build());
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadataTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadataTest.java
new file mode 100644
index 000000000..90d49f3e9
--- /dev/null
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/MetricWithFixedMetadataTest.java
@@ -0,0 +1,75 @@
+package io.prometheus.metrics.core.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.config.PrometheusProperties;
+import io.prometheus.metrics.model.registry.MetricType;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
+class MetricWithFixedMetadataTest {
+
+  @Test
+  @SuppressWarnings("deprecation")
+  void getMetricFamilyDescriptorAdaptsDeprecatedMetricTypeOverride() {
+    LegacyMetric metric =
+        LegacyMetric.builder()
+            .name("legacy.metric")
+            .constLabels(Labels.of("const.label", "value"))
+            .labelNames("dynamic.label")
+            .build();
+
+    MetricFamilyDescriptor descriptor = metric.getMetricFamilyDescriptor();
+
+    assertThat(descriptor).isNotNull();
+    assertThat(descriptor.getType()).isEqualTo(MetricType.GAUGE);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("legacy_metric");
+    assertThat(descriptor.getLabelNames())
+        .containsExactlyInAnyOrder("const_label", "dynamic_label");
+  }
+
+  private static class LegacyMetric extends MetricWithFixedMetadata {
+
+    private LegacyMetric(Builder builder) {
+      super(builder);
+    }
+
+    private static Builder builder() {
+      return new Builder();
+    }
+
+    @Override
+    public MetricSnapshot collect() {
+      throw new UnsupportedOperationException();
+    }
+
+    /**
+     * @deprecated Use {@link #getMetricFamilyDescriptor()} instead.
+     */
+    @Override
+    @Deprecated
+    public MetricType getMetricType() {
+      return MetricType.GAUGE;
+    }
+
+    private static class Builder extends MetricWithFixedMetadata.Builder<Builder, LegacyMetric> {
+
+      private Builder() {
+        super(Collections.emptyList(), PrometheusProperties.builder().build());
+      }
+
+      @Override
+      public LegacyMetric build() {
+        return new LegacyMetric(this);
+      }
+
+      @Override
+      protected Builder self() {
+        return this;
+      }
+    }
+  }
+}
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/OpenMetrics2TextFormatWriterTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/OpenMetrics2TextFormatWriterTest.java
new file mode 100644
index 000000000..38ba67270
--- /dev/null
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/OpenMetrics2TextFormatWriterTest.java
@@ -0,0 +1,118 @@
+package io.prometheus.metrics.core.metrics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.config.OpenMetrics2Properties;
+import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
+import io.prometheus.metrics.expositionformats.OpenMetrics2TextFormatWriter;
+import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.Unit;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import org.junit.jupiter.api.Test;
+
+class OpenMetrics2TextFormatWriterTest {
+
+  @Test
+  void counterPreservesOriginalNameWhenUnitIsConfigured() throws IOException {
+    Counter counter =
+        Counter.builder()
+            .name("my_counter")
+            .unit(Unit.SECONDS)
+            .help("Test counter")
+            .labelNames("method")
+            .build();
+    counter.labelValues("GET").inc(42.0);
+    MetricSnapshots snapshots = MetricSnapshots.of(counter.collect());
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om1Output).contains("my_counter_seconds_total{method=\"GET\"} 42.0");
+    assertThat(om2Output)
+        .contains("# TYPE my_counter counter\n")
+        .contains("# UNIT my_counter seconds\n")
+        .contains("# HELP my_counter Test counter\n")
+        .containsPattern("(?m)^my_counter\\{method=\"GET\"} 42\\.0 st@\\d+\\.\\d{3}$")
+        .doesNotContain("my_counter_seconds");
+  }
+
+  @Test
+  void classicHistogramPreservesOriginalNameWhenUnitIsConfigured() throws IOException {
+    Histogram histogram =
+        Histogram.builder()
+            .name("request_duration")
+            .unit(Unit.SECONDS)
+            .help("Request duration in seconds")
+            .labelNames("path")
+            .classicOnly()
+            .classicUpperBounds(10.0)
+            .build();
+    histogram.labelValues("/hello").observe(3.2);
+    MetricSnapshots snapshots = MetricSnapshots.of(histogram.collect());
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om1Output).contains("request_duration_seconds_bucket");
+    assertThat(om2Output)
+        .contains("# TYPE request_duration histogram\n")
+        .contains("# UNIT request_duration seconds\n")
+        .contains("# HELP request_duration Request duration in seconds\n")
+        .contains("request_duration_bucket{path=\"/hello\",le=\"10.0\"} 1\n")
+        .contains("request_duration_bucket{path=\"/hello\",le=\"+Inf\"} 1\n")
+        .contains("request_duration_count{path=\"/hello\"} 1\n")
+        .contains("request_duration_sum{path=\"/hello\"} 3.2\n")
+        .doesNotContain("request_duration_seconds");
+  }
+
+  @Test
+  void nativeHistogramPreservesOriginalNameWhenUnitIsConfigured() throws IOException {
+    Histogram histogram =
+        Histogram.builder()
+            .name("my.request.duration")
+            .unit(Unit.SECONDS)
+            .help("Request duration in seconds")
+            .labelNames("http.path")
+            .nativeOnly()
+            .build();
+    histogram.labelValues("/hello").observe(3.2);
+    MetricSnapshots snapshots = MetricSnapshots.of(histogram.collect());
+
+    String om2Output = writeWithNativeHistograms(snapshots);
+
+    assertThat(om2Output)
+        .contains("# TYPE \"my.request.duration\" histogram\n")
+        .contains("# UNIT \"my.request.duration\" seconds\n")
+        .contains("# HELP \"my.request.duration\" Request duration in seconds\n")
+        .contains("{\"my.request.duration\",\"http.path\"=\"/hello\"} {count:1,sum:3.2,")
+        .doesNotContain("my.request.duration_seconds");
+  }
+
+  private String writeWithOM1(MetricSnapshots snapshots) throws IOException {
+    return write(snapshots, OpenMetricsTextFormatWriter.create());
+  }
+
+  private String writeWithOM2(MetricSnapshots snapshots) throws IOException {
+    return write(snapshots, OpenMetrics2TextFormatWriter.create());
+  }
+
+  private String writeWithNativeHistograms(MetricSnapshots snapshots) throws IOException {
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().nativeHistograms(true).build())
+            .build();
+    return write(snapshots, writer);
+  }
+
+  private String write(MetricSnapshots snapshots, ExpositionFormatWriter writer)
+      throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    writer.write(out, snapshots, EscapingScheme.ALLOW_UTF8);
+    return out.toString(StandardCharsets.UTF_8.name());
+  }
+}
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SlidingWindowTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SlidingWindowTest.java
index d85e5637c..dea8fdfbd 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SlidingWindowTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SlidingWindowTest.java
@@ -43,7 +43,7 @@ void assertValues(double... expectedValues) {
   private final long timeBetweenRotateMillis = maxAgeSeconds * 1000 / ageBuckets + 2;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     startTime = System.currentTimeMillis();
     currentTimeMillis.set(startTime);
     ringBuffer =
@@ -57,7 +57,7 @@ public void setUp() {
   }
 
   @Test
-  public void testRotate() {
+  void testRotate() {
     for (int i = 0; i < ageBuckets; i++) {
       currentTimeMillis.addAndGet(timeBetweenRotateMillis);
       ringBuffer.observe(1.0);
@@ -76,7 +76,7 @@ public void testRotate() {
   }
 
   @Test
-  public void testMultiRotate() {
+  void testMultiRotate() {
     ringBuffer.observe(1.0);
     currentTimeMillis.addAndGet(2 * timeBetweenRotateMillis); // 2/5 of max aqe
     ringBuffer.observe(2.0);
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StateSetTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StateSetTest.java
index 7d466335b..318013edf 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StateSetTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StateSetTest.java
@@ -27,7 +27,7 @@ public String toString() {
   }
 
   @Test
-  public void testEnumStateSet() {
+  void testEnumStateSet() {
     StateSet stateSet =
         StateSet.builder()
             .name("feature_flags")
@@ -51,7 +51,7 @@ public void testEnumStateSet() {
   }
 
   @Test
-  public void testDefaultFalse() {
+  void testDefaultFalse() {
     StateSet stateSet =
         StateSet.builder().name("test").states("state1", "state2", "state3").build();
     assertThat(getData(stateSet).size()).isEqualTo(3);
@@ -83,7 +83,7 @@ private StateSetSnapshot.StateSetDataPointSnapshot getData(StateSet stateSet, St
   }
 
   @Test
-  public void testStatesCannotBeEmpty() {
+  void testStatesCannotBeEmpty() {
     assertThatExceptionOfType(IllegalStateException.class)
         .isThrownBy(() -> StateSet.builder().name("invalid").build());
   }
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java
index 00aa53bbd..f940d505d 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java
@@ -12,7 +12,7 @@
 class StatefulMetricTest {
 
   @Test
-  public void testLabelRemoveWhileCollecting() throws Exception {
+  void testLabelRemoveWhileCollecting() throws Exception {
     Counter counter = Counter.builder().name("test").labelNames("label1", "label2").build();
     Field data = counter.getClass().getSuperclass().getDeclaredField("data");
     data.setAccessible(true);
@@ -61,7 +61,7 @@ public void testLabelRemoveIf() throws Exception {
   }
 
   @Test
-  public void testClear() {
+  void testClear() {
     Counter counter = Counter.builder().name("test").labelNames("label1", "label2").build();
     counter.labelValues("a", "b").inc(3.0);
     counter.labelValues("c", "d").inc(3.0);
@@ -76,7 +76,7 @@ public void testClear() {
   }
 
   @Test
-  public void testClearNoLabels() {
+  void testClearNoLabels() {
     Counter counter = Counter.builder().name("test").build();
     counter.inc();
     assertThat(counter.collect().getDataPoints()).hasSize(1);
@@ -95,7 +95,7 @@ public void testClearNoLabels() {
   }
 
   @Test
-  public void testNullLabel() {
+  void testNullLabel() {
     Counter counter = Counter.builder().name("test").labelNames("l1", "l2").build();
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> counter.labelValues("l1", null))
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryTest.java
index cdfffe5f0..b6c045229 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryTest.java
@@ -30,7 +30,7 @@ class SummaryTest {
   private Summary noLabelsAndQuantiles;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     registry = new PrometheusRegistry();
     noLabels =
         Summary.builder().name("nolabels").unit(Unit.SECONDS).help("help").register(registry);
@@ -63,7 +63,7 @@ public void setUp() {
   }
 
   @Test
-  public void testObserve() {
+  void testObserve() {
     noLabels.observe(2);
     assertThat(noLabels.getCount()).isOne();
     assertThat(noLabels.getSum()).isCloseTo(2.0, offset(.0));
@@ -86,7 +86,7 @@ public void testObserve() {
   }
 
   @Test
-  public void testNegativeAmount() {
+  void testNegativeAmount() {
     noLabels.observe(-1);
     noLabels.observe(-3);
     assertThat(getCount(noLabels, Labels.EMPTY)).isEqualTo(2);
@@ -94,7 +94,7 @@ public void testNegativeAmount() {
   }
 
   @Test
-  public void testQuantiles() {
+  void testQuantiles() {
     int nSamples = 1000000; // simulate one million samples
 
     for (int i = 1; i <= nSamples; i++) {
@@ -119,7 +119,7 @@ public void testQuantiles() {
   }
 
   @Test
-  public void testMaxAge() throws InterruptedException {
+  void testMaxAge() throws InterruptedException {
     Summary summary =
         Summary.builder()
             .quantile(0.99, 0.001)
@@ -138,7 +138,7 @@ public void testMaxAge() throws InterruptedException {
   }
 
   @Test
-  public void testTimer() {
+  void testTimer() {
     int result = noLabels.time(() -> 123);
     assertThat(result).isEqualTo(123);
     assertThat(getCount(noLabels, Labels.EMPTY)).isOne();
@@ -150,31 +150,31 @@ public void testTimer() {
   }
 
   @Test
-  public void noLabelsDefaultZeroValue() {
+  void noLabelsDefaultZeroValue() {
     assertThat(getCount(noLabels, Labels.EMPTY)).isZero();
     assertThat(getSum(noLabels, Labels.EMPTY)).isCloseTo(0.0, offset(.001));
   }
 
   @Test
-  public void testBuilderInvalidNumberOfAgeBuckets() {
+  void testBuilderInvalidNumberOfAgeBuckets() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Summary.builder().name("name").numberOfAgeBuckets(-1).build());
   }
 
   @Test
-  public void testBuilderInvalidMaxAge() {
+  void testBuilderInvalidMaxAge() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Summary.builder().name("name").maxAgeSeconds(-1).build());
   }
 
   @Test
-  public void testBuilderInvalidQuantile() {
+  void testBuilderInvalidQuantile() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Summary.builder().name("name").quantile(42).build());
   }
 
   @Test
-  public void testBuilderInvalidQuantileError() {
+  void testBuilderInvalidQuantileError() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Summary.builder().name("name").quantile(0.5, 20).build());
   }
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryWithCallbackTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryWithCallbackTest.java
index 929efc597..aacb83193 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryWithCallbackTest.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryWithCallbackTest.java
@@ -15,7 +15,7 @@
 class SummaryWithCallbackTest {
 
   @Test
-  public void testGauge() {
+  void testGauge() {
     final AtomicInteger count = new AtomicInteger(1);
     final AtomicInteger sum = new AtomicInteger(1);
     final Quantiles quantiles = Quantiles.of(new Quantile(0.5, 10));
@@ -49,7 +49,7 @@ public void testGauge() {
   }
 
   @Test
-  public void testSummaryNoCallback() {
+  void testSummaryNoCallback() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () -> SummaryWithCallback.builder().name("summary").labelNames("l1", "l2").build());
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/TestUtil.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/TestUtil.java
index 8d9a5bd0f..10ce1db94 100644
--- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/TestUtil.java
+++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/TestUtil.java
@@ -6,7 +6,7 @@
 import io.prometheus.metrics.model.snapshots.Exemplar;
 import io.prometheus.metrics.model.snapshots.Label;
 
-class TestUtil {
+public class TestUtil {
 
   public static void assertExemplarEquals(Exemplar expected, Exemplar actual) {
     // ignore timestamp
diff --git a/prometheus-metrics-exporter-common/pom.xml b/prometheus-metrics-exporter-common/pom.xml
index 73eed61cb..9fb2b9621 100644
--- a/prometheus-metrics-exporter-common/pom.xml
+++ b/prometheus-metrics-exporter-common/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-common</artifactId>
@@ -22,6 +21,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-model</artifactId>
@@ -38,6 +43,14 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/InvalidQueryParameterException.java b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/InvalidQueryParameterException.java
new file mode 100644
index 000000000..0622952e7
--- /dev/null
+++ b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/InvalidQueryParameterException.java
@@ -0,0 +1,21 @@
+package io.prometheus.metrics.exporter.common;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+class InvalidQueryParameterException extends RuntimeException {
+
+  InvalidQueryParameterException(String message) {
+    super(message);
+  }
+
+  // decode with Charset is only available in Java 10+, but we want to support Java 8
+  @SuppressWarnings("JdkObsolete")
+  static String urlDecode(String value) throws UnsupportedEncodingException {
+    try {
+      return URLDecoder.decode(value, "UTF-8");
+    } catch (IllegalArgumentException e) {
+      throw new InvalidQueryParameterException("Invalid percent-encoding in query string");
+    }
+  }
+}
diff --git a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpExchange.java b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpExchange.java
index b7ac63b28..81d00e62b 100644
--- a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpExchange.java
+++ b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpExchange.java
@@ -1,7 +1,9 @@
 package io.prometheus.metrics.exporter.common;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 
+@StableApi
 public interface PrometheusHttpExchange extends AutoCloseable {
   PrometheusHttpRequest getRequest();
 
diff --git a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequest.java b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequest.java
index 3af9996e3..a0a8311f6 100644
--- a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequest.java
+++ b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequest.java
@@ -1,12 +1,13 @@
 package io.prometheus.metrics.exporter.common;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.registry.PrometheusScrapeRequest;
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import javax.annotation.Nullable;
 
+@StableApi
 public interface PrometheusHttpRequest extends PrometheusScrapeRequest {
 
   /** See {@code jakarta.servlet.http.HttpServletRequest.getQueryString()} */
@@ -40,20 +41,58 @@ default String getParameter(String name) {
     }
   }
 
-  /** See {@code jakarta.servlet.ServletRequest.getParameterValues(String)} */
+  /**
+   * See {@code jakarta.servlet.ServletRequest.getParameterValues(String)}.
+   *
+   * <p>For safety, the default implementation applies two fixed limits: {@code maxQueryStringLength
+   * = 64 * 1024} (65,536 characters) and {@code maxQueryParameterCount = 1024} ({@code &}-separated
+   * parameter pairs). These implementation values are not exposed as runtime configuration.
+   * Requests that exceed either limit or contain invalid percent-encoding are rejected by the
+   * scrape handler with HTTP {@code 400 Bad Request}.
+   */
   @Override
   @Nullable
+  // decode with Charset is only available in Java 10+, but we want to support Java 8
+  @SuppressWarnings("JdkObsolete")
   default String[] getParameterValues(String name) {
     try {
+      int maxQueryStringLength = 64 * 1024;
+      int maxQueryParameterCount = 1024;
       ArrayList<String> result = new ArrayList<>();
       String queryString = getQueryString();
       if (queryString != null) {
-        String[] pairs = queryString.split("&");
-        for (String pair : pairs) {
+        if (queryString.length() > maxQueryStringLength) {
+          throw new InvalidQueryParameterException(
+              "Query string too long: "
+                  + queryString.length()
+                  + " characters (max "
+                  + maxQueryStringLength
+                  + ")");
+        }
+        int start = 0;
+        int parameterCount = 0;
+        for (int end = queryString.indexOf('&'); start <= queryString.length(); ) {
+          parameterCount++;
+          if (parameterCount > maxQueryParameterCount) {
+            throw new InvalidQueryParameterException(
+                "Too many query parameters: "
+                    + parameterCount
+                    + " (max "
+                    + maxQueryParameterCount
+                    + ")");
+          }
+          String pair =
+              end == -1 ? queryString.substring(start) : queryString.substring(start, end);
           int idx = pair.indexOf("=");
-          if (idx != -1 && URLDecoder.decode(pair.substring(0, idx), "UTF-8").equals(name)) {
-            result.add(URLDecoder.decode(pair.substring(idx + 1), "UTF-8"));
+          if (idx != -1
+              && InvalidQueryParameterException.urlDecode(pair.substring(0, idx)).equals(name)) {
+            result.add(InvalidQueryParameterException.urlDecode(pair.substring(idx + 1)));
+          }
+          if (end == -1) {
+            break;
           }
+          start = end + 1;
+          end = queryString.indexOf('&', start);
         }
       }
       if (result.isEmpty()) {
diff --git a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpResponse.java b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpResponse.java
index b3dd4e2fb..b084d3989 100644
--- a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpResponse.java
+++ b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusHttpResponse.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.exporter.common;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 import java.io.OutputStream;
 
+@StableApi
 public interface PrometheusHttpResponse {
 
   /** See {@code jakarta.servlet.http.HttpServletResponse.setHeader(String, String)} */
diff --git a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java
index 3ce4bdb98..d97a90205 100644
--- a/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java
+++ b/prometheus-metrics-exporter-common/src/main/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandler.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.exporter.common;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.config.ExporterFilterProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
@@ -22,6 +23,7 @@
 import javax.annotation.Nullable;
 
 /** Prometheus scrape endpoint. */
+@StableApi
 public class PrometheusScrapeHandler {
 
   private final PrometheusRegistry registry;
@@ -29,6 +31,7 @@ public class PrometheusScrapeHandler {
   @Nullable private final Predicate<String> nameFilter;
   private final AtomicInteger lastResponseSize = new AtomicInteger(2 << 9); //  0.5 MB
   private final List<String> supportedFormats;
+  private final boolean preferUncompressedResponse;
 
   public PrometheusScrapeHandler() {
     this(PrometheusProperties.get(), PrometheusRegistry.defaultRegistry);
@@ -43,7 +46,9 @@ public PrometheusScrapeHandler(PrometheusProperties config) {
   }
 
   public PrometheusScrapeHandler(PrometheusProperties config, PrometheusRegistry registry) {
-    this.expositionFormats = ExpositionFormats.init(config.getExporterProperties());
+    this.expositionFormats = ExpositionFormats.init(config);
+    this.preferUncompressedResponse =
+        config.getExporterHttpServerProperties().isPreferUncompressedResponse();
     this.registry = registry;
     this.nameFilter = makeNameFilter(config.getExporterFilterProperties());
     supportedFormats = new ArrayList<>(Arrays.asList("openmetrics", "text"));
@@ -55,10 +60,19 @@ public PrometheusScrapeHandler(PrometheusProperties config, PrometheusRegistry r
   public void handleRequest(PrometheusHttpExchange exchange) throws IOException {
     try {
       PrometheusHttpRequest request = exchange.getRequest();
-      MetricSnapshots snapshots = scrape(request);
+      String[] includedNames = null;
+      String debugParam = null;
+      try {
+        includedNames = request.getParameterValues("name[]");
+        debugParam = request.getParameter("debug");
+      } catch (InvalidQueryParameterException e) {
+        writeInvalidQueryParametersResponse(exchange);
+        return;
+      }
+      MetricSnapshots snapshots = scrape(request, includedNames);
       String acceptHeader = request.getHeader("Accept");
       EscapingScheme escapingScheme = EscapingScheme.fromAcceptHeader(acceptHeader);
-      if (writeDebugResponse(snapshots, escapingScheme, exchange)) {
+      if (writeDebugResponse(snapshots, escapingScheme, debugParam, exchange)) {
         return;
       }
       ExpositionFormatWriter writer = expositionFormats.findWriter(acceptHeader);
@@ -131,9 +145,9 @@ private Predicate<String> makeNameFilter(@Nullable String[] includedNames) {
     return result;
   }
 
-  private MetricSnapshots scrape(PrometheusHttpRequest request) {
+  private MetricSnapshots scrape(PrometheusHttpRequest request, @Nullable String[] includedNames) {
 
-    Predicate<String> filter = makeNameFilter(request.getParameterValues("name[]"));
+    Predicate<String> filter = makeNameFilter(includedNames);
     if (filter != null) {
       return registry.scrape(filter, request);
     } else {
@@ -142,9 +156,11 @@ private MetricSnapshots scrape(PrometheusHttpRequest request) {
   }
 
   private boolean writeDebugResponse(
-      MetricSnapshots snapshots, EscapingScheme escapingScheme, PrometheusHttpExchange exchange)
+      MetricSnapshots snapshots,
+      EscapingScheme escapingScheme,
+      @Nullable String debugParam,
+      PrometheusHttpExchange exchange)
       throws IOException {
-    String debugParam = exchange.getRequest().getParameter("debug");
     PrometheusHttpResponse response = exchange.getResponse();
     if (debugParam == null) {
       return false;
@@ -179,7 +195,21 @@ private boolean writeDebugResponse(
     }
   }
 
+  private void writeInvalidQueryParametersResponse(PrometheusHttpExchange exchange)
+      throws IOException {
+    PrometheusHttpResponse response = exchange.getResponse();
+    response.setHeader("Content-Type", "text/plain; charset=utf-8");
+    byte[] message = "Invalid query parameters".getBytes(StandardCharsets.UTF_8);
+    try (OutputStream outputStream = response.sendHeadersAndGetBody(400, message.length)) {
+      outputStream.write(message);
+    }
+  }
+
   private boolean shouldUseCompression(PrometheusHttpRequest request) {
+    if (preferUncompressedResponse) {
+      return false;
+    }
+
     Enumeration<String> encodingHeaders = request.getHeaders("Accept-Encoding");
     if (encodingHeaders == null) {
       return false;
diff --git a/prometheus-metrics-exporter-common/src/test/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequestTest.java b/prometheus-metrics-exporter-common/src/test/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequestTest.java
new file mode 100644
index 000000000..c2af705a4
--- /dev/null
+++ b/prometheus-metrics-exporter-common/src/test/java/io/prometheus/metrics/exporter/common/PrometheusHttpRequestTest.java
@@ -0,0 +1,137 @@
+package io.prometheus.metrics.exporter.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import org.junit.jupiter.api.Test;
+
+class PrometheusHttpRequestTest {
+
+  @Test
+  void testGetHeaderReturnsFirstValue() {
+    PrometheusHttpRequest request =
+        new TestPrometheusHttpRequest("name[]=metric1&name[]=metric2", "gzip");
+    assertThat(request.getHeader("Accept-Encoding")).isEqualTo("gzip");
+  }
+
+  @Test
+  void testGetHeaderReturnsNullWhenNoHeaders() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("", null);
+    assertThat(request.getHeader("Accept-Encoding")).isNull();
+  }
+
+  @Test
+  void testGetParameterReturnsFirstValue() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("name[]=metric1&name[]=metric2");
+    assertThat(request.getParameter("name[]")).isEqualTo("metric1");
+  }
+
+  @Test
+  void testGetParameterReturnsNullWhenNotPresent() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("other=value");
+    assertThat(request.getParameter("name[]")).isNull();
+  }
+
+  @Test
+  void testGetParameterValuesReturnsMultipleValues() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("name[]=metric1&name[]=metric2");
+    String[] values = request.getParameterValues("name[]");
+    assertThat(values).containsExactly("metric1", "metric2");
+  }
+
+  @Test
+  void testGetParameterValuesReturnsNullWhenNotPresent() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("other=value");
+    assertThat(request.getParameterValues("name[]")).isNull();
+  }
+
+  @Test
+  void testGetParameterValuesWithEmptyQueryString() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("");
+    assertThat(request.getParameterValues("name[]")).isNull();
+  }
+
+  @Test
+  void testGetParameterValuesWithNullQueryString() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest(null);
+    assertThat(request.getParameterValues("name[]")).isNull();
+  }
+
+  @Test
+  void testGetParameterValuesWithUrlEncodedValues() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("name=hello%20world");
+    String[] values = request.getParameterValues("name");
+    assertThat(values).containsExactly("hello world");
+  }
+
+  @Test
+  void testGetParameterValuesWithSpecialCharacters() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("name=%2Ffoo%2Fbar");
+    String[] values = request.getParameterValues("name");
+    assertThat(values).containsExactly("/foo/bar");
+  }
+
+  @Test
+  void testGetParameterValuesIgnoresParametersWithoutEquals() {
+    PrometheusHttpRequest request =
+        new TestPrometheusHttpRequest("name[]=value1&invalid&name[]=value2");
+    String[] values = request.getParameterValues("name[]");
+    assertThat(values).containsExactly("value1", "value2");
+  }
+
+  @Test
+  void testGetParameterValuesRejectsMalformedEncodedName() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("name%ZZ=value");
+
+    assertThatExceptionOfType(InvalidQueryParameterException.class)
+        .isThrownBy(() -> request.getParameterValues("name"));
+  }
+
+  @Test
+  void testGetParameterValuesRejectsMalformedEncodedValue() {
+    PrometheusHttpRequest request = new TestPrometheusHttpRequest("name=value%ZZ");
+
+    assertThatExceptionOfType(InvalidQueryParameterException.class)
+        .isThrownBy(() -> request.getParameterValues("name"));
+  }
+
+  /** Test implementation of PrometheusHttpRequest for testing default methods. */
+  private static class TestPrometheusHttpRequest implements PrometheusHttpRequest {
+    private final String queryString;
+    private final String acceptEncoding;
+
+    TestPrometheusHttpRequest(String queryString) {
+      this(queryString, null);
+    }
+
+    TestPrometheusHttpRequest(String queryString, String acceptEncoding) {
+      this.queryString = queryString;
+      this.acceptEncoding = acceptEncoding;
+    }
+
+    @Override
+    public String getQueryString() {
+      return queryString;
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String name) {
+      if (acceptEncoding != null && name.equals("Accept-Encoding")) {
+        return Collections.enumeration(Collections.singletonList(acceptEncoding));
+      }
+      return null;
+    }
+
+    @Override
+    public String getMethod() {
+      return "GET";
+    }
+
+    @Override
+    public String getRequestPath() {
+      return "/metrics";
+    }
+  }
+}
diff --git a/prometheus-metrics-exporter-common/src/test/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandlerTest.java b/prometheus-metrics-exporter-common/src/test/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandlerTest.java
new file mode 100644
index 000000000..4f190b61f
--- /dev/null
+++ b/prometheus-metrics-exporter-common/src/test/java/io/prometheus/metrics/exporter/common/PrometheusScrapeHandlerTest.java
@@ -0,0 +1,333 @@
+package io.prometheus.metrics.exporter.common;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class PrometheusScrapeHandlerTest {
+
+  private PrometheusRegistry registry;
+  private PrometheusScrapeHandler handler;
+  private Counter testCounter;
+
+  @BeforeEach
+  void setUp() {
+    registry = new PrometheusRegistry();
+    handler = new PrometheusScrapeHandler(registry);
+    testCounter = Counter.builder().name("test_counter").help("Test counter").register(registry);
+    testCounter.inc(5);
+  }
+
+  @Test
+  void testBasicScrape() throws IOException {
+    TestHttpExchange exchange = new TestHttpExchange("GET", null);
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseBody()).contains("test_counter");
+    assertThat(exchange.getResponseBody()).contains("5.0");
+  }
+
+  @Test
+  void testOpenMetricsFormat() throws IOException {
+    TestHttpExchange exchange =
+        new TestHttpExchange("GET", null).withHeader("Accept", "application/openmetrics-text");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseHeaders().get("Content-Type"))
+        .contains("application/openmetrics-text");
+    assertThat(exchange.getResponseBody()).contains("test_counter");
+  }
+
+  @Test
+  void testPrometheusTextFormat() throws IOException {
+    TestHttpExchange exchange =
+        new TestHttpExchange("GET", null).withHeader("Accept", "text/plain");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseHeaders().get("Content-Type")).contains("text/plain");
+    assertThat(exchange.getResponseBody()).contains("test_counter");
+  }
+
+  @Test
+  void testGzipCompression() throws IOException {
+    TestHttpExchange exchange =
+        new TestHttpExchange("GET", null).withHeader("Accept-Encoding", "gzip");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseHeaders().get("Content-Encoding")).isEqualTo("gzip");
+    assertThat(exchange.isGzipCompressed()).isTrue();
+
+    // Decompress and verify content
+    String decompressed = exchange.getDecompressedBody();
+    assertThat(decompressed).contains("test_counter");
+  }
+
+  @Test
+  void testMultipleAcceptEncodingHeaders() throws IOException {
+    TestHttpExchange exchange =
+        new TestHttpExchange("GET", null)
+            .withHeader("Accept-Encoding", "deflate")
+            .withHeader("Accept-Encoding", "gzip, br");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseHeaders().get("Content-Encoding")).isEqualTo("gzip");
+  }
+
+  @Test
+  void testHeadRequest() throws IOException {
+    TestHttpExchange exchange = new TestHttpExchange("HEAD", null);
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseHeaders().get("Content-Length")).isNotNull();
+    // For HEAD requests, body should be empty even though Content-Length is set
+    assertThat(exchange.rawResponseBody.size()).isEqualTo(0);
+  }
+
+  @Test
+  void testDebugOpenMetrics() throws IOException {
+    TestHttpExchange exchange = new TestHttpExchange("GET", "debug=openmetrics");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseHeaders().get("Content-Type"))
+        .isEqualTo("text/plain; charset=utf-8");
+    assertThat(exchange.getResponseBody()).contains("test_counter");
+  }
+
+  @Test
+  void testDebugText() throws IOException {
+    TestHttpExchange exchange = new TestHttpExchange("GET", "debug=text");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseBody()).contains("test_counter");
+  }
+
+  @Test
+  void testDebugInvalidParameter() throws IOException {
+    TestHttpExchange exchange = new TestHttpExchange("GET", "debug=invalid");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(500);
+    assertThat(exchange.getResponseBody()).contains("debug=invalid: Unsupported query parameter");
+  }
+
+  @Test
+  void testMetricNameFilter() throws IOException {
+    Counter anotherCounter =
+        Counter.builder().name("another_counter").help("Another counter").register(registry);
+    anotherCounter.inc(10);
+
+    TestHttpExchange exchange = new TestHttpExchange("GET", "name[]=test_counter");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    assertThat(exchange.getResponseBody()).contains("test_counter");
+    assertThat(exchange.getResponseBody()).doesNotContain("another_counter");
+  }
+
+  @Test
+  void testMultipleMetricNameFilters() throws IOException {
+    Counter counter1 = Counter.builder().name("metric_one").help("Metric one").register(registry);
+    Counter counter2 = Counter.builder().name("metric_two").help("Metric two").register(registry);
+    Counter counter3 =
+        Counter.builder().name("metric_three").help("Metric three").register(registry);
+    counter1.inc();
+    counter2.inc();
+    counter3.inc();
+
+    TestHttpExchange exchange = new TestHttpExchange("GET", "name[]=metric_one&name[]=metric_two");
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(200);
+    String body = exchange.getResponseBody();
+    assertThat(body).contains("metric_one");
+    assertThat(body).contains("metric_two");
+    assertThat(body).doesNotContain("metric_three");
+  }
+
+  @Test
+  void testRejectsTooManyQueryParameters() throws IOException {
+    StringBuilder queryString = new StringBuilder("name[]=test_counter");
+    for (int i = 0; i < 1024; i++) {
+      queryString.append("&name[]=metric_").append(i);
+    }
+
+    TestHttpExchange exchange = new TestHttpExchange("GET", queryString.toString());
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(400);
+    assertThat(exchange.getResponseHeaders().get("Content-Type"))
+        .isEqualTo("text/plain; charset=utf-8");
+    assertThat(exchange.getResponseBody()).isEqualTo("Invalid query parameters");
+  }
+
+  @Test
+  void testRejectsTooLongQueryString() throws IOException {
+    StringBuilder queryString = new StringBuilder("name[]=");
+    for (int i = 0; i < 64 * 1024; i++) {
+      queryString.append("a");
+    }
+
+    TestHttpExchange exchange = new TestHttpExchange("GET", queryString.toString());
+    handler.handleRequest(exchange);
+
+    assertThat(exchange.getResponseCode()).isEqualTo(400);
+    assertThat(exchange.getResponseBody()).isEqualTo("Invalid query parameters");
+  }
+
+  /** Test implementation of PrometheusHttpExchange for testing. */
+  private static class TestHttpExchange implements PrometheusHttpExchange {
+    private final TestHttpRequest request;
+    private final TestHttpResponse response;
+    private boolean closed = false;
+
+    ByteArrayOutputStream rawResponseBody = new ByteArrayOutputStream();
+
+    TestHttpExchange(String method, String queryString) {
+      this.request = new TestHttpRequest(method, queryString);
+      this.response = new TestHttpResponse(rawResponseBody);
+    }
+
+    TestHttpExchange withHeader(String name, String value) {
+      request.addHeader(name, value);
+      return this;
+    }
+
+    @Override
+    public PrometheusHttpRequest getRequest() {
+      return request;
+    }
+
+    @Override
+    public PrometheusHttpResponse getResponse() {
+      return response;
+    }
+
+    @Override
+    public void handleException(IOException e) throws IOException {
+      throw e;
+    }
+
+    @Override
+    public void handleException(RuntimeException e) {
+      throw e;
+    }
+
+    @Override
+    public void close() {
+      closed = true;
+    }
+
+    public int getResponseCode() {
+      return response.statusCode;
+    }
+
+    public Map<String, String> getResponseHeaders() {
+      return response.headers;
+    }
+
+    public String getResponseBody() {
+      return new String(rawResponseBody.toByteArray(), StandardCharsets.UTF_8);
+    }
+
+    public boolean isGzipCompressed() {
+      return "gzip".equals(response.headers.get("Content-Encoding"));
+    }
+
+    public String getDecompressedBody() throws IOException {
+      if (!isGzipCompressed()) {
+        return getResponseBody();
+      }
+      byte[] compressed = rawResponseBody.toByteArray();
+      try (GZIPInputStream gzipInputStream =
+          new GZIPInputStream(new java.io.ByteArrayInputStream(compressed))) {
+        ByteArrayOutputStream decompressed = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int len;
+        while ((len = gzipInputStream.read(buffer)) > 0) {
+          decompressed.write(buffer, 0, len);
+        }
+        return decompressed.toString(StandardCharsets.UTF_8.name());
+      }
+    }
+  }
+
+  /** Test implementation of PrometheusHttpRequest. */
+  private static class TestHttpRequest implements PrometheusHttpRequest {
+    private final String method;
+    private final String queryString;
+    private final Map<String, java.util.List<String>> headers = new HashMap<>();
+
+    TestHttpRequest(String method, String queryString) {
+      this.method = method;
+      this.queryString = queryString;
+    }
+
+    void addHeader(String name, String value) {
+      headers.computeIfAbsent(name, k -> new java.util.ArrayList<>()).add(value);
+    }
+
+    @Override
+    public String getQueryString() {
+      return queryString;
+    }
+
+    @Override
+    public Enumeration<String> getHeaders(String name) {
+      java.util.List<String> values = headers.get(name);
+      return values == null ? null : Collections.enumeration(values);
+    }
+
+    @Override
+    public String getMethod() {
+      return method;
+    }
+
+    @Override
+    public String getRequestPath() {
+      return "/metrics";
+    }
+  }
+
+  /** Test implementation of PrometheusHttpResponse. */
+  private static class TestHttpResponse implements PrometheusHttpResponse {
+    private final Map<String, String> headers = new HashMap<>();
+    private final ByteArrayOutputStream outputStream;
+    private int statusCode;
+
+    TestHttpResponse(ByteArrayOutputStream outputStream) {
+      this.outputStream = outputStream;
+    }
+
+    @Override
+    public void setHeader(String name, String value) {
+      headers.put(name, value);
+    }
+
+    @Override
+    public OutputStream sendHeadersAndGetBody(int statusCode, int contentLength)
+        throws IOException {
+      this.statusCode = statusCode;
+      return outputStream;
+    }
+  }
+}
diff --git a/prometheus-metrics-exporter-httpserver/pom.xml b/prometheus-metrics-exporter-httpserver/pom.xml
index 07c2abd71..cca3c09e2 100644
--- a/prometheus-metrics-exporter-httpserver/pom.xml
+++ b/prometheus-metrics-exporter-httpserver/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-httpserver</artifactId>
@@ -19,10 +18,16 @@
 
   <properties>
     <automatic.module.name>io.prometheus.metrics.exporter.httpserver</automatic.module.name>
-    <jacoco.line-coverage>0.45</jacoco.line-coverage>
+    <jacoco.line-coverage>0.60</jacoco.line-coverage>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-common</artifactId>
diff --git a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java
index 103383b47..2cafbb89c 100644
--- a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java
+++ b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/DefaultHandler.java
@@ -2,33 +2,38 @@
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 /** Handler for the / endpoint */
+@StableApi
 public class DefaultHandler implements HttpHandler {
 
   private final byte[] responseBytes;
   private final String contentType;
 
-  public DefaultHandler() {
+  public DefaultHandler(String metricsPath) {
+    String metrics = metricsPath.startsWith("/") ? metricsPath.substring(1) : metricsPath;
     String responseString =
         "<html>\n"
             + "<head><title>Prometheus Java Client</title></head>\n"
             + "<body>\n"
             + "<h1>Prometheus Java Client</h1>\n"
             + "<h2>Metrics Path</h2>\n"
-            + "The metrics path is <a href=\"metrics\">/metrics</a>.\n"
+            + String.format("The metrics path is <a href=\"%s\">%s</a>.\n", metrics, metricsPath)
             + "<h2>Name Filter</h2>\n"
             + "If you want to scrape only specific metrics, "
             + "use the <tt>name[]</tt> parameter like this:\n"
             + "<ul>\n"
-            + "<li><a href=\"metrics?name[]=my_metric\">/metrics?name[]=my_metric</a></li>\n"
+            + String.format(
+                "<li><a href=\"%s?name[]=my_metric\">%s?name[]=my_metric</a></li>\n",
+                metrics, metricsPath)
             + "</ul>\n"
             + "You can also use multiple <tt>name[]</tt> parameters to query multiple metrics:\n"
             + "<ul>\n"
-            + "<li><a href=\"metrics?name[]=my_metric_a&name=my_metrics_b\">"
-            + "/metrics?name[]=my_metric_a&amp;name=[]=my_metric_b</a></li>\n"
+            + String.format("<li><a href=\"%s?name[]=my_metric_a&name[]=my_metric_b\">", metrics)
+            + String.format("%s?name[]=my_metric_a&amp;name[]=my_metric_b</a></li>\n", metricsPath)
             + "</ul>\n"
             + "The <tt>name[]</tt> parameter can be used by the Prometheus server for scraping. "
             + "Add the following snippet to your scrape job configuration in "
@@ -50,13 +55,17 @@ public DefaultHandler() {
             + "The Prometheus Java metrics library supports a <tt>debug</tt> query parameter "
             + "for viewing the different formats in a Web browser:\n"
             + "<ul>\n"
-            + "<li><a href=\"metrics?debug=openmetrics\">/metrics?debug=openmetrics</a>: "
+            + String.format(
+                "<li><a href=\"%s?debug=openmetrics\">%s?debug=openmetrics</a>: ",
+                metrics, metricsPath)
             + "View OpenMetrics text format.</li>\n"
-            + "<li><a href=\"metrics?debug=text\">/metrics?debug=text</a>: "
+            + String.format(
+                "<li><a href=\"%s?debug=text\">%s?debug=text</a>: ", metrics, metricsPath)
             + "View Prometheus text format (this is the default when accessing the "
-            + "<a href=\"metrics\">/metrics</a> endpoint with a Web browser).</li>\n"
-            + "<li><a href=\"metrics?debug=prometheus-protobuf\">"
-            + "/metrics?debug=prometheus-protobuf</a>: "
+            + String.format(
+                "<a href=\"%s\">%s</a> endpoint with a Web browser).</li>\n", metrics, metricsPath)
+            + String.format("<li><a href=\"%s?debug=prometheus-protobuf\">", metrics)
+            + String.format("%s?debug=prometheus-protobuf</a>: ", metricsPath)
             + "View a text representation of the Prometheus protobuf format.</li>\n"
             + "</ul>\n"
             + "Note that the <tt>debug</tt> parameter is only for viewing different formats in a "
diff --git a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HTTPServer.java b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HTTPServer.java
index 218bf82d1..e93b122b0 100644
--- a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HTTPServer.java
+++ b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HTTPServer.java
@@ -7,6 +7,7 @@
 import com.sun.net.httpserver.HttpServer;
 import com.sun.net.httpserver.HttpsConfigurator;
 import com.sun.net.httpserver.HttpsServer;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import java.io.Closeable;
@@ -35,6 +36,7 @@
  *     .buildAndStart();
  * }</pre>
  */
+@StableApi
 public class HTTPServer implements Closeable {
 
   static {
@@ -57,24 +59,39 @@ private HTTPServer(
       PrometheusRegistry registry,
       @Nullable Authenticator authenticator,
       @Nullable String authenticatedSubjectAttributeName,
-      @Nullable HttpHandler defaultHandler) {
+      @Nullable HttpHandler defaultHandler,
+      @Nullable String metricsHandlerPath,
+      @Nullable Boolean registerHealthHandler) {
     if (httpServer.getAddress() == null) {
       throw new IllegalArgumentException("HttpServer hasn't been bound to an address");
     }
     this.server = httpServer;
     this.executorService = executorService;
+    String metricsPath = getMetricsPath(metricsHandlerPath);
+    try {
+      server.removeContext("/");
+    } catch (IllegalArgumentException e) {
+      // context "/" not registered yet, ignore
+    }
     registerHandler(
         "/",
-        defaultHandler == null ? new DefaultHandler() : defaultHandler,
+        defaultHandler == null ? new DefaultHandler(metricsPath) : defaultHandler,
         authenticator,
         authenticatedSubjectAttributeName);
+    try {
+      server.removeContext(metricsPath);
+    } catch (IllegalArgumentException e) {
+      // context metricsPath not registered yet, ignore
+    }
     registerHandler(
-        "/metrics",
+        metricsPath,
         new MetricsHandler(config, registry),
         authenticator,
         authenticatedSubjectAttributeName);
-    registerHandler(
-        "/-/healthy", new HealthyHandler(), authenticator, authenticatedSubjectAttributeName);
+    if (registerHealthHandler == null || registerHealthHandler) {
+      registerHandler(
+          "/-/healthy", new HealthyHandler(), authenticator, authenticatedSubjectAttributeName);
+    }
     try {
       // HttpServer.start() starts the HttpServer in a new background thread.
       // If we call HttpServer.start() from a thread of the executorService,
@@ -88,6 +105,16 @@ private HTTPServer(
     }
   }
 
+  private String getMetricsPath(@Nullable String metricsHandlerPath) {
+    if (metricsHandlerPath == null) {
+      return "/metrics";
+    }
+    if (!metricsHandlerPath.startsWith("/")) {
+      return "/" + metricsHandlerPath;
+    }
+    return metricsHandlerPath;
+  }
+
   private void registerHandler(
       String path,
       HttpHandler handler,
@@ -179,9 +206,11 @@ public static class Builder {
     @Nullable private ExecutorService executorService = null;
     @Nullable private PrometheusRegistry registry = null;
     @Nullable private Authenticator authenticator = null;
+    @Nullable private String authenticatedSubjectAttributeName = null;
     @Nullable private HttpsConfigurator httpsConfigurator = null;
     @Nullable private HttpHandler defaultHandler = null;
-    @Nullable private String authenticatedSubjectAttributeName = null;
+    @Nullable private String metricsHandlerPath = null;
+    @Nullable private Boolean registerHealthHandler = null;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
@@ -254,6 +283,18 @@ public Builder defaultHandler(HttpHandler defaultHandler) {
       return this;
     }
 
+    /** Optional: Override default path for the metrics endpoint. Default is {@code /metrics}. */
+    public Builder metricsHandlerPath(String metricsHandlerPath) {
+      this.metricsHandlerPath = metricsHandlerPath;
+      return this;
+    }
+
+    /** Optional: Override if the health handler should be registered. Default is {@code true}. */
+    public Builder registerHealthHandler(boolean registerHealthHandler) {
+      this.registerHealthHandler = registerHealthHandler;
+      return this;
+    }
+
     /** Build and start the HTTPServer. */
     public HTTPServer buildAndStart() throws IOException {
       if (registry == null) {
@@ -275,7 +316,9 @@ public HTTPServer buildAndStart() throws IOException {
           registry,
           authenticator,
           authenticatedSubjectAttributeName,
-          defaultHandler);
+          defaultHandler,
+          metricsHandlerPath,
+          registerHealthHandler);
     }
 
     private InetSocketAddress makeInetSocketAddress() {
diff --git a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HealthyHandler.java b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HealthyHandler.java
index 806b47553..10cb97462 100644
--- a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HealthyHandler.java
+++ b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HealthyHandler.java
@@ -2,10 +2,12 @@
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 /** Handler for the /-/healthy endpoint */
+@StableApi
 public class HealthyHandler implements HttpHandler {
 
   private final byte[] responseBytes;
diff --git a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapter.java b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapter.java
index 3e0322309..df99837cb 100644
--- a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapter.java
+++ b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapter.java
@@ -112,7 +112,7 @@ private void sendErrorResponseWithStackTrace(Exception requestHandlerException)
         httpExchange.getResponseHeaders().set("Content-Type", "text/plain; charset=utf-8");
         httpExchange.sendResponseHeaders(500, stackTrace.length);
         httpExchange.getResponseBody().write(stackTrace);
-      } catch (Exception errorWriterException) {
+      } catch (IOException errorWriterException) {
         // We want to avoid logging so that we don't mess with application logs when the HTTPServer
         // is used in a Java agent.
         // However, if we can't even send an error response to the client there's nothing we can do
diff --git a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/MetricsHandler.java b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/MetricsHandler.java
index 4ac4b80d7..175696b68 100644
--- a/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/MetricsHandler.java
+++ b/prometheus-metrics-exporter-httpserver/src/main/java/io/prometheus/metrics/exporter/httpserver/MetricsHandler.java
@@ -2,12 +2,14 @@
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.exporter.common.PrometheusScrapeHandler;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import java.io.IOException;
 
 /** Handler for the /metrics endpoint */
+@StableApi
 public class MetricsHandler implements HttpHandler {
 
   private final PrometheusScrapeHandler prometheusScrapeHandler;
diff --git a/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java b/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java
index f939d6bd2..ff2d55048 100644
--- a/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java
+++ b/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HTTPServerTest.java
@@ -10,25 +10,42 @@
 import com.sun.net.httpserver.HttpsConfigurator;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.model.registry.PrometheusScrapeRequest;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-import java.nio.charset.StandardCharsets;
-import java.security.NoSuchAlgorithmException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.security.Principal;
+import java.util.List;
 import java.util.concurrent.Executors;
 import javax.net.ssl.SSLContext;
 import javax.security.auth.Subject;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class HTTPServerTest {
+class HTTPServerTest {
+
+  private PrometheusRegistry registry;
+
+  @BeforeEach
+  void setUp() {
+    final MetricMetadata metadata = new MetricMetadata("my-counter");
+    final CounterDataPointSnapshot dataPointSnapshot =
+        new CounterDataPointSnapshot(1.0, Labels.EMPTY, null, System.currentTimeMillis());
+
+    registry = new PrometheusRegistry();
+    registry.register(() -> new CounterSnapshot(metadata, List.of(dataPointSnapshot)));
+  }
 
   @Test
-  @SuppressWarnings({"removal"})
   public void testSubjectDoAs() throws Exception {
-
     final String user = "joe";
     final Subject subject = new Subject();
     subject.getPrincipals().add(() -> user);
@@ -45,7 +62,7 @@ public Result authenticate(HttpExchange exchange) {
     HttpHandler handler =
         exchange -> {
           boolean found = false;
-          Subject current = Subject.current();
+          Subject current = getCurrentSubject();
           for (Principal p : current.getPrincipals()) {
             if (user.equals(p.getName())) {
               found = true;
@@ -65,48 +82,84 @@ public Result authenticate(HttpExchange exchange) {
             .authenticatedSubjectAttributeName("aa")
             .buildAndStart();
 
-    run(server, "204", "/");
+    run(server, "/", 204, "");
   }
 
-  private static void run(HTTPServer server, String expected, String path) throws IOException {
-    try (Socket socket = new Socket()) {
-      socket.connect(new InetSocketAddress("localhost", server.getPort()));
-
-      socket
-          .getOutputStream()
-          .write(("GET " + path + " HTTP/1.1 \r\n").getBytes(StandardCharsets.UTF_8));
-      socket.getOutputStream().write("HOST: localhost \r\n\r\n".getBytes(StandardCharsets.UTF_8));
-      socket.getOutputStream().flush();
-
-      String actualResponse = "";
-      byte[] resp = new byte[500];
-      int read = socket.getInputStream().read(resp, 0, resp.length);
-      if (read > 0) {
-        actualResponse = new String(resp, 0, read, StandardCharsets.UTF_8);
-      }
-      assertThat(actualResponse).contains(expected);
-    }
+  @Test
+  void testSubjectDoAsWithInvalidSubject() throws Exception {
+    Authenticator authenticator =
+        new Authenticator() {
+          @Override
+          public Result authenticate(HttpExchange exchange) {
+            exchange.setAttribute("aa", "not-a-subject");
+            return new Success(new HttpPrincipal("user", "/"));
+          }
+        };
+
+    HttpHandler handler = exchange -> exchange.sendResponseHeaders(204, -1);
+    HTTPServer server =
+        HTTPServer.builder()
+            .port(0)
+            .authenticator(authenticator)
+            .defaultHandler(handler)
+            .authenticatedSubjectAttributeName("aa")
+            .buildAndStart();
+
+    run(server, "/", 403, "");
+  }
+
+  @Test
+  void defaultHandler() throws Exception {
+    run(
+        HTTPServer.builder().port(0).buildAndStart(),
+        "/",
+        200,
+        "<title>Prometheus Java Client</title>");
+  }
+
+  @Test
+  void metrics() throws Exception {
+    run(
+        HTTPServer.builder()
+            .port(0)
+            .registry(registry)
+            .executorService(Executors.newFixedThreadPool(1))
+            .buildAndStart(),
+        "/metrics",
+        200,
+        "my_counter_total 1.0");
   }
 
   @Test
-  void defaultHandler() throws IOException {
-    run(HTTPServer.builder().port(0).buildAndStart(), "200", "/");
+  void metricsCustomPath() throws Exception {
+    run(
+        HTTPServer.builder()
+            .port(0)
+            .registry(registry)
+            .metricsHandlerPath("/my-metrics")
+            .executorService(Executors.newFixedThreadPool(1))
+            .buildAndStart(),
+        "/my-metrics",
+        200,
+        "my_counter_total 1.0");
   }
 
   @Test
-  void metrics() throws IOException {
+  void metricsCustomRootPath() throws Exception {
     run(
         HTTPServer.builder()
             .port(0)
-            .registry(new PrometheusRegistry())
+            .registry(registry)
+            .metricsHandlerPath("/")
             .executorService(Executors.newFixedThreadPool(1))
             .buildAndStart(),
-        "200",
-        "/metrics");
+        "/",
+        200,
+        "my_counter_total 1.0");
   }
 
   @Test
-  void registryThrows() throws IOException {
+  void registryThrows() throws Exception {
     HTTPServer server =
         HTTPServer.builder()
             .port(0)
@@ -118,11 +171,12 @@ public MetricSnapshots scrape(PrometheusScrapeRequest scrapeRequest) {
                   }
                 })
             .buildAndStart();
-    run(server, "500", "/metrics");
+    run(server, "/metrics", 500, "An Exception occurred while scraping metrics");
   }
 
   @Test
-  void config() throws NoSuchAlgorithmException, IOException {
+  @SuppressWarnings("resource")
+  void config() {
     assertThatExceptionOfType(IllegalStateException.class)
         .isThrownBy(
             () ->
@@ -133,18 +187,92 @@ void config() throws NoSuchAlgorithmException, IOException {
                     .buildAndStart())
         .withMessage("cannot configure 'inetAddress' and 'hostname' at the same time");
 
-    // ssl doesn't work without in tests
+    // SSL doesn't work in this simple test configuration
+    assertThatExceptionOfType(IOException.class)
+        .isThrownBy(
+            () ->
+                run(
+                    HTTPServer.builder()
+                        .port(0)
+                        .httpsConfigurator(new HttpsConfigurator(SSLContext.getDefault()))
+                        .buildAndStart(),
+                    "/",
+                    0,
+                    "ignored"));
+  }
+
+  @Test
+  void health() throws Exception {
+    run(HTTPServer.builder().port(0).buildAndStart(), "/-/healthy", 200, "Exporter is healthy.");
+  }
+
+  @Test
+  void healthEnabled() throws Exception {
+    HttpHandler handler = exchange -> exchange.sendResponseHeaders(204, -1);
     run(
         HTTPServer.builder()
             .port(0)
-            .httpsConfigurator(new HttpsConfigurator(SSLContext.getDefault()))
+            .defaultHandler(handler)
+            .registerHealthHandler(true)
             .buildAndStart(),
-        "",
-        "/");
+        "/-/healthy",
+        200,
+        "Exporter is healthy.");
   }
 
   @Test
-  void health() throws IOException {
-    run(HTTPServer.builder().port(0).buildAndStart(), "200", "/-/healthy");
+  void healthDisabled() throws Exception {
+    HttpHandler handler = exchange -> exchange.sendResponseHeaders(204, -1);
+    run(
+        HTTPServer.builder()
+            .port(0)
+            .defaultHandler(handler)
+            .registerHealthHandler(false)
+            .buildAndStart(),
+        "/-/healthy",
+        204,
+        "");
+  }
+
+  private static void run(
+      HTTPServer server, String path, int expectedStatusCode, String expectedBody)
+      throws Exception {
+    // we cannot use try-with-resources or even client.close(), or the test will fail with Java 17
+    @SuppressWarnings("resource")
+    final HttpClient client = HttpClient.newBuilder().build();
+    try {
+      final URI uri = URI.create("http://localhost:%s%s".formatted(server.getPort(), path));
+      final HttpRequest request = HttpRequest.newBuilder().uri(uri).GET().build();
+
+      final HttpResponse<String> response =
+          client.send(request, HttpResponse.BodyHandlers.ofString());
+      assertThat(response.statusCode()).isEqualTo(expectedStatusCode);
+      assertThat(response.body()).contains(expectedBody);
+    } finally {
+      server.stop();
+    }
+  }
+
+  /**
+   * Get current Subject using reflection to support both Java 17 and Java 18+.
+   *
+   * <p>Java 18+ has Subject.current(), but Java 17 and earlier require
+   * Subject.getSubject(AccessController.getContext()).
+   */
+  @SuppressWarnings({"removal"})
+  private static Subject getCurrentSubject() {
+    try {
+      Method currentMethod = Subject.class.getMethod("current");
+      return (Subject) currentMethod.invoke(null);
+    } catch (NoSuchMethodException e) {
+      // Fall back to pre-Java 18 API
+      try {
+        return Subject.getSubject(java.security.AccessController.getContext());
+      } catch (Exception ex) {
+        throw new RuntimeException("Failed to get current Subject", ex);
+      }
+    } catch (Exception e) {
+      throw new RuntimeException("Failed to invoke Subject.current()", e);
+    }
   }
 }
diff --git a/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapterTest.java b/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapterTest.java
new file mode 100644
index 000000000..19bc0d66e
--- /dev/null
+++ b/prometheus-metrics-exporter-httpserver/src/test/java/io/prometheus/metrics/exporter/httpserver/HttpExchangeAdapterTest.java
@@ -0,0 +1,49 @@
+package io.prometheus.metrics.exporter.httpserver;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpExchange;
+import java.net.URI;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class HttpExchangeAdapterTest {
+
+  @Test
+  void getRequestPath() {
+    HttpExchange httpExchange = mock(HttpExchange.class);
+    when(httpExchange.getRequestURI()).thenReturn(URI.create("/metrics?name=test"));
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(httpExchange);
+    assertThat(adapter.getRequest().getRequestPath()).isEqualTo("/metrics");
+  }
+
+  @Test
+  void getRequestPathWithoutQueryString() {
+    HttpExchange httpExchange = mock(HttpExchange.class);
+    when(httpExchange.getRequestURI()).thenReturn(URI.create("/metrics"));
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(httpExchange);
+    assertThat(adapter.getRequest().getRequestPath()).isEqualTo("/metrics");
+  }
+
+  @Test
+  void getHeadersWhenPresent() {
+    HttpExchange httpExchange = mock(HttpExchange.class);
+    Headers headers = new Headers();
+    headers.put("Accept", List.of("text/plain"));
+    when(httpExchange.getRequestHeaders()).thenReturn(headers);
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(httpExchange);
+    assertThat(adapter.getRequest().getHeaders("Accept").nextElement()).isEqualTo("text/plain");
+  }
+
+  @Test
+  void getHeadersWhenNotPresent() {
+    HttpExchange httpExchange = mock(HttpExchange.class);
+    Headers headers = new Headers();
+    when(httpExchange.getRequestHeaders()).thenReturn(headers);
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(httpExchange);
+    assertThat(adapter.getRequest().getHeaders("Accept").hasMoreElements()).isFalse();
+  }
+}
diff --git a/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml b/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml
index b87712160..b40b12782 100644
--- a/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml
+++ b/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-opentelemetry-otel-agent-resources</artifactId>
@@ -21,6 +20,8 @@
     <automatic.module.name>io.prometheus.otel.resource.attributes</automatic.module.name>
     <!-- don't update with dependabot, the Otel agent can handle older versions -->
     <otel-dynamic-load.version>1.29.0</otel-dynamic-load.version>
+    <!-- Lower coverage threshold: OTel agent integration requires runtime agent attachment -->
+    <jacoco.line-coverage>0.50</jacoco.line-coverage>
   </properties>
 
   <build>
@@ -59,6 +60,40 @@
           </artifactItems>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/io/opentelemetry/**</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <rule>
+                  <element>CLASS</element>
+                  <limits>
+                    <limit>
+                      <counter>LINE</counter>
+                      <value>COVEREDRATIO</value>
+                      <minimum>${jacoco.line-coverage}</minimum>
+                    </limit>
+                  </limits>
+                  <excludes>
+                    <exclude>io.opentelemetry.**</exclude>
+                  </excludes>
+                </rule>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/src/test/java/io/prometheus/otelagent/ResourceAttributesFromOtelAgentTest.java b/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/src/test/java/io/prometheus/otelagent/ResourceAttributesFromOtelAgentTest.java
new file mode 100644
index 000000000..9f0165b45
--- /dev/null
+++ b/prometheus-metrics-exporter-opentelemetry-otel-agent-resources/src/test/java/io/prometheus/otelagent/ResourceAttributesFromOtelAgentTest.java
@@ -0,0 +1,67 @@
+package io.prometheus.otelagent;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class ResourceAttributesFromOtelAgentTest {
+
+  @Test
+  void testGetResourceAttributesWithoutOtelAgent() {
+    // When OTel agent is not attached, should return empty map
+    Map<String, String> attributes =
+        ResourceAttributesFromOtelAgent.getResourceAttributes("test-scope");
+    assertThat(attributes).isEmpty();
+  }
+
+  @Test
+  void testGetResourceAttributesWithDifferentInstrumentationScopes() {
+    // Test with different scope names to ensure temp directory creation works
+    Map<String, String> attributes1 =
+        ResourceAttributesFromOtelAgent.getResourceAttributes("scope-one");
+    Map<String, String> attributes2 =
+        ResourceAttributesFromOtelAgent.getResourceAttributes("scope-two");
+
+    assertThat(attributes1).isEmpty();
+    assertThat(attributes2).isEmpty();
+  }
+
+  @Test
+  void testGetResourceAttributesHandlesExceptions() {
+    // Test with special characters that might cause issues in temp directory names
+    Map<String, String> attributes =
+        ResourceAttributesFromOtelAgent.getResourceAttributes("test/scope");
+    // Should not throw, should return empty map
+    assertThat(attributes).isEmpty();
+  }
+
+  @Test
+  void testGetResourceAttributesReturnsImmutableMap() {
+    Map<String, String> attributes =
+        ResourceAttributesFromOtelAgent.getResourceAttributes("test-scope");
+
+    // Verify the returned map is not null
+    assertThat(attributes).isNotNull();
+
+    // The returned map should be unmodifiable (per implementation)
+    try {
+      attributes.put("test.key", "test.value");
+      // If we get here without exception, it's not truly immutable,
+      // but we still verify it returned empty
+      assertThat(attributes).isEmpty();
+    } catch (UnsupportedOperationException e) {
+      // This is the expected behavior for an immutable map
+      assertThat(attributes).isEmpty();
+    }
+  }
+
+  @Test
+  void testGetResourceAttributesWithNullKey() {
+    // Test the null handling in the attribute map processing
+    // Without OTel agent, this returns empty map, but tests the null check logic
+    Map<String, String> attributes =
+        ResourceAttributesFromOtelAgent.getResourceAttributes("test-scope");
+    assertThat(attributes).isEmpty();
+  }
+}
diff --git a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
index c08919d13..5f8eca6ea 100644
--- a/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
+++ b/prometheus-metrics-exporter-opentelemetry-shaded/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-opentelemetry</artifactId>
@@ -34,6 +33,12 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
@@ -95,6 +100,30 @@
           <artifactId>opentelemetry-sdk-testing</artifactId>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.wiremock</groupId>
+          <artifactId>wiremock</artifactId>
+          <version>${wiremock.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.hamcrest</groupId>
+              <artifactId>hamcrest-core</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.awaitility</groupId>
+          <artifactId>awaitility</artifactId>
+          <version>${awaitility.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>${guava.version}</version>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>
@@ -260,8 +289,7 @@
                 </relocation>
               </relocations>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
               </transformers>
               <filters>
                 <filter>
diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml
index acae00e0a..e2845631b 100644
--- a/prometheus-metrics-exporter-opentelemetry/pom.xml
+++ b/prometheus-metrics-exporter-opentelemetry/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-opentelemetry-no-otel</artifactId>
@@ -35,6 +34,12 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
@@ -96,6 +101,30 @@
           <artifactId>opentelemetry-sdk-testing</artifactId>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.wiremock</groupId>
+          <artifactId>wiremock</artifactId>
+          <version>${wiremock.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.hamcrest</groupId>
+              <artifactId>hamcrest-core</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.awaitility</groupId>
+          <artifactId>awaitility</artifactId>
+          <version>${awaitility.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>${guava.version}</version>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java
index 8f122d3ee..afc3018c9 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OpenTelemetryExporter.java
@@ -1,6 +1,7 @@
 package io.prometheus.metrics.exporter.opentelemetry;
 
 import io.opentelemetry.sdk.metrics.export.MetricReader;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import java.util.HashMap;
@@ -10,23 +11,32 @@
 public class OpenTelemetryExporter implements AutoCloseable {
   private final MetricReader reader;
 
+  /**
+   * @deprecated This constructor is not part of the stable API. Use {@link #builder()} or {@link
+   *     #builder(PrometheusProperties)} instead.
+   */
+  @Deprecated
   public OpenTelemetryExporter(MetricReader reader) {
     this.reader = reader;
   }
 
+  @StableApi
   @Override
   public void close() {
     reader.shutdown();
   }
 
+  @StableApi
   public static Builder builder() {
     return new Builder(PrometheusProperties.get());
   }
 
+  @StableApi
   public static Builder builder(PrometheusProperties config) {
     return new Builder(config);
   }
 
+  @StableApi
   public static class Builder {
 
     private final PrometheusProperties config;
@@ -41,6 +51,7 @@ public static class Builder {
     @Nullable String serviceInstanceId;
     @Nullable String serviceVersion;
     final Map<String, String> resourceAttributes = new HashMap<>();
+    @Nullable Boolean preserveNames;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
@@ -194,6 +205,15 @@ public Builder resourceAttribute(String name, String value) {
       return this;
     }
 
+    /**
+     * When {@code true}, metric names are preserved as-is (including suffixes like {@code _total}).
+     * When {@code false} (default), standard OTel name normalization is applied.
+     */
+    public Builder preserveNames(boolean preserveNames) {
+      this.preserveNames = preserveNames;
+      return this;
+    }
+
     public OpenTelemetryExporter buildAndStart() {
       if (registry == null) {
         registry = PrometheusRegistry.defaultRegistry;
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfig.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfig.java
index 4a16ee07e..267ff23ad 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfig.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfig.java
@@ -38,8 +38,12 @@ static MetricReader createReader(
             instrumentationScopeInfo);
 
     MetricReader reader = requireNonNull(readerRef.get());
+    boolean preserveNames = resolvePreserveNames(builder, config);
     reader.register(
-        new PrometheusMetricProducer(registry, instrumentationScopeInfo, getResourceField(sdk)));
+        PrometheusMetricProducer.builder(
+                registry, instrumentationScopeInfo, getResourceField(sdk), preserveNames)
+            .exporterFilterProperties(config.getExporterFilterProperties())
+            .build());
     return reader;
   }
 
@@ -107,12 +111,21 @@ private static Attributes otelResourceAttributes(
     return builder.build();
   }
 
+  static boolean resolvePreserveNames(
+      OpenTelemetryExporter.Builder builder, PrometheusProperties config) {
+    if (builder.preserveNames != null) {
+      return builder.preserveNames;
+    }
+    Boolean fromConfig = config.getExporterOpenTelemetryProperties().getPreserveNames();
+    return fromConfig != null && fromConfig;
+  }
+
   static Resource getResourceField(AutoConfiguredOpenTelemetrySdk sdk) {
     try {
       Method method = AutoConfiguredOpenTelemetrySdk.class.getDeclaredMethod("getResource");
       method.setAccessible(true);
       return (Resource) method.invoke(sdk);
-    } catch (Exception e) {
+    } catch (ReflectiveOperationException e) {
       throw new RuntimeException(e);
     }
   }
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java
index 5f02d38cc..91241295a 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScope.java
@@ -1,6 +1,8 @@
 package io.prometheus.metrics.exporter.opentelemetry;
 
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Properties;
 
 class PrometheusInstrumentationScope {
@@ -21,8 +23,15 @@ static InstrumentationScopeInfo loadInstrumentationScopeInfo(
       String path, String nameKey, String versionKey) {
     try {
       Properties properties = new Properties();
-      properties.load(
-          PrometheusInstrumentationScope.class.getClassLoader().getResourceAsStream(path));
+      InputStream stream =
+          PrometheusInstrumentationScope.class.getClassLoader().getResourceAsStream(path);
+      if (stream == null) {
+        throw new IllegalStateException(
+            "Prometheus metrics library initialization error: Failed to read "
+                + path
+                + " from classpath.");
+      }
+      properties.load(stream);
       String instrumentationScopeName = properties.getProperty(nameKey);
       if (instrumentationScopeName == null) {
         throw new IllegalStateException(
@@ -44,7 +53,7 @@ static InstrumentationScopeInfo loadInstrumentationScopeInfo(
       return InstrumentationScopeInfo.builder(instrumentationScopeName)
           .setVersion(instrumentationScopeVersion)
           .build();
-    } catch (Exception e) {
+    } catch (IOException e) {
       throw new IllegalStateException(
           "Prometheus metrics library initialization error: Failed to read "
               + path
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java
index 54aa5135a..2c3e399f7 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusMetricProducer.java
@@ -7,7 +7,9 @@
 import io.opentelemetry.sdk.metrics.export.CollectionRegistration;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
+import io.prometheus.metrics.config.ExporterFilterProperties;
 import io.prometheus.metrics.exporter.opentelemetry.otelmodel.MetricDataFactory;
+import io.prometheus.metrics.model.registry.MetricNameFilter;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
@@ -22,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
 class PrometheusMetricProducer implements CollectionRegistration {
@@ -29,21 +32,66 @@ class PrometheusMetricProducer implements CollectionRegistration {
   private final PrometheusRegistry registry;
   private final Resource resource;
   private final InstrumentationScopeInfo instrumentationScopeInfo;
+  private final boolean preserveNames;
+  @Nullable private final Predicate<String> nameFilter;
 
-  public PrometheusMetricProducer(
+  private PrometheusMetricProducer(
       PrometheusRegistry registry,
       InstrumentationScopeInfo instrumentationScopeInfo,
-      Resource resource) {
+      Resource resource,
+      boolean preserveNames,
+      @Nullable Predicate<String> nameFilter) {
     this.registry = registry;
     this.instrumentationScopeInfo = instrumentationScopeInfo;
     this.resource = resource;
+    this.preserveNames = preserveNames;
+    this.nameFilter = nameFilter;
+  }
+
+  /**
+   * Creates a builder for a producer with no metric name filtering by default, i.e. all metrics in
+   * {@code registry} are exported unless filter properties are configured on the builder.
+   */
+  static Builder builder(
+      PrometheusRegistry registry,
+      InstrumentationScopeInfo instrumentationScopeInfo,
+      Resource resource,
+      boolean preserveNames) {
+    return new Builder(registry, instrumentationScopeInfo, resource, preserveNames);
+  }
+
+  /**
+   * Builds a name filter from {@code io.prometheus.exporter.filter.*} properties, mirroring how
+   * {@code PrometheusScrapeHandler} builds its filter for the Servlet/HTTPServer exporters so that
+   * filtering config behaves consistently across exporters.
+   *
+   * <p>OpenTelemetry's own Views API also supports filtering and aggregation, and may be preferable
+   * for OpenTelemetry-specific deployments; this filter is intended for users who want the same
+   * {@code io.prometheus.exporter.filter.*} config to apply regardless of which exporter they use.
+   *
+   * @return {@code null} if no filter properties are set, to avoid the overhead of testing every
+   *     metric name against a filter that matches everything.
+   */
+  @Nullable
+  private static Predicate<String> makeNameFilter(ExporterFilterProperties props) {
+    if (props.getAllowedMetricNames() == null
+        && props.getExcludedMetricNames() == null
+        && props.getAllowedMetricNamePrefixes() == null
+        && props.getExcludedMetricNamePrefixes() == null) {
+      return null;
+    }
+    return MetricNameFilter.builder()
+        .nameMustBeEqualTo(props.getAllowedMetricNames())
+        .nameMustNotBeEqualTo(props.getExcludedMetricNames())
+        .nameMustStartWith(props.getAllowedMetricNamePrefixes())
+        .nameMustNotStartWith(props.getExcludedMetricNamePrefixes())
+        .build();
   }
 
   @Override
   public Collection<MetricData> collectAllMetrics() {
-    // TODO: We could add a filter configuration for the OpenTelemetry exporter and call
-    // registry.scrape(filter) if a filter is configured, like in the Servlet exporter.
-    MetricSnapshots snapshots = registry.scrape();
+    MetricSnapshots snapshots =
+        nameFilter != null ? registry.scrape(nameFilter) : registry.scrape();
     Resource resourceWithTargetInfo = resource.merge(resourceFromTargetInfo(snapshots));
     InstrumentationScopeInfo scopeFromInfo = instrumentationScopeFromOtelScopeInfo(snapshots);
     List<MetricData> result = new ArrayList<>(snapshots.size());
@@ -51,7 +99,8 @@ public Collection<MetricData> collectAllMetrics() {
         new MetricDataFactory(
             resourceWithTargetInfo,
             scopeFromInfo != null ? scopeFromInfo : instrumentationScopeInfo,
-            System.currentTimeMillis());
+            System.currentTimeMillis(),
+            preserveNames);
     for (MetricSnapshot snapshot : snapshots) {
       if (snapshot instanceof CounterSnapshot) {
         addUnlessNull(result, factory.create((CounterSnapshot) snapshot));
@@ -132,4 +181,37 @@ private void addUnlessNull(List<MetricData> result, @Nullable MetricData data) {
       result.add(data);
     }
   }
+
+  static class Builder {
+    private final PrometheusRegistry registry;
+    private final Resource resource;
+    private final InstrumentationScopeInfo instrumentationScopeInfo;
+    private final boolean preserveNames;
+    private ExporterFilterProperties filterProperties = ExporterFilterProperties.builder().build();
+
+    private Builder(
+        PrometheusRegistry registry,
+        InstrumentationScopeInfo instrumentationScopeInfo,
+        Resource resource,
+        boolean preserveNames) {
+      this.registry = registry;
+      this.instrumentationScopeInfo = instrumentationScopeInfo;
+      this.resource = resource;
+      this.preserveNames = preserveNames;
+    }
+
+    Builder exporterFilterProperties(ExporterFilterProperties filterProperties) {
+      this.filterProperties = filterProperties;
+      return this;
+    }
+
+    PrometheusMetricProducer build() {
+      return new PrometheusMetricProducer(
+          registry,
+          instrumentationScopeInfo,
+          resource,
+          preserveNames,
+          makeNameFilter(filterProperties));
+    }
+  }
 }
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java
index 4c75d2622..576ba05c7 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/MetricDataFactory.java
@@ -17,30 +17,43 @@ public class MetricDataFactory {
   private final Resource resource;
   private final InstrumentationScopeInfo instrumentationScopeInfo;
   private final long currentTimeMillis;
+  private final boolean preserveNames;
 
   public MetricDataFactory(
       Resource resource,
       InstrumentationScopeInfo instrumentationScopeInfo,
-      long currentTimeMillis) {
+      long currentTimeMillis,
+      boolean preserveNames) {
     this.resource = resource;
     this.instrumentationScopeInfo = instrumentationScopeInfo;
     this.currentTimeMillis = currentTimeMillis;
+    this.preserveNames = preserveNames;
   }
 
+  @Nullable
   public MetricData create(CounterSnapshot snapshot) {
+    if (snapshot.getDataPoints().isEmpty()) {
+      return null;
+    }
     return new PrometheusMetricData<>(
         snapshot.getMetadata(),
         new PrometheusCounter(snapshot, currentTimeMillis),
         instrumentationScopeInfo,
-        resource);
+        resource,
+        preserveNames);
   }
 
+  @Nullable
   public MetricData create(GaugeSnapshot snapshot) {
+    if (snapshot.getDataPoints().isEmpty()) {
+      return null;
+    }
     return new PrometheusMetricData<>(
         snapshot.getMetadata(),
         new PrometheusGauge(snapshot, currentTimeMillis),
         instrumentationScopeInfo,
-        resource);
+        resource,
+        preserveNames);
   }
 
   @Nullable
@@ -52,47 +65,69 @@ public MetricData create(HistogramSnapshot snapshot) {
             snapshot.getMetadata(),
             new PrometheusNativeHistogram(snapshot, currentTimeMillis),
             instrumentationScopeInfo,
-            resource);
+            resource,
+            preserveNames);
       } else if (firstDataPoint.hasClassicHistogramData()) {
         return new PrometheusMetricData<>(
             snapshot.getMetadata(),
             new PrometheusClassicHistogram(snapshot, currentTimeMillis),
             instrumentationScopeInfo,
-            resource);
+            resource,
+            preserveNames);
       }
     }
     return null;
   }
 
+  @Nullable
   public MetricData create(SummarySnapshot snapshot) {
+    if (snapshot.getDataPoints().isEmpty()) {
+      return null;
+    }
     return new PrometheusMetricData<>(
         snapshot.getMetadata(),
         new PrometheusSummary(snapshot, currentTimeMillis),
         instrumentationScopeInfo,
-        resource);
+        resource,
+        preserveNames);
   }
 
+  @Nullable
   public MetricData create(InfoSnapshot snapshot) {
+    if (snapshot.getDataPoints().isEmpty()) {
+      return null;
+    }
     return new PrometheusMetricData<>(
         snapshot.getMetadata(),
         new PrometheusInfo(snapshot, currentTimeMillis),
         instrumentationScopeInfo,
-        resource);
+        resource,
+        preserveNames);
   }
 
+  @Nullable
   public MetricData create(StateSetSnapshot snapshot) {
+    if (snapshot.getDataPoints().isEmpty()) {
+      return null;
+    }
     return new PrometheusMetricData<>(
         snapshot.getMetadata(),
         new PrometheusStateSet(snapshot, currentTimeMillis),
         instrumentationScopeInfo,
-        resource);
+        resource,
+        preserveNames);
   }
 
+  @Nullable
   public MetricData create(UnknownSnapshot snapshot) {
+    if (snapshot.getDataPoints().isEmpty()) {
+      return null;
+    }
     return new PrometheusMetricData<>(
         snapshot.getMetadata(),
         new PrometheusUnknown(snapshot, currentTimeMillis),
         instrumentationScopeInfo,
-        resource);
+        resource,
+        preserveNames);
   }
 }
diff --git a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java
index 20603123c..004bbfe45 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/main/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/PrometheusMetricData.java
@@ -23,10 +23,12 @@ class PrometheusMetricData<T extends PrometheusData<?>> implements MetricData {
       MetricMetadata metricMetadata,
       T data,
       InstrumentationScopeInfo instrumentationScopeInfo,
-      Resource resource) {
+      Resource resource,
+      boolean preserveNames) {
     this.instrumentationScopeInfo = instrumentationScopeInfo;
     this.resource = resource;
-    this.name = getNameWithoutUnit(metricMetadata);
+    this.name =
+        preserveNames ? metricMetadata.getOriginalName() : getNameWithoutUnit(metricMetadata);
     this.description = metricMetadata.getHelp();
     this.unit = convertUnit(metricMetadata.getUnit());
     this.data = data;
diff --git a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExemplarTest.java b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExemplarTest.java
index 48054b192..c21f1ead4 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExemplarTest.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExemplarTest.java
@@ -45,7 +45,7 @@ class ExemplarTest {
   private OpenTelemetryExporter openTelemetryExporter;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     openTelemetryExporter =
         OpenTelemetryExporter.builder()
             .endpoint("http://localhost:4317")
@@ -64,7 +64,7 @@ public void setUp() {
   }
 
   @AfterEach
-  public void tearDown() {
+  void tearDown() {
     PrometheusRegistry.defaultRegistry.unregister(testCounter);
     openTelemetryExporter.close();
   }
diff --git a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExportTest.java b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExportTest.java
index 55589ce84..4329df4b8 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExportTest.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/ExportTest.java
@@ -10,7 +10,9 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.testing.assertj.MetricAssert;
 import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
+import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
 import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension;
+import io.prometheus.metrics.config.ExporterFilterProperties;
 import io.prometheus.metrics.core.metrics.Counter;
 import io.prometheus.metrics.core.metrics.Gauge;
 import io.prometheus.metrics.core.metrics.Histogram;
@@ -23,17 +25,18 @@
 import io.prometheus.metrics.model.snapshots.Unit;
 import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-public class ExportTest {
+class ExportTest {
 
   private static final Attributes ATTRIBUTES =
       Attributes.of(AttributeKey.stringKey("label"), "val", AttributeKey.stringKey("key"), "value");
-  @RegisterExtension OpenTelemetryExtension testing = OpenTelemetryExtension.create();
+  @RegisterExtension static OpenTelemetryExtension testing = OpenTelemetryExtension.create();
 
   private final PrometheusRegistry registry = new PrometheusRegistry();
 
@@ -44,10 +47,12 @@ void setUp() throws IllegalAccessException, NoSuchFieldException {
     MetricReader reader = (MetricReader) field.get(testing);
 
     PrometheusMetricProducer prometheusMetricProducer =
-        new PrometheusMetricProducer(
-            registry,
-            InstrumentationScopeInfo.create("test"),
-            Resource.create(Attributes.builder().put("staticRes", "value").build()));
+        PrometheusMetricProducer.builder(
+                registry,
+                InstrumentationScopeInfo.create("test"),
+                Resource.create(Attributes.builder().put("staticRes", "value").build()),
+                false)
+            .build();
 
     reader.register(prometheusMetricProducer);
   }
@@ -304,6 +309,127 @@ void unknown() {
                             .hasAttributes(Attributes.of(AttributeKey.stringKey("label"), "val"))));
   }
 
+  @Test
+  void metricsWithoutDataPointsAreNotExported() {
+    // Register metrics with labels but don't create any data points
+    // This simulates the jvm_memory_pool_allocated_bytes scenario where a metric
+    // is registered with label names, but no data points are created until GC happens
+    Counter.builder().name("counter_no_data").labelNames("pool").register(registry);
+    Gauge.builder().name("gauge_no_data").labelNames("pool").register(registry);
+    Summary.builder().name("summary_no_data").labelNames("pool").register(registry);
+    Histogram.builder().name("histogram_no_data").labelNames("pool").register(registry);
+    StateSet.builder()
+        .name("stateset_no_data")
+        .states("state")
+        .labelNames("pool")
+        .register(registry);
+    Info.builder().name("info_no_data").labelNames("pool").register(registry);
+
+    List<MetricData> metrics = testing.getMetrics();
+    assertThat(metrics).isEmpty();
+  }
+
+  @Test
+  void preserveNamesWithUnit() {
+    InMemoryMetricReader reader = InMemoryMetricReader.create();
+    PrometheusRegistry preserveRegistry = new PrometheusRegistry();
+    reader.register(
+        PrometheusMetricProducer.builder(
+                preserveRegistry,
+                InstrumentationScopeInfo.create("test"),
+                Resource.create(Attributes.builder().put("staticRes", "value").build()),
+                true)
+            .build());
+
+    Counter.builder().name("req").unit(Unit.BYTES).register(preserveRegistry).inc();
+
+    List<MetricData> metrics = new ArrayList<>(reader.collectAllMetrics());
+    assertThat(metrics).hasSize(1);
+    OpenTelemetryAssertions.assertThat(metrics.get(0)).hasName("req").hasUnit("By");
+  }
+
+  @Test
+  void preserveNamesWithUnitAlreadyInName() {
+    InMemoryMetricReader reader = InMemoryMetricReader.create();
+    PrometheusRegistry preserveRegistry = new PrometheusRegistry();
+    reader.register(
+        PrometheusMetricProducer.builder(
+                preserveRegistry,
+                InstrumentationScopeInfo.create("test"),
+                Resource.create(Attributes.builder().put("staticRes", "value").build()),
+                true)
+            .build());
+
+    Counter.builder().name("req_bytes").unit(Unit.BYTES).register(preserveRegistry).inc();
+
+    List<MetricData> metrics = new ArrayList<>(reader.collectAllMetrics());
+    assertThat(metrics).hasSize(1);
+    OpenTelemetryAssertions.assertThat(metrics.get(0)).hasName("req_bytes").hasUnit("By");
+  }
+
+  @Test
+  void preserveNamesWithoutUnit() {
+    InMemoryMetricReader reader = InMemoryMetricReader.create();
+    PrometheusRegistry preserveRegistry = new PrometheusRegistry();
+    reader.register(
+        PrometheusMetricProducer.builder(
+                preserveRegistry,
+                InstrumentationScopeInfo.create("test"),
+                Resource.create(Attributes.builder().put("staticRes", "value").build()),
+                true)
+            .build());
+
+    Counter.builder().name("events_total").register(preserveRegistry).inc();
+
+    List<MetricData> metrics = new ArrayList<>(reader.collectAllMetrics());
+    assertThat(metrics).hasSize(1);
+    OpenTelemetryAssertions.assertThat(metrics.get(0)).hasName("events_total");
+  }
+
+  @Test
+  void metricNameFilterExcludedNames() {
+    InMemoryMetricReader reader = InMemoryMetricReader.create();
+    PrometheusRegistry filteredRegistry = new PrometheusRegistry();
+    reader.register(
+        PrometheusMetricProducer.builder(
+                filteredRegistry,
+                InstrumentationScopeInfo.create("test"),
+                Resource.create(Attributes.builder().put("staticRes", "value").build()),
+                false)
+            .exporterFilterProperties(
+                ExporterFilterProperties.builder().excludedNames("secret_total").build())
+            .build());
+
+    Counter.builder().name("secret").register(filteredRegistry).inc();
+    Counter.builder().name("public").register(filteredRegistry).inc();
+
+    List<MetricData> metrics = new ArrayList<>(reader.collectAllMetrics());
+    assertThat(metrics).hasSize(1);
+    OpenTelemetryAssertions.assertThat(metrics.get(0)).hasName("public");
+  }
+
+  @Test
+  void metricNameFilterAllowedPrefixes() {
+    InMemoryMetricReader reader = InMemoryMetricReader.create();
+    PrometheusRegistry filteredRegistry = new PrometheusRegistry();
+    reader.register(
+        PrometheusMetricProducer.builder(
+                filteredRegistry,
+                InstrumentationScopeInfo.create("test"),
+                Resource.create(Attributes.builder().put("staticRes", "value").build()),
+                false)
+            .exporterFilterProperties(
+                ExporterFilterProperties.builder().allowedPrefixes("http_").build())
+            .build());
+
+    Counter.builder().name("http_requests").register(filteredRegistry).inc();
+    Counter.builder().name("jvm_threads").register(filteredRegistry).inc();
+
+    List<MetricData> metrics = new ArrayList<>(reader.collectAllMetrics());
+    assertThat(metrics).hasSize(1);
+    OpenTelemetryAssertions.assertThat(metrics.get(0)).hasName("http_requests");
+  }
+
   private MetricAssert metricAssert() {
     List<MetricData> metrics = testing.getMetrics();
     assertThat(metrics).hasSize(1);
diff --git a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfigTest.java b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfigTest.java
index 5a9103565..19a737122 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfigTest.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/OtelAutoConfigTest.java
@@ -7,16 +7,28 @@
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.metrics.export.CollectionRegistration;
+import io.opentelemetry.sdk.metrics.export.MetricReader;
+import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
+import io.prometheus.metrics.config.ExporterFilterProperties;
 import io.prometheus.metrics.config.ExporterOpenTelemetryProperties;
+import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.config.PrometheusPropertiesLoader;
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 import org.assertj.core.api.AbstractStringAssert;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -65,21 +77,16 @@ public static Stream<Arguments> testCases() {
             "values from builder",
             new TestCase()
                 .expectedProperties(
-                    Map.of(
-                        "otel.exporter.otlp.protocol",
-                        Optional.of("http/protobuf"),
-                        "otel.exporter.otlp.endpoint",
-                        Optional.of("http://builder:4318"),
-                        "otel.exporter.otlp.headers",
-                        Optional.of("h=builder-v"),
-                        "otel.metric.export.interval",
-                        Optional.of("2s"),
-                        "otel.exporter.otlp.timeout",
-                        Optional.of("3s"),
-                        "otel.service.name",
-                        Optional.of("builder-service")))
+                    ImmutableMap.<String, Optional<String>>builder()
+                        .put("otel.exporter.otlp.protocol", Optional.of("http/protobuf"))
+                        .put("otel.exporter.otlp.endpoint", Optional.of("http://builder:4318"))
+                        .put("otel.exporter.otlp.headers", Optional.of("h=builder-v"))
+                        .put("otel.metric.export.interval", Optional.of("2s"))
+                        .put("otel.exporter.otlp.timeout", Optional.of("3s"))
+                        .put("otel.service.name", Optional.of("builder-service"))
+                        .build())
                 .expectedResourceAttributes(
-                    Map.of(
+                    ImmutableMap.of(
                         "key",
                         "builder-value",
                         "service.name",
@@ -289,6 +296,86 @@ void properties(String name, TestCase testCase) {
     }
   }
 
+  @Test
+  void resolvePreserveNamesFromBuilder() {
+    OpenTelemetryExporter.Builder builder = OpenTelemetryExporter.builder();
+    builder.preserveNames(true);
+    PrometheusProperties config = PrometheusProperties.get();
+    assertThat(OtelAutoConfig.resolvePreserveNames(builder, config)).isTrue();
+  }
+
+  @Test
+  void resolvePreserveNamesDefault() {
+    OpenTelemetryExporter.Builder builder = OpenTelemetryExporter.builder();
+    PrometheusProperties config = PrometheusProperties.get();
+    assertThat(OtelAutoConfig.resolvePreserveNames(builder, config)).isFalse();
+  }
+
+  @Test
+  void resolvePreserveNamesFromConfig() {
+    OpenTelemetryExporter.Builder builder = OpenTelemetryExporter.builder();
+    ExporterOpenTelemetryProperties otelProps =
+        ExporterOpenTelemetryProperties.builder().preserveNames(true).build();
+    PrometheusProperties config =
+        PrometheusProperties.builder().exporterOpenTelemetryProperties(otelProps).build();
+    assertThat(OtelAutoConfig.resolvePreserveNames(builder, config)).isTrue();
+  }
+
+  @Test
+  void createReaderUsesExporterFilterProperties() throws IllegalAccessException {
+    PrometheusRegistry registry = new PrometheusRegistry();
+    PrometheusProperties config =
+        PrometheusProperties.builder()
+            .exporterFilterProperties(
+                ExporterFilterProperties.builder().excludedNames("secret_total").build())
+            .build();
+    OpenTelemetryExporter.Builder builder =
+        OpenTelemetryExporter.builder(config).registry(registry);
+    MetricReader reader = OtelAutoConfig.createReader(builder, config, registry);
+
+    try {
+      Counter.builder().name("secret").register(registry).inc();
+      Counter.builder().name("public").register(registry).inc();
+
+      PrometheusMetricProducer producer = findPrometheusMetricProducer(reader);
+      List<MetricData> metrics = new ArrayList<>(producer.collectAllMetrics());
+      assertThat(metrics).hasSize(1);
+      OpenTelemetryAssertions.assertThat(metrics.get(0)).hasName("public");
+    } finally {
+      reader.shutdown();
+    }
+  }
+
+  // MetricReader does not expose registered CollectionRegistrations, so this test locates the
+  // registered PrometheusMetricProducer reflectively to verify that OtelAutoConfig wires exporter
+  // filter properties through to it.
+  private static PrometheusMetricProducer findPrometheusMetricProducer(Object object)
+      throws IllegalAccessException {
+    assertThat(object).isNotNull();
+    for (Field field : object.getClass().getDeclaredFields()) {
+      field.setAccessible(true);
+      Object value = field.get(object);
+      if (value instanceof PrometheusMetricProducer) {
+        return (PrometheusMetricProducer) value;
+      }
+      if (value instanceof CollectionRegistration) {
+        return findPrometheusMetricProducer(value);
+      }
+      if (value instanceof Iterable<?>) {
+        for (Object element : (Iterable<?>) value) {
+          if (element instanceof PrometheusMetricProducer) {
+            return (PrometheusMetricProducer) element;
+          }
+          if (element instanceof CollectionRegistration) {
+            return findPrometheusMetricProducer(element);
+          }
+        }
+      }
+    }
+    throw new AssertionError(
+        "Did not find PrometheusMetricProducer in " + object.getClass().getName());
+  }
+
   private static ExporterOpenTelemetryProperties getExporterOpenTelemetryProperties(
       TestCase testCase) {
     if (testCase.propertiesBuilder == null) {
diff --git a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScopeTest.java b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScopeTest.java
index c50354b24..948dfc498 100644
--- a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScopeTest.java
+++ b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/PrometheusInstrumentationScopeTest.java
@@ -22,7 +22,6 @@ void loadInstrumentationScopeInfo() {
             () ->
                 PrometheusInstrumentationScope.loadInstrumentationScopeInfo(
                     "instrumentationScope.properties", "name", "version"))
-        .havingRootCause()
         .withMessage(
             "Prometheus metrics library initialization error: name not found in"
                 + " instrumentationScope.properties in classpath.");
@@ -32,7 +31,6 @@ void loadInstrumentationScopeInfo() {
             () ->
                 PrometheusInstrumentationScope.loadInstrumentationScopeInfo(
                     "instrumentationScope.properties", "instrumentationScope.name", "version"))
-        .havingRootCause()
         .withMessage(
             "Prometheus metrics library initialization error: version not found in"
                 + " instrumentationScope.properties in classpath.");
diff --git a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImplTest.java b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImplTest.java
new file mode 100644
index 000000000..066913420
--- /dev/null
+++ b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/ExponentialHistogramPointDataImplTest.java
@@ -0,0 +1,92 @@
+package io.prometheus.metrics.exporter.opentelemetry.otelmodel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.metrics.data.ExponentialHistogramBuckets;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class ExponentialHistogramPointDataImplTest {
+
+  private static final ExponentialHistogramBuckets EMPTY_BUCKETS =
+      ExponentialHistogramBuckets.create(0, 0, List.of());
+
+  @Test
+  void hasMinReturnsTrueWhenMinIsNotNaN() {
+    ExponentialHistogramPointDataImpl histogramPoint =
+        new ExponentialHistogramPointDataImpl(
+            0,
+            10.0,
+            5,
+            0,
+            1.0,
+            5.0,
+            EMPTY_BUCKETS,
+            EMPTY_BUCKETS,
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMin()).isTrue();
+    assertThat(histogramPoint.getMin()).isEqualTo(1.0);
+  }
+
+  @Test
+  void hasMinReturnsFalseWhenMinIsNaN() {
+    ExponentialHistogramPointDataImpl histogramPoint =
+        new ExponentialHistogramPointDataImpl(
+            0,
+            10.0,
+            5,
+            0,
+            Double.NaN,
+            5.0,
+            EMPTY_BUCKETS,
+            EMPTY_BUCKETS,
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMin()).isFalse();
+  }
+
+  @Test
+  void hasMaxReturnsTrueWhenMaxIsNotNaN() {
+    ExponentialHistogramPointDataImpl histogramPoint =
+        new ExponentialHistogramPointDataImpl(
+            0,
+            10.0,
+            5,
+            0,
+            1.0,
+            5.0,
+            EMPTY_BUCKETS,
+            EMPTY_BUCKETS,
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMax()).isTrue();
+    assertThat(histogramPoint.getMax()).isEqualTo(5.0);
+  }
+
+  @Test
+  void hasMaxReturnsFalseWhenMaxIsNaN() {
+    ExponentialHistogramPointDataImpl histogramPoint =
+        new ExponentialHistogramPointDataImpl(
+            0,
+            10.0,
+            5,
+            0,
+            1.0,
+            Double.NaN,
+            EMPTY_BUCKETS,
+            EMPTY_BUCKETS,
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMax()).isFalse();
+  }
+}
diff --git a/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImplTest.java b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImplTest.java
new file mode 100644
index 000000000..b5c4e9373
--- /dev/null
+++ b/prometheus-metrics-exporter-opentelemetry/src/test/java/io/prometheus/metrics/exporter/opentelemetry/otelmodel/HistogramPointDataImplTest.java
@@ -0,0 +1,80 @@
+package io.prometheus.metrics.exporter.opentelemetry.otelmodel;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.api.common.Attributes;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+class HistogramPointDataImplTest {
+
+  @Test
+  void hasMinReturnsTrueWhenMinIsNotNaN() {
+    HistogramPointDataImpl histogramPoint =
+        new HistogramPointDataImpl(
+            10.0,
+            5,
+            1.0,
+            5.0,
+            List.of(1.0, 2.0),
+            List.of(2L, 3L),
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMin()).isTrue();
+    assertThat(histogramPoint.getMin()).isEqualTo(1.0);
+  }
+
+  @Test
+  void hasMinReturnsFalseWhenMinIsNaN() {
+    HistogramPointDataImpl histogramPoint =
+        new HistogramPointDataImpl(
+            10.0,
+            5,
+            Double.NaN,
+            5.0,
+            List.of(1.0, 2.0),
+            List.of(2L, 3L),
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMin()).isFalse();
+  }
+
+  @Test
+  void hasMaxReturnsTrueWhenMaxIsNotNaN() {
+    HistogramPointDataImpl histogramPoint =
+        new HistogramPointDataImpl(
+            10.0,
+            5,
+            1.0,
+            5.0,
+            List.of(1.0, 2.0),
+            List.of(2L, 3L),
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMax()).isTrue();
+    assertThat(histogramPoint.getMax()).isEqualTo(5.0);
+  }
+
+  @Test
+  void hasMaxReturnsFalseWhenMaxIsNaN() {
+    HistogramPointDataImpl histogramPoint =
+        new HistogramPointDataImpl(
+            10.0,
+            5,
+            1.0,
+            Double.NaN,
+            List.of(1.0, 2.0),
+            List.of(2L, 3L),
+            0L,
+            1L,
+            Attributes.empty(),
+            List.of());
+    assertThat(histogramPoint.hasMax()).isFalse();
+  }
+}
diff --git a/prometheus-metrics-exporter-pushgateway/pom.xml b/prometheus-metrics-exporter-pushgateway/pom.xml
index 6d59b2b4d..e97be7479 100644
--- a/prometheus-metrics-exporter-pushgateway/pom.xml
+++ b/prometheus-metrics-exporter-pushgateway/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-pushgateway</artifactId>
@@ -22,6 +21,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-common</artifactId>
@@ -30,7 +35,7 @@
     <dependency>
       <groupId>org.mock-server</groupId>
       <artifactId>mockserver-netty-no-dependencies</artifactId>
-      <version>5.15.0</version>
+      <version>7.6.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/DefaultHttpConnectionFactory.java b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/DefaultHttpConnectionFactory.java
index 60c110149..ef28fb34f 100644
--- a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/DefaultHttpConnectionFactory.java
+++ b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/DefaultHttpConnectionFactory.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.exporter.pushgateway;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -12,6 +13,7 @@
  * certificate verification see {@code PushGatewayTestApp} in {@code
  * integration-tests/it-pushgateway/}.
  */
+@StableApi
 public class DefaultHttpConnectionFactory implements HttpConnectionFactory {
   @Override
   public HttpURLConnection create(URL url) throws IOException {
diff --git a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Format.java b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Format.java
index 3d1b9d2e6..089c686fc 100644
--- a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Format.java
+++ b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Format.java
@@ -1,5 +1,8 @@
 package io.prometheus.metrics.exporter.pushgateway;
 
+import io.prometheus.metrics.annotations.StableApi;
+
+@StableApi
 public enum Format {
   PROMETHEUS_PROTOBUF,
   PROMETHEUS_TEXT
diff --git a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/HttpConnectionFactory.java b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/HttpConnectionFactory.java
index f7a039af7..7b112bb4d 100644
--- a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/HttpConnectionFactory.java
+++ b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/HttpConnectionFactory.java
@@ -1,11 +1,13 @@
 package io.prometheus.metrics.exporter.pushgateway;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
 /** See {@link DefaultHttpConnectionFactory}. */
 @FunctionalInterface
+@StableApi
 public interface HttpConnectionFactory {
   HttpURLConnection create(URL url) throws IOException;
 }
diff --git a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/PushGateway.java b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/PushGateway.java
index 72e0561c1..b7dd844ec 100644
--- a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/PushGateway.java
+++ b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/PushGateway.java
@@ -4,6 +4,7 @@
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.escapeName;
 import static java.util.Objects.requireNonNull;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.config.ExporterPushgatewayProperties;
 import io.prometheus.metrics.config.PrometheusProperties;
@@ -79,6 +80,7 @@
  * <p>See <a
  * href="https://github.com/prometheus/pushgateway">https://github.com/prometheus/pushgateway</a>.
  */
+@StableApi
 public class PushGateway {
   private final URL url;
   private final ExpositionFormatWriter writer;
@@ -253,6 +255,8 @@ private void doRequest(@Nullable PrometheusRegistry registry, String method) thr
     }
   }
 
+  // toString with Charset is only available in Java 10+, but we want to support Java 8
+  @SuppressWarnings("JdkObsolete")
   private static String readFromStream(InputStream is) throws IOException {
     ByteArrayOutputStream result = new ByteArrayOutputStream();
     byte[] buffer = new byte[1024];
@@ -394,7 +398,7 @@ public Builder escapingScheme(EscapingScheme escapingScheme) {
 
     /**
      * Use milliseconds for timestamps in text format? Default is {@code false}. Can be overwritten
-     * at runtime with the {@code io.prometheus.exporter.timestampsInMs} property.
+     * at runtime with the {@code io.prometheus.exporter.timestamps_in_ms} property.
      */
     public Builder prometheusTimestampsInMs(boolean prometheusTimestampsInMs) {
       this.prometheusTimestampsInMs = prometheusTimestampsInMs;
@@ -497,6 +501,8 @@ private Format getFormat() {
       return Format.PROMETHEUS_PROTOBUF;
     }
 
+    // encode with Charset is only available in Java 10+, but we want to support Java 8
+    @SuppressWarnings("JdkObsolete")
     private URL makeUrl(@Nullable ExporterPushgatewayProperties properties)
         throws UnsupportedEncodingException, MalformedURLException {
       StringBuilder url =
@@ -548,9 +554,9 @@ public PushGateway build() {
             getEscapingScheme(properties),
             getConnectionTimeout(properties),
             getReadTimeout(properties));
-      } catch (MalformedURLException e) {
+      } catch (MalformedURLException | IllegalArgumentException e) {
         throw new PrometheusPropertiesException(
-            address + ": Invalid address. Expecting <host>:<port>");
+            "Invalid Pushgateway address. Expecting <host>:<port>");
       } catch (UnsupportedEncodingException e) {
         throw new RuntimeException(e); // cannot happen, UTF-8 is always supported
       }
diff --git a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Scheme.java b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Scheme.java
index 51a2e32dd..1ade4efdb 100644
--- a/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Scheme.java
+++ b/prometheus-metrics-exporter-pushgateway/src/main/java/io/prometheus/metrics/exporter/pushgateway/Scheme.java
@@ -1,5 +1,8 @@
 package io.prometheus.metrics.exporter.pushgateway;
 
+import io.prometheus.metrics.annotations.StableApi;
+
+@StableApi
 public enum Scheme {
   HTTP("http"),
   HTTPS("https");
diff --git a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BasicAuthPushGatewayTest.java b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BasicAuthPushGatewayTest.java
index e2f052d6b..137686d32 100644
--- a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BasicAuthPushGatewayTest.java
+++ b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BasicAuthPushGatewayTest.java
@@ -21,7 +21,7 @@ class BasicAuthPushGatewayTest {
   PushGateway pushGateway;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     mockServerClient = ClientAndServer.startClientAndServer(0);
     registry = new PrometheusRegistry();
     gauge = Gauge.builder().name("g").help("help").build();
@@ -42,7 +42,7 @@ void tearDown() {
   }
 
   @Test
-  public void testAuthorizedPush() throws IOException {
+  void testAuthorizedPush() throws IOException {
     mockServerClient
         .when(
             request()
diff --git a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BearerTokenPushGatewayTest.java b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BearerTokenPushGatewayTest.java
index 09e6ff5e9..996442e5a 100644
--- a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BearerTokenPushGatewayTest.java
+++ b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/BearerTokenPushGatewayTest.java
@@ -21,7 +21,7 @@ class BearerTokenPushGatewayTest {
   PushGateway pushGateway;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     mockServerClient = ClientAndServer.startClientAndServer(0);
     registry = new PrometheusRegistry();
     gauge = Gauge.builder().name("g").help("help").build();
@@ -40,7 +40,7 @@ void tearDown() {
   }
 
   @Test
-  public void testAuthorizedPush() throws IOException {
+  void testAuthorizedPush() throws IOException {
     mockServerClient
         .when(
             request()
diff --git a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/PushGatewayTest.java b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/PushGatewayTest.java
index 4eba4cb17..8c33543f9 100644
--- a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/PushGatewayTest.java
+++ b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/PushGatewayTest.java
@@ -6,6 +6,7 @@
 import static org.mockserver.model.HttpResponse.response;
 
 import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.config.PrometheusPropertiesException;
 import io.prometheus.metrics.core.metrics.Gauge;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
 import java.io.IOException;
@@ -26,7 +27,7 @@ class PushGatewayTest {
   Gauge gauge;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     mockServerClient = ClientAndServer.startClientAndServer(0);
     registry = new PrometheusRegistry();
     gauge = Gauge.builder().name("g").help("help").build();
@@ -38,7 +39,7 @@ void tearDown() {
   }
 
   @Test
-  public void testInvalidURLThrowsRuntimeException() {
+  void testInvalidURLThrowsRuntimeException() {
     assertThatExceptionOfType(RuntimeException.class)
         .isThrownBy(
             () -> {
@@ -49,8 +50,16 @@ public void testInvalidURLThrowsRuntimeException() {
   }
 
   @Test
-  public void testMultipleSlashesAreStrippedFromURL()
-      throws NoSuchFieldException, IllegalAccessException {
+  void testInvalidURLDoesNotExposeCredentials() {
+    String secretAddress = "user:secret@[::";
+    assertThatExceptionOfType(PrometheusPropertiesException.class)
+        .isThrownBy(() -> PushGateway.builder().address(secretAddress).build())
+        .withMessage("Invalid Pushgateway address. Expecting <host>:<port>")
+        .withMessageNotContaining("secret");
+  }
+
+  @Test
+  void testMultipleSlashesAreStrippedFromURL() throws NoSuchFieldException, IllegalAccessException {
     final PushGateway pushGateway =
         PushGateway.builder().address("example.com:1234/context///path//").job("test").build();
     assertThat(getUrl(pushGateway))
@@ -64,7 +73,7 @@ private URL getUrl(PushGateway pushGateway) throws IllegalAccessException, NoSuc
   }
 
   @Test
-  public void testPush() throws IOException {
+  void testPush() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(202));
@@ -78,7 +87,7 @@ public void testPush() throws IOException {
   }
 
   @Test
-  public void testPush200Response() throws IOException {
+  void testPush200Response() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(200));
@@ -92,7 +101,7 @@ public void testPush200Response() throws IOException {
   }
 
   @Test
-  public void testNon202ResponseThrows() {
+  void testNon202ResponseThrows() {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(500));
@@ -114,7 +123,7 @@ public void testNon202ResponseThrows() {
   }
 
   @Test
-  public void testPushCollector() throws IOException {
+  void testPushCollector() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(202));
@@ -128,7 +137,7 @@ public void testPushCollector() throws IOException {
   }
 
   @Test
-  public void testPushWithGroupingKey() throws IOException {
+  void testPushWithGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/l/v"))
         .respond(response().withStatusCode(202));
@@ -143,7 +152,7 @@ public void testPushWithGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushWithEscapedGroupingKey() throws IOException {
+  void testPushWithEscapedGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/U__l_2e_1/v1"))
         .respond(response().withStatusCode(202));
@@ -158,7 +167,7 @@ public void testPushWithEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushWithMultiGroupingKey() throws IOException {
+  void testPushWithMultiGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/l/v/l2/v2"))
         .respond(response().withStatusCode(202));
@@ -174,7 +183,7 @@ public void testPushWithMultiGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushWithMultiEscapedGroupingKey() throws IOException {
+  void testPushWithMultiEscapedGroupingKey() throws IOException {
 
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/U__l_2e_1/v1/U__l_2e_2/v2"))
@@ -191,7 +200,7 @@ public void testPushWithMultiEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushWithEmptyLabelGroupingKey() throws IOException {
+  void testPushWithEmptyLabelGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/l/v/l2@base64/="))
         .respond(response().withStatusCode(202));
@@ -207,7 +216,7 @@ public void testPushWithEmptyLabelGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushWithGroupingKeyWithSlashes() throws IOException {
+  void testPushWithGroupingKeyWithSlashes() throws IOException {
     mockServerClient
         .when(
             request().withMethod("PUT").withPath("/metrics/job@base64/YS9i/l/v/l2@base64/75-_Lw=="))
@@ -224,7 +233,7 @@ public void testPushWithGroupingKeyWithSlashes() throws IOException {
   }
 
   @Test
-  public void testPushCollectorWithGroupingKey() throws IOException {
+  void testPushCollectorWithGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/l/v"))
         .respond(response().withStatusCode(202));
@@ -239,7 +248,7 @@ public void testPushCollectorWithGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushCollectorWithEscapedGroupingKey() throws IOException {
+  void testPushCollectorWithEscapedGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("PUT").withPath("/metrics/job/j/U__l_2e_1/v1"))
         .respond(response().withStatusCode(202));
@@ -254,7 +263,7 @@ public void testPushCollectorWithEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushAdd() throws IOException {
+  void testPushAdd() throws IOException {
     mockServerClient
         .when(request().withMethod("POST").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(202));
@@ -268,7 +277,7 @@ public void testPushAdd() throws IOException {
   }
 
   @Test
-  public void testPushAddCollector() throws IOException {
+  void testPushAddCollector() throws IOException {
     mockServerClient
         .when(request().withMethod("POST").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(202));
@@ -278,7 +287,7 @@ public void testPushAddCollector() throws IOException {
   }
 
   @Test
-  public void testPushAddWithGroupingKey() throws IOException {
+  void testPushAddWithGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("POST").withPath("/metrics/job/j/l/v"))
         .respond(response().withStatusCode(202));
@@ -293,7 +302,7 @@ public void testPushAddWithGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushAddWithEscapedGroupingKey() throws IOException {
+  void testPushAddWithEscapedGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("POST").withPath("/metrics/job/j/U__l_2e_1/v1"))
         .respond(response().withStatusCode(202));
@@ -308,7 +317,7 @@ public void testPushAddWithEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushAddCollectorWithGroupingKey() throws IOException {
+  void testPushAddCollectorWithGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("POST").withPath("/metrics/job/j/l/v"))
         .respond(response().withStatusCode(202));
@@ -323,7 +332,7 @@ public void testPushAddCollectorWithGroupingKey() throws IOException {
   }
 
   @Test
-  public void testPushAddCollectorWithEscapedGroupingKey() throws IOException {
+  void testPushAddCollectorWithEscapedGroupingKey() throws IOException {
 
     mockServerClient
         .when(request().withMethod("POST").withPath("/metrics/job/j/U__l_2e_1/v1"))
@@ -339,7 +348,7 @@ public void testPushAddCollectorWithEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testDelete() throws IOException {
+  void testDelete() throws IOException {
     mockServerClient
         .when(request().withMethod("DELETE").withPath("/metrics/job/j"))
         .respond(response().withStatusCode(202));
@@ -349,7 +358,7 @@ public void testDelete() throws IOException {
   }
 
   @Test
-  public void testDeleteWithGroupingKey() throws IOException {
+  void testDeleteWithGroupingKey() throws IOException {
     mockServerClient
         .when(request().withMethod("DELETE").withPath("/metrics/job/j/l/v"))
         .respond(response().withStatusCode(202));
@@ -363,7 +372,7 @@ public void testDeleteWithGroupingKey() throws IOException {
   }
 
   @Test
-  public void testDeleteWithEscapedGroupingKey() throws IOException {
+  void testDeleteWithEscapedGroupingKey() throws IOException {
 
     mockServerClient
         .when(request().withMethod("DELETE").withPath("/metrics/job/j/U__l_2e_1/v1"))
@@ -378,7 +387,7 @@ public void testDeleteWithEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testInstanceIpGroupingKey() throws IOException {
+  void testInstanceIpGroupingKey() throws IOException {
     String ip = InetAddress.getLocalHost().getHostAddress();
     assertThat(ip).isNotEmpty();
     mockServerClient
@@ -395,7 +404,7 @@ public void testInstanceIpGroupingKey() throws IOException {
   }
 
   @Test
-  public void testInstanceIpEscapedGroupingKey() throws IOException {
+  void testInstanceIpEscapedGroupingKey() throws IOException {
 
     String ip = InetAddress.getLocalHost().getHostAddress();
     assertThat(ip).isNotEmpty();
@@ -416,7 +425,7 @@ public void testInstanceIpEscapedGroupingKey() throws IOException {
   }
 
   @Test
-  public void testEscapingSchemeDefaultValue() throws IllegalAccessException, NoSuchFieldException {
+  void testEscapingSchemeDefaultValue() throws IllegalAccessException, NoSuchFieldException {
     PushGateway pg =
         PushGateway.builder()
             .address("localhost:" + mockServerClient.getPort())
diff --git a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/SchemeTest.java b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/SchemeTest.java
index 6695a2911..0f6bf61d9 100644
--- a/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/SchemeTest.java
+++ b/prometheus-metrics-exporter-pushgateway/src/test/java/io/prometheus/metrics/exporter/pushgateway/SchemeTest.java
@@ -9,6 +9,8 @@ class SchemeTest {
 
   @Test
   void fromString() {
+    assertThat(Scheme.fromString("http")).isEqualTo(Scheme.HTTP);
+    assertThat(Scheme.fromString("https")).isEqualTo(Scheme.HTTPS);
     assertThat(Scheme.HTTP).hasToString("http");
     assertThat(Scheme.HTTPS).hasToString("https");
     assertThatExceptionOfType(IllegalArgumentException.class)
diff --git a/prometheus-metrics-exporter-servlet-jakarta/pom.xml b/prometheus-metrics-exporter-servlet-jakarta/pom.xml
index 263428a20..877431e56 100644
--- a/prometheus-metrics-exporter-servlet-jakarta/pom.xml
+++ b/prometheus-metrics-exporter-servlet-jakarta/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-servlet-jakarta</artifactId>
@@ -23,6 +22,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-common</artifactId>
@@ -34,5 +39,13 @@
       <version>6.1.0</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/prometheus-metrics-exporter-servlet-jakarta/src/main/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.java b/prometheus-metrics-exporter-servlet-jakarta/src/main/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.java
index 5e22fc3fd..68153f761 100644
--- a/prometheus-metrics-exporter-servlet-jakarta/src/main/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.java
+++ b/prometheus-metrics-exporter-servlet-jakarta/src/main/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServlet.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.exporter.servlet.jakarta;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.exporter.common.PrometheusScrapeHandler;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
@@ -14,6 +15,7 @@
  * <p>We'll add a Jakarta servlet, the built-in HTTPServer, etc. soon, and likely move common code
  * into a common module.
  */
+@StableApi
 public class PrometheusMetricsServlet extends HttpServlet {
 
   private static final long serialVersionUID = 0L;
diff --git a/prometheus-metrics-exporter-servlet-jakarta/src/test/java/io/prometheus/metrics/exporter/servlet/jakarta/HttpExchangeAdapterTest.java b/prometheus-metrics-exporter-servlet-jakarta/src/test/java/io/prometheus/metrics/exporter/servlet/jakarta/HttpExchangeAdapterTest.java
new file mode 100644
index 000000000..7a795cc04
--- /dev/null
+++ b/prometheus-metrics-exporter-servlet-jakarta/src/test/java/io/prometheus/metrics/exporter/servlet/jakarta/HttpExchangeAdapterTest.java
@@ -0,0 +1,165 @@
+package io.prometheus.metrics.exporter.servlet.jakarta;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.prometheus.metrics.exporter.common.PrometheusHttpRequest;
+import io.prometheus.metrics.exporter.common.PrometheusHttpResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
+class HttpExchangeAdapterTest {
+
+  @Test
+  void testRequestGetQueryString() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getQueryString()).thenReturn("name[]=test");
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getQueryString()).isEqualTo("name[]=test");
+  }
+
+  @Test
+  void testRequestGetHeaders() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getHeaders("Accept"))
+        .thenReturn(Collections.enumeration(Collections.singletonList("text/plain")));
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getHeaders("Accept").nextElement()).isEqualTo("text/plain");
+  }
+
+  @Test
+  void testRequestGetMethod() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getMethod()).thenReturn("GET");
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getMethod()).isEqualTo("GET");
+  }
+
+  @Test
+  void testRequestGetRequestPath() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getContextPath()).thenReturn("/app");
+    when(servletRequest.getServletPath()).thenReturn("/metrics");
+    when(servletRequest.getPathInfo()).thenReturn(null);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getRequestPath()).isEqualTo("/app/metrics");
+  }
+
+  @Test
+  void testRequestGetRequestPathWithPathInfo() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getContextPath()).thenReturn("/app");
+    when(servletRequest.getServletPath()).thenReturn("/metrics");
+    when(servletRequest.getPathInfo()).thenReturn("/extra");
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getRequestPath()).isEqualTo("/app/metrics/extra");
+  }
+
+  @Test
+  void testResponseSetHeader() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpResponse response = adapter.getResponse();
+
+    response.setHeader("Content-Type", "text/plain");
+    verify(servletResponse).setHeader("Content-Type", "text/plain");
+  }
+
+  @Test
+  void testResponseSendHeadersAndGetBody() throws IOException {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    ServletOutputStream outputStream = mock(ServletOutputStream.class);
+    when(servletResponse.getOutputStream()).thenReturn(outputStream);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpResponse response = adapter.getResponse();
+
+    response.sendHeadersAndGetBody(200, 100);
+
+    verify(servletResponse).setContentLength(100);
+    verify(servletResponse).setStatus(200);
+    verify(servletResponse).getOutputStream();
+  }
+
+  @Test
+  void testResponseSendHeadersWithContentLengthAlreadySet() throws IOException {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    ServletOutputStream outputStream = mock(ServletOutputStream.class);
+    when(servletResponse.getHeader("Content-Length")).thenReturn("50");
+    when(servletResponse.getOutputStream()).thenReturn(outputStream);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpResponse response = adapter.getResponse();
+
+    response.sendHeadersAndGetBody(200, 100);
+
+    verify(servletResponse).setStatus(200);
+    verify(servletResponse).getOutputStream();
+  }
+
+  @Test
+  void testHandleIOException() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    IOException exception = new IOException("Test exception");
+
+    assertThatExceptionOfType(IOException.class)
+        .isThrownBy(() -> adapter.handleException(exception))
+        .withMessage("Test exception");
+  }
+
+  @Test
+  void testHandleRuntimeException() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    RuntimeException exception = new RuntimeException("Test exception");
+
+    assertThatExceptionOfType(RuntimeException.class)
+        .isThrownBy(() -> adapter.handleException(exception))
+        .withMessage("Test exception");
+  }
+
+  @Test
+  void testClose() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    adapter.close(); // Should not throw
+  }
+}
diff --git a/prometheus-metrics-exporter-servlet-jakarta/src/test/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServletTest.java b/prometheus-metrics-exporter-servlet-jakarta/src/test/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServletTest.java
new file mode 100644
index 000000000..5d0d66bfd
--- /dev/null
+++ b/prometheus-metrics-exporter-servlet-jakarta/src/test/java/io/prometheus/metrics/exporter/servlet/jakarta/PrometheusMetricsServletTest.java
@@ -0,0 +1,82 @@
+package io.prometheus.metrics.exporter.servlet.jakarta;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class PrometheusMetricsServletTest {
+
+  private PrometheusRegistry registry;
+  private Counter testCounter;
+
+  @BeforeEach
+  void setUp() {
+    registry = new PrometheusRegistry();
+    testCounter = Counter.builder().name("test_counter").help("Test counter").register(registry);
+    testCounter.inc(42);
+  }
+
+  @Test
+  void testDoGetWritesMetrics() throws IOException {
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    HttpServletResponse response = mock(HttpServletResponse.class);
+
+    when(request.getQueryString()).thenReturn(null);
+    when(request.getMethod()).thenReturn("GET");
+    when(request.getHeaders("Accept-Encoding")).thenReturn(Collections.emptyEnumeration());
+    when(request.getHeaders("Accept")).thenReturn(Collections.emptyEnumeration());
+    when(request.getContextPath()).thenReturn("");
+    when(request.getServletPath()).thenReturn("/metrics");
+    when(request.getPathInfo()).thenReturn(null);
+
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    when(response.getOutputStream())
+        .thenReturn(
+            new ServletOutputStream() {
+              @Override
+              public void write(int b) throws IOException {
+                outputStream.write(b);
+              }
+
+              @Override
+              public boolean isReady() {
+                return true;
+              }
+
+              @Override
+              public void setWriteListener(WriteListener writeListener) {}
+            });
+
+    PrometheusMetricsServlet servlet = new PrometheusMetricsServlet(registry);
+    servlet.doGet(request, response);
+
+    String output = outputStream.toString(StandardCharsets.UTF_8.name());
+    assertThat(output).contains("test_counter");
+    assertThat(output).contains("42.0");
+  }
+
+  @Test
+  void testServletUsesDefaultRegistry() {
+    PrometheusMetricsServlet servlet = new PrometheusMetricsServlet();
+    assertThat(servlet).isNotNull();
+  }
+
+  @Test
+  void testServletWithCustomRegistry() {
+    PrometheusMetricsServlet servlet = new PrometheusMetricsServlet(registry);
+    assertThat(servlet).isNotNull();
+  }
+}
diff --git a/prometheus-metrics-exporter-servlet-javax/pom.xml b/prometheus-metrics-exporter-servlet-javax/pom.xml
index 30cd52539..701d178d9 100644
--- a/prometheus-metrics-exporter-servlet-javax/pom.xml
+++ b/prometheus-metrics-exporter-servlet-javax/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exporter-servlet-javax</artifactId>
@@ -30,6 +29,12 @@
   </developers>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-exporter-common</artifactId>
@@ -41,6 +46,14 @@
       <version>4.0.1</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-core</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/prometheus-metrics-exporter-servlet-javax/src/main/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServlet.java b/prometheus-metrics-exporter-servlet-javax/src/main/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServlet.java
index a486aec93..aa2e3e3a9 100644
--- a/prometheus-metrics-exporter-servlet-javax/src/main/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServlet.java
+++ b/prometheus-metrics-exporter-servlet-javax/src/main/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServlet.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.exporter.servlet.javax;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.exporter.common.PrometheusScrapeHandler;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
@@ -13,6 +14,7 @@
  * PrometheusScrapeHandler to handle HTTP GET requests and export metrics. The servlet can be
  * configured with custom PrometheusProperties and a PrometheusRegistry.
  */
+@StableApi
 public class PrometheusMetricsServlet extends HttpServlet {
 
   private static final long serialVersionUID = 0L;
diff --git a/prometheus-metrics-exporter-servlet-javax/src/test/java/io/prometheus/metrics/exporter/servlet/javax/HttpExchangeAdapterTest.java b/prometheus-metrics-exporter-servlet-javax/src/test/java/io/prometheus/metrics/exporter/servlet/javax/HttpExchangeAdapterTest.java
new file mode 100644
index 000000000..f4f1f0f3f
--- /dev/null
+++ b/prometheus-metrics-exporter-servlet-javax/src/test/java/io/prometheus/metrics/exporter/servlet/javax/HttpExchangeAdapterTest.java
@@ -0,0 +1,190 @@
+package io.prometheus.metrics.exporter.servlet.javax;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import io.prometheus.metrics.exporter.common.PrometheusHttpRequest;
+import io.prometheus.metrics.exporter.common.PrometheusHttpResponse;
+import java.io.IOException;
+import java.util.Collections;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.Test;
+
+class HttpExchangeAdapterTest {
+
+  @Test
+  void testRequestGetQueryString() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getQueryString()).thenReturn("name[]=test");
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getQueryString()).isEqualTo("name[]=test");
+  }
+
+  @Test
+  void testRequestGetHeaders() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getHeaders("Accept"))
+        .thenReturn(Collections.enumeration(Collections.singletonList("text/plain")));
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getHeaders("Accept").nextElement()).isEqualTo("text/plain");
+  }
+
+  @Test
+  void testRequestGetMethod() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getMethod()).thenReturn("GET");
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getMethod()).isEqualTo("GET");
+  }
+
+  @Test
+  void testRequestGetRequestPath() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getContextPath()).thenReturn("/app");
+    when(servletRequest.getServletPath()).thenReturn("/metrics");
+    when(servletRequest.getPathInfo()).thenReturn(null);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getRequestPath()).isEqualTo("/app/metrics");
+  }
+
+  @Test
+  void testRequestGetRequestPathWithPathInfo() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    when(servletRequest.getContextPath()).thenReturn("/app");
+    when(servletRequest.getServletPath()).thenReturn("/metrics");
+    when(servletRequest.getPathInfo()).thenReturn("/extra");
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpRequest request = adapter.getRequest();
+
+    assertThat(request.getRequestPath()).isEqualTo("/app/metrics/extra");
+  }
+
+  @Test
+  void testResponseSetHeader() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpResponse response = adapter.getResponse();
+
+    response.setHeader("Content-Type", "text/plain");
+    verify(servletResponse).setHeader("Content-Type", "text/plain");
+  }
+
+  @Test
+  void testResponseSendHeadersAndGetBody() throws IOException {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    ServletOutputStream outputStream =
+        new ServletOutputStream() {
+          @Override
+          public void write(int b) throws IOException {}
+
+          @Override
+          public boolean isReady() {
+            return true;
+          }
+
+          @Override
+          public void setWriteListener(WriteListener writeListener) {}
+        };
+    when(servletResponse.getOutputStream()).thenReturn(outputStream);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpResponse response = adapter.getResponse();
+
+    response.sendHeadersAndGetBody(200, 100);
+
+    verify(servletResponse).setContentLength(100);
+    verify(servletResponse).setStatus(200);
+    verify(servletResponse).getOutputStream();
+  }
+
+  @Test
+  void testResponseSendHeadersWithContentLengthAlreadySet() throws IOException {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+    ServletOutputStream outputStream =
+        new ServletOutputStream() {
+          @Override
+          public void write(int b) throws IOException {}
+
+          @Override
+          public boolean isReady() {
+            return true;
+          }
+
+          @Override
+          public void setWriteListener(WriteListener writeListener) {}
+        };
+    when(servletResponse.getHeader("Content-Length")).thenReturn("50");
+    when(servletResponse.getOutputStream()).thenReturn(outputStream);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    PrometheusHttpResponse response = adapter.getResponse();
+
+    response.sendHeadersAndGetBody(200, 100);
+
+    verify(servletResponse).setStatus(200);
+    verify(servletResponse).getOutputStream();
+  }
+
+  @Test
+  void testHandleIOException() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    IOException exception = new IOException("Test exception");
+
+    assertThatExceptionOfType(IOException.class)
+        .isThrownBy(() -> adapter.handleException(exception))
+        .withMessage("Test exception");
+  }
+
+  @Test
+  void testHandleRuntimeException() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    RuntimeException exception = new RuntimeException("Test exception");
+
+    assertThatExceptionOfType(RuntimeException.class)
+        .isThrownBy(() -> adapter.handleException(exception))
+        .withMessage("Test exception");
+  }
+
+  @Test
+  void testClose() {
+    HttpServletRequest servletRequest = mock(HttpServletRequest.class);
+    HttpServletResponse servletResponse = mock(HttpServletResponse.class);
+
+    HttpExchangeAdapter adapter = new HttpExchangeAdapter(servletRequest, servletResponse);
+    adapter.close(); // Should not throw
+  }
+}
diff --git a/prometheus-metrics-exporter-servlet-javax/src/test/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServletTest.java b/prometheus-metrics-exporter-servlet-javax/src/test/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServletTest.java
new file mode 100644
index 000000000..0b3c5e5f6
--- /dev/null
+++ b/prometheus-metrics-exporter-servlet-javax/src/test/java/io/prometheus/metrics/exporter/servlet/javax/PrometheusMetricsServletTest.java
@@ -0,0 +1,82 @@
+package io.prometheus.metrics.exporter.servlet.javax;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import io.prometheus.metrics.core.metrics.Counter;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class PrometheusMetricsServletTest {
+
+  private PrometheusRegistry registry;
+  private Counter testCounter;
+
+  @BeforeEach
+  void setUp() {
+    registry = new PrometheusRegistry();
+    testCounter = Counter.builder().name("test_counter").help("Test counter").register(registry);
+    testCounter.inc(42);
+  }
+
+  @Test
+  void testDoGetWritesMetrics() throws IOException {
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    HttpServletResponse response = mock(HttpServletResponse.class);
+
+    when(request.getQueryString()).thenReturn(null);
+    when(request.getMethod()).thenReturn("GET");
+    when(request.getHeaders("Accept-Encoding")).thenReturn(Collections.emptyEnumeration());
+    when(request.getHeaders("Accept")).thenReturn(Collections.emptyEnumeration());
+    when(request.getContextPath()).thenReturn("");
+    when(request.getServletPath()).thenReturn("/metrics");
+    when(request.getPathInfo()).thenReturn(null);
+
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    when(response.getOutputStream())
+        .thenReturn(
+            new ServletOutputStream() {
+              @Override
+              public void write(int b) throws IOException {
+                outputStream.write(b);
+              }
+
+              @Override
+              public boolean isReady() {
+                return true;
+              }
+
+              @Override
+              public void setWriteListener(WriteListener writeListener) {}
+            });
+
+    PrometheusMetricsServlet servlet = new PrometheusMetricsServlet(registry);
+    servlet.doGet(request, response);
+
+    String output = outputStream.toString(StandardCharsets.UTF_8.name());
+    assertThat(output).contains("test_counter");
+    assertThat(output).contains("42.0");
+  }
+
+  @Test
+  void testServletUsesDefaultRegistry() {
+    PrometheusMetricsServlet servlet = new PrometheusMetricsServlet();
+    assertThat(servlet).isNotNull();
+  }
+
+  @Test
+  void testServletWithCustomRegistry() {
+    PrometheusMetricsServlet servlet = new PrometheusMetricsServlet(registry);
+    assertThat(servlet).isNotNull();
+  }
+}
diff --git a/prometheus-metrics-exposition-formats-shaded/pom.xml b/prometheus-metrics-exposition-formats-shaded/pom.xml
index 64e033366..f7e65bcb8 100644
--- a/prometheus-metrics-exposition-formats-shaded/pom.xml
+++ b/prometheus-metrics-exposition-formats-shaded/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exposition-formats</artifactId>
diff --git a/prometheus-metrics-exposition-formats/generate-protobuf.sh b/prometheus-metrics-exposition-formats/generate-protobuf.sh
index 6e873b2e3..97b82e280 100755
--- a/prometheus-metrics-exposition-formats/generate-protobuf.sh
+++ b/prometheus-metrics-exposition-formats/generate-protobuf.sh
@@ -18,12 +18,13 @@ mkdir -p "$TARGET_DIR"
 rm -rf $PROTO_DIR || true
 mkdir -p $PROTO_DIR
 
-OLD_PACKAGE=$(sed -nE 's/import (io.prometheus.metrics.expositionformats.generated.*).Metrics;/\1/p' src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java)
+OLD_PACKAGE=$(sed -nE 's/.*extends (io\.prometheus\.metrics\.expositionformats\.generated\.[^ ]*?)\.Metrics.*/\1/p' src/main/java/io/prometheus/metrics/expositionformats/generated/Metrics.java)
 PACKAGE="io.prometheus.metrics.expositionformats.generated.com_google_protobuf_${PROTOBUF_VERSION_STRING}"
 
+SUPERCLASS_FILE="src/main/java/io/prometheus/metrics/expositionformats/generated/Metrics.java"
 if [[ $OLD_PACKAGE != "$PACKAGE" ]]; then
-	echo "Replacing package $OLD_PACKAGE with $PACKAGE in all java files"
-	find .. -type f -name "*.java" -exec sed -i "s/$OLD_PACKAGE/$PACKAGE/g" {} +
+	echo "Replacing package $OLD_PACKAGE with $PACKAGE in $SUPERCLASS_FILE"
+	sed -i "s/$OLD_PACKAGE/$PACKAGE/g" "$SUPERCLASS_FILE"
 fi
 
 curl -sL https://raw.githubusercontent.com/prometheus/client_model/master/io/prometheus/client/metrics.proto -o $PROTO_DIR/metrics.proto
@@ -33,20 +34,31 @@ protoc --java_out "$TARGET_DIR" $PROTO_DIR/metrics.proto
 sed -i '1 i\//CHECKSTYLE:OFF: checkstyle' "$(find src/main/generated/io -type f)"
 sed -i -e $'$a\\\n//CHECKSTYLE:ON: checkstyle' "$(find src/main/generated/io -type f)"
 
+GENERATED_FILE="$TARGET_DIR/${PACKAGE//\.//}/Metrics.java"
+sed -i 's/public final class Metrics/public class Metrics/' "$GENERATED_FILE"
+sed -i 's/private Metrics() {}/protected Metrics() {}/' "$GENERATED_FILE"
+
 GENERATED_WITH=$(grep -oP '\/\/ Protobuf Java Version: \K.*' "$TARGET_DIR/${PACKAGE//\.//}"/Metrics.java)
 
-if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
-	echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
+function help() {
 	echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
 	echo "Generated protobuf sources are not up-to-date. Please run 'mise run generate' and commit the changes."
+	echo "NOTE:"
+	echo "1. You should only run 'mise run generate' in a PR from renovate"
+	echo "2. The PR should update both '<protobuf-java.version>' in pom.xml and protoc in mise.toml"
+	echo "   - but at least <protobuf-java.version>. If not, wait until renovate updates the PR."
+}
+
+if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
+	echo "Generated protobuf sources version $GENERATED_WITH does not match provided version $PROTOBUF_VERSION"
+	help
 	exit 1
 fi
 
 STATUS=$(git status --porcelain)
 if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then
-	echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"
-	echo "Generated protobuf sources are not up-to-date. Please run 'mise run generate' and commit the changes."
+	help
 	echo "Local changes:"
-	echo "$STATUS"
+	git diff
 	exit 1
 fi
diff --git a/prometheus-metrics-exposition-formats/pom.xml b/prometheus-metrics-exposition-formats/pom.xml
index bb780f0c2..4f0202faf 100644
--- a/prometheus-metrics-exposition-formats/pom.xml
+++ b/prometheus-metrics-exposition-formats/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exposition-formats-no-protobuf</artifactId>
diff --git a/prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_0/Metrics.java b/prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_36_0/Metrics.java
similarity index 87%
rename from prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_0/Metrics.java
rename to prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_36_0/Metrics.java
index 3c26d4b57..9e50c8b1b 100644
--- a/prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_33_0/Metrics.java
+++ b/prometheus-metrics-exposition-formats/src/main/generated/io/prometheus/metrics/expositionformats/generated/com_google_protobuf_4_36_0/Metrics.java
@@ -2,18 +2,18 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: src/main/protobuf/metrics.proto
-// Protobuf Java Version: 4.33.0
+// Protobuf Java Version: 4.36.0
 
-package io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0;
+package io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0;
 
 @com.google.protobuf.Generated
-public final class Metrics extends com.google.protobuf.GeneratedFile {
-  private Metrics() {}
+public class Metrics extends com.google.protobuf.GeneratedFile {
+  protected Metrics() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 33,
+      /* minor= */ 36,
       /* patch= */ 0,
       /* suffix= */ "",
       "Metrics");
@@ -86,7 +86,7 @@ public enum MetricType
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "MetricType");
@@ -185,7 +185,7 @@ public MetricType findValueByNumber(int number) {
 
     public final com.google.protobuf.Descriptors.EnumValueDescriptor
         getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
+      return getDescriptor().getValue(ordinal());
     }
     public final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptorForType() {
@@ -193,7 +193,7 @@ public MetricType findValueByNumber(int number) {
     }
     public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.getDescriptor().getEnumTypes().get(0);
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.getDescriptor().getEnumType(0);
     }
 
     private static final MetricType[] VALUES = values();
@@ -266,7 +266,7 @@ public static final class LabelPair extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "LabelPair");
@@ -282,15 +282,20 @@ private LabelPair() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_LabelPair_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_LabelPair_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder.class);
     }
 
     private int bitField0_;
@@ -414,19 +419,23 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(1, name_);
       }
       if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(2, value_);
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -437,10 +446,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair) obj;
 
       if (hasName() != other.hasName()) return false;
       if (hasName()) {
@@ -476,44 +485,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -521,26 +530,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -553,7 +562,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -574,21 +583,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.LabelPair)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_LabelPair_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_LabelPair_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.newBuilder()
       private Builder() {
 
       }
@@ -610,17 +619,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_LabelPair_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -628,14 +637,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -651,16 +660,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.getDefaultInstance()) return this;
         if (other.hasName()) {
           name_ = other.name_;
           bitField0_ |= 0x00000001;
@@ -686,9 +695,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -774,7 +781,7 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         name_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -797,7 +804,7 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         name_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -854,7 +861,7 @@ public java.lang.String getValue() {
        */
       public Builder setValue(
           java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         value_ = value;
         bitField0_ |= 0x00000002;
         onChanged();
@@ -877,7 +884,7 @@ public Builder clearValue() {
        */
       public Builder setValueBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         value_ = value;
         bitField0_ |= 0x00000002;
         onChanged();
@@ -888,12 +895,12 @@ public Builder setValueBytes(
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.LabelPair)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -929,7 +936,7 @@ public com.google.protobuf.Parser<LabelPair> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -962,7 +969,7 @@ public static final class Gauge extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Gauge");
@@ -976,15 +983,20 @@ private Gauge() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Gauge_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Gauge_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder.class);
     }
 
     private int bitField0_;
@@ -1026,17 +1038,21 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
+    private int computeSerializedSize_0() {
+      int size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(1, value_);
+      }
+      return size;
+    }
     @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(1, value_);
-      }
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1047,10 +1063,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge) obj;
 
       if (hasValue() != other.hasValue()) return false;
       if (hasValue()) {
@@ -1079,44 +1095,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1124,26 +1140,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1156,7 +1172,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1177,21 +1193,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Gauge)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Gauge_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Gauge_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.newBuilder()
       private Builder() {
 
       }
@@ -1212,17 +1228,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Gauge_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1230,14 +1246,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1249,16 +1265,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance()) return this;
         if (other.hasValue()) {
           setValue(other.getValue());
         }
@@ -1277,9 +1293,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -1354,12 +1368,12 @@ public Builder clearValue() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Gauge)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1395,7 +1409,7 @@ public com.google.protobuf.Parser<Gauge> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -1425,11 +1439,11 @@ public interface CounterOrBuilder extends
      * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
      * @return The exemplar.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplar();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplar();
     /**
      * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder();
 
     /**
      * <code>optional .google.protobuf.Timestamp created_timestamp = 3;</code>
@@ -1458,7 +1472,7 @@ public static final class Counter extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Counter");
@@ -1472,15 +1486,20 @@ private Counter() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Counter_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Counter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder.class);
     }
 
     private int bitField0_;
@@ -1504,7 +1523,7 @@ public double getValue() {
     }
 
     public static final int EXEMPLAR_FIELD_NUMBER = 2;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar exemplar_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar exemplar_;
     /**
      * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
      * @return Whether the exemplar field is set.
@@ -1518,15 +1537,15 @@ public boolean hasExemplar() {
      * @return The exemplar.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplar() {
-      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplar() {
+      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
     }
     /**
      * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
-      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
+      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
     }
 
     public static final int CREATED_TIMESTAMP_FIELD_NUMBER = 3;
@@ -1580,13 +1599,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(1, value_);
@@ -1599,6 +1613,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getCreatedTimestamp());
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1609,10 +1632,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter) obj;
 
       if (hasValue() != other.hasValue()) return false;
       if (hasValue()) {
@@ -1659,44 +1682,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1704,26 +1727,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1736,7 +1759,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -1757,21 +1780,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Counter)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Counter_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Counter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1809,17 +1832,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Counter_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -1827,14 +1850,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -1858,16 +1881,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance()) return this;
         if (other.hasValue()) {
           setValue(other.getValue());
         }
@@ -1892,9 +1915,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -1979,9 +2000,9 @@ public Builder clearValue() {
         return this;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar exemplar_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar exemplar_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> exemplarBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> exemplarBuilder_;
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        * @return Whether the exemplar field is set.
@@ -1993,9 +2014,9 @@ public boolean hasExemplar() {
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        * @return The exemplar.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplar() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplar() {
         if (exemplarBuilder_ == null) {
-          return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+          return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
         } else {
           return exemplarBuilder_.getMessage();
         }
@@ -2003,11 +2024,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        */
-      public Builder setExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+      public Builder setExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           exemplar_ = value;
         } else {
           exemplarBuilder_.setMessage(value);
@@ -2020,7 +2039,7 @@ public Builder setExemplar(io.prometheus.metrics.expositionformats.generated.com
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        */
       public Builder setExemplar(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder builderForValue) {
         if (exemplarBuilder_ == null) {
           exemplar_ = builderForValue.build();
         } else {
@@ -2033,11 +2052,11 @@ public Builder setExemplar(
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        */
-      public Builder mergeExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+      public Builder mergeExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
             exemplar_ != null &&
-            exemplar_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance()) {
+            exemplar_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance()) {
             getExemplarBuilder().mergeFrom(value);
           } else {
             exemplar_ = value;
@@ -2067,7 +2086,7 @@ public Builder clearExemplar() {
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder getExemplarBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder getExemplarBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return internalGetExemplarFieldBuilder().getBuilder();
@@ -2075,23 +2094,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
         if (exemplarBuilder_ != null) {
           return exemplarBuilder_.getMessageOrBuilder();
         } else {
           return exemplar_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> 
           internalGetExemplarFieldBuilder() {
         if (exemplarBuilder_ == null) {
           exemplarBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder>(
                   getExemplar(),
                   getParentForChildren(),
                   isClean());
@@ -2126,9 +2145,7 @@ public com.google.protobuf.Timestamp getCreatedTimestamp() {
        */
       public Builder setCreatedTimestamp(com.google.protobuf.Timestamp value) {
         if (createdTimestampBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           createdTimestamp_ = value;
         } else {
           createdTimestampBuilder_.setMessage(value);
@@ -2225,12 +2242,12 @@ public com.google.protobuf.TimestampOrBuilder getCreatedTimestampOrBuilder() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Counter)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2266,7 +2283,7 @@ public com.google.protobuf.Parser<Counter> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2310,7 +2327,7 @@ public static final class Quantile extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Quantile");
@@ -2324,15 +2341,20 @@ private Quantile() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Quantile_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Quantile_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder.class);
     }
 
     private int bitField0_;
@@ -2396,13 +2418,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(1, quantile_);
@@ -2411,6 +2428,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(2, value_);
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -2421,10 +2447,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile) obj;
 
       if (hasQuantile() != other.hasQuantile()) return false;
       if (hasQuantile()) {
@@ -2464,44 +2490,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2509,26 +2535,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2541,7 +2567,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -2562,21 +2588,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Quantile)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Quantile_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Quantile_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.newBuilder()
       private Builder() {
 
       }
@@ -2598,17 +2624,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Quantile_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -2616,14 +2642,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -2639,16 +2665,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.getDefaultInstance()) return this;
         if (other.hasQuantile()) {
           setQuantile(other.getQuantile());
         }
@@ -2670,9 +2696,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -2792,12 +2816,12 @@ public Builder clearValue() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Quantile)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2833,7 +2857,7 @@ public com.google.protobuf.Parser<Quantile> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -2868,12 +2892,12 @@ public interface SummaryOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile> 
         getQuantileList();
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile getQuantile(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile getQuantile(int index);
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
@@ -2881,12 +2905,12 @@ public interface SummaryOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder> 
         getQuantileOrBuilderList();
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder getQuantileOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder getQuantileOrBuilder(
         int index);
 
     /**
@@ -2916,7 +2940,7 @@ public static final class Summary extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Summary");
@@ -2931,15 +2955,20 @@ private Summary() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Summary_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Summary_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder.class);
     }
 
     private int bitField0_;
@@ -2983,19 +3012,19 @@ public double getSampleSum() {
 
     public static final int QUANTILE_FIELD_NUMBER = 3;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile> quantile_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile> quantile_;
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile> getQuantileList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile> getQuantileList() {
       return quantile_;
     }
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder> 
         getQuantileOrBuilderList() {
       return quantile_;
     }
@@ -3010,14 +3039,14 @@ public int getQuantileCount() {
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile getQuantile(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile getQuantile(int index) {
       return quantile_.get(index);
     }
     /**
      * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder getQuantileOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder getQuantileOrBuilder(
         int index) {
       return quantile_.get(index);
     }
@@ -3076,13 +3105,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(1, sampleCount_);
@@ -3091,14 +3115,28 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(2, sampleSum_);
       }
-      for (int i = 0; i < quantile_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, quantile_.get(i));
-      }
+
+          {
+            final int count = quantile_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(quantile_.get(i));
+            }
+            size += 1 * count;
+          }
       if (((bitField0_ & 0x00000004) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getCreatedTimestamp());
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -3109,10 +3147,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary) obj;
 
       if (hasSampleCount() != other.hasSampleCount()) return false;
       if (hasSampleCount()) {
@@ -3166,44 +3204,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3211,26 +3249,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3243,7 +3281,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -3264,21 +3302,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Summary)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Summary_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Summary_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3319,17 +3357,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Summary_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -3337,15 +3375,15 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary result) {
+      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary result) {
         if (quantileBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             quantile_ = java.util.Collections.unmodifiableList(quantile_);
@@ -3357,7 +3395,7 @@ private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.
         }
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -3379,16 +3417,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance()) return this;
         if (other.hasSampleCount()) {
           setSampleCount(other.getSampleCount());
         }
@@ -3439,9 +3477,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -3461,9 +3497,9 @@ public Builder mergeFrom(
                 break;
               } // case 17
               case 26: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.parser(),
                         extensionRegistry);
                 if (quantileBuilder_ == null) {
                   ensureQuantileIsMutable();
@@ -3577,22 +3613,22 @@ public Builder clearSampleSum() {
         return this;
       }
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile> quantile_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile> quantile_ =
         java.util.Collections.emptyList();
       private void ensureQuantileIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          quantile_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile>(quantile_);
+          quantile_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile>(quantile_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder> quantileBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder> quantileBuilder_;
 
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile> getQuantileList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile> getQuantileList() {
         if (quantileBuilder_ == null) {
           return java.util.Collections.unmodifiableList(quantile_);
         } else {
@@ -3612,7 +3648,7 @@ public int getQuantileCount() {
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile getQuantile(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile getQuantile(int index) {
         if (quantileBuilder_ == null) {
           return quantile_.get(index);
         } else {
@@ -3623,11 +3659,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
       public Builder setQuantile(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile value) {
         if (quantileBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureQuantileIsMutable();
           quantile_.set(index, value);
           onChanged();
@@ -3640,7 +3674,7 @@ public Builder setQuantile(
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
       public Builder setQuantile(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder builderForValue) {
         if (quantileBuilder_ == null) {
           ensureQuantileIsMutable();
           quantile_.set(index, builderForValue.build());
@@ -3653,11 +3687,9 @@ public Builder setQuantile(
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public Builder addQuantile(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile value) {
+      public Builder addQuantile(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile value) {
         if (quantileBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureQuantileIsMutable();
           quantile_.add(value);
           onChanged();
@@ -3670,11 +3702,9 @@ public Builder addQuantile(io.prometheus.metrics.expositionformats.generated.com
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
       public Builder addQuantile(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile value) {
         if (quantileBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureQuantileIsMutable();
           quantile_.add(index, value);
           onChanged();
@@ -3687,7 +3717,7 @@ public Builder addQuantile(
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
       public Builder addQuantile(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder builderForValue) {
         if (quantileBuilder_ == null) {
           ensureQuantileIsMutable();
           quantile_.add(builderForValue.build());
@@ -3701,7 +3731,7 @@ public Builder addQuantile(
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
       public Builder addQuantile(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder builderForValue) {
         if (quantileBuilder_ == null) {
           ensureQuantileIsMutable();
           quantile_.add(index, builderForValue.build());
@@ -3715,7 +3745,7 @@ public Builder addQuantile(
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
       public Builder addAllQuantile(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile> values) {
         if (quantileBuilder_ == null) {
           ensureQuantileIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -3755,14 +3785,14 @@ public Builder removeQuantile(int index) {
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder getQuantileBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder getQuantileBuilder(
           int index) {
         return internalGetQuantileFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder getQuantileOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder getQuantileOrBuilder(
           int index) {
         if (quantileBuilder_ == null) {
           return quantile_.get(index);  } else {
@@ -3772,7 +3802,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder> 
            getQuantileOrBuilderList() {
         if (quantileBuilder_ != null) {
           return quantileBuilder_.getMessageOrBuilderList();
@@ -3783,31 +3813,31 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder addQuantileBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder addQuantileBuilder() {
         return internalGetQuantileFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder addQuantileBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder addQuantileBuilder(
           int index) {
         return internalGetQuantileFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.Quantile quantile = 3;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder> 
            getQuantileBuilderList() {
         return internalGetQuantileFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder> 
           internalGetQuantileFieldBuilder() {
         if (quantileBuilder_ == null) {
           quantileBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Quantile.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.QuantileOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Quantile.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.QuantileOrBuilder>(
                   quantile_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
@@ -3843,9 +3873,7 @@ public com.google.protobuf.Timestamp getCreatedTimestamp() {
        */
       public Builder setCreatedTimestamp(com.google.protobuf.Timestamp value) {
         if (createdTimestampBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           createdTimestamp_ = value;
         } else {
           createdTimestampBuilder_.setMessage(value);
@@ -3942,12 +3970,12 @@ public com.google.protobuf.TimestampOrBuilder getCreatedTimestampOrBuilder() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Summary)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -3983,7 +4011,7 @@ public com.google.protobuf.Parser<Summary> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4016,7 +4044,7 @@ public static final class Untyped extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Untyped");
@@ -4030,15 +4058,20 @@ private Untyped() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Untyped_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Untyped_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder.class);
     }
 
     private int bitField0_;
@@ -4080,17 +4113,21 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
+    private int computeSerializedSize_0() {
+      int size = 0;
+      if (((bitField0_ & 0x00000001) != 0)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(1, value_);
+      }
+      return size;
+    }
     @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
 
       size = 0;
-      if (((bitField0_ & 0x00000001) != 0)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(1, value_);
-      }
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -4101,10 +4138,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped) obj;
 
       if (hasValue() != other.hasValue()) return false;
       if (hasValue()) {
@@ -4133,44 +4170,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4178,26 +4215,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4210,7 +4247,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -4231,21 +4268,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Untyped)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Untyped_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Untyped_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.newBuilder()
       private Builder() {
 
       }
@@ -4266,17 +4303,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Untyped_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -4284,14 +4321,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -4303,16 +4340,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance()) return this;
         if (other.hasValue()) {
           setValue(other.getValue());
         }
@@ -4331,9 +4368,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -4408,12 +4443,12 @@ public Builder clearValue() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Untyped)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4449,7 +4484,7 @@ public com.google.protobuf.Parser<Untyped> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -4507,7 +4542,7 @@ public interface HistogramOrBuilder extends
      *
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket> 
         getBucketList();
     /**
      * <pre>
@@ -4516,7 +4551,7 @@ public interface HistogramOrBuilder extends
      *
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket getBucket(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket getBucket(int index);
     /**
      * <pre>
      * Buckets for the conventional histogram.
@@ -4532,7 +4567,7 @@ public interface HistogramOrBuilder extends
      *
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder> 
         getBucketOrBuilderList();
     /**
      * <pre>
@@ -4541,7 +4576,7 @@ public interface HistogramOrBuilder extends
      *
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder getBucketOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder getBucketOrBuilder(
         int index);
 
     /**
@@ -4650,7 +4685,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> 
         getNegativeSpanList();
     /**
      * <pre>
@@ -4659,7 +4694,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getNegativeSpan(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getNegativeSpan(int index);
     /**
      * <pre>
      * Negative buckets for the native histogram.
@@ -4675,7 +4710,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
         getNegativeSpanOrBuilderList();
     /**
      * <pre>
@@ -4684,7 +4719,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder getNegativeSpanOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder getNegativeSpanOrBuilder(
         int index);
 
     /**
@@ -4761,7 +4796,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> 
         getPositiveSpanList();
     /**
      * <pre>
@@ -4773,7 +4808,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getPositiveSpan(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getPositiveSpan(int index);
     /**
      * <pre>
      * Positive buckets for the native histogram.
@@ -4795,7 +4830,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
         getPositiveSpanOrBuilderList();
     /**
      * <pre>
@@ -4807,7 +4842,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder getPositiveSpanOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder getPositiveSpanOrBuilder(
         int index);
 
     /**
@@ -4881,7 +4916,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar> 
         getExemplarsList();
     /**
      * <pre>
@@ -4890,7 +4925,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplars(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplars(int index);
     /**
      * <pre>
      * Only used for native histograms. These exemplars MUST have a timestamp.
@@ -4906,7 +4941,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> 
         getExemplarsOrBuilderList();
     /**
      * <pre>
@@ -4915,7 +4950,7 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      *
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarsOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarsOrBuilder(
         int index);
   }
   /**
@@ -4930,7 +4965,7 @@ public static final class Histogram extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Histogram");
@@ -4952,15 +4987,20 @@ private Histogram() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Histogram_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Histogram_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder.class);
     }
 
     private int bitField0_;
@@ -5031,7 +5071,7 @@ public double getSampleSum() {
 
     public static final int BUCKET_FIELD_NUMBER = 3;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket> bucket_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket> bucket_;
     /**
      * <pre>
      * Buckets for the conventional histogram.
@@ -5040,7 +5080,7 @@ public double getSampleSum() {
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket> getBucketList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket> getBucketList() {
       return bucket_;
     }
     /**
@@ -5051,7 +5091,7 @@ public java.util.List<io.prometheus.metrics.expositionformats.generated.com_goog
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder> 
         getBucketOrBuilderList() {
       return bucket_;
     }
@@ -5074,7 +5114,7 @@ public int getBucketCount() {
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket getBucket(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket getBucket(int index) {
       return bucket_.get(index);
     }
     /**
@@ -5085,7 +5125,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
      * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder getBucketOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder getBucketOrBuilder(
         int index) {
       return bucket_.get(index);
     }
@@ -5234,7 +5274,7 @@ public double getZeroCountFloat() {
 
     public static final int NEGATIVE_SPAN_FIELD_NUMBER = 9;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> negativeSpan_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> negativeSpan_;
     /**
      * <pre>
      * Negative buckets for the native histogram.
@@ -5243,7 +5283,7 @@ public double getZeroCountFloat() {
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> getNegativeSpanList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> getNegativeSpanList() {
       return negativeSpan_;
     }
     /**
@@ -5254,7 +5294,7 @@ public java.util.List<io.prometheus.metrics.expositionformats.generated.com_goog
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
         getNegativeSpanOrBuilderList() {
       return negativeSpan_;
     }
@@ -5277,7 +5317,7 @@ public int getNegativeSpanCount() {
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getNegativeSpan(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getNegativeSpan(int index) {
       return negativeSpan_.get(index);
     }
     /**
@@ -5288,7 +5328,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
      * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder getNegativeSpanOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder getNegativeSpanOrBuilder(
         int index) {
       return negativeSpan_.get(index);
     }
@@ -5383,7 +5423,7 @@ public double getNegativeCount(int index) {
 
     public static final int POSITIVE_SPAN_FIELD_NUMBER = 12;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> positiveSpan_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> positiveSpan_;
     /**
      * <pre>
      * Positive buckets for the native histogram.
@@ -5395,7 +5435,7 @@ public double getNegativeCount(int index) {
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> getPositiveSpanList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> getPositiveSpanList() {
       return positiveSpan_;
     }
     /**
@@ -5409,7 +5449,7 @@ public java.util.List<io.prometheus.metrics.expositionformats.generated.com_goog
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
         getPositiveSpanOrBuilderList() {
       return positiveSpan_;
     }
@@ -5438,7 +5478,7 @@ public int getPositiveSpanCount() {
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getPositiveSpan(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getPositiveSpan(int index) {
       return positiveSpan_.get(index);
     }
     /**
@@ -5452,7 +5492,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
      * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder getPositiveSpanOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder getPositiveSpanOrBuilder(
         int index) {
       return positiveSpan_.get(index);
     }
@@ -5547,7 +5587,7 @@ public double getPositiveCount(int index) {
 
     public static final int EXEMPLARS_FIELD_NUMBER = 16;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar> exemplars_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar> exemplars_;
     /**
      * <pre>
      * Only used for native histograms. These exemplars MUST have a timestamp.
@@ -5556,7 +5596,7 @@ public double getPositiveCount(int index) {
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar> getExemplarsList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar> getExemplarsList() {
       return exemplars_;
     }
     /**
@@ -5567,7 +5607,7 @@ public java.util.List<io.prometheus.metrics.expositionformats.generated.com_goog
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> 
         getExemplarsOrBuilderList() {
       return exemplars_;
     }
@@ -5590,7 +5630,7 @@ public int getExemplarsCount() {
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplars(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplars(int index) {
       return exemplars_.get(index);
     }
     /**
@@ -5601,7 +5641,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
      * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarsOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarsOrBuilder(
         int index) {
       return exemplars_.get(index);
     }
@@ -5670,13 +5710,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(1, sampleCount_);
@@ -5685,10 +5720,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(2, sampleSum_);
       }
-      for (int i = 0; i < bucket_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, bucket_.get(i));
-      }
+
+          {
+            final int count = bucket_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(bucket_.get(i));
+            }
+            size += 1 * count;
+          }
       if (((bitField0_ & 0x00000002) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(4, sampleCountFloat_);
@@ -5709,10 +5749,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(8, zeroCountFloat_);
       }
-      for (int i = 0; i < negativeSpan_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, negativeSpan_.get(i));
-      }
+
+          {
+            final int count = negativeSpan_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(negativeSpan_.get(i));
+            }
+            size += 1 * count;
+          }
       {
         int dataSize = 0;
         for (int i = 0; i < negativeDelta_.size(); i++) {
@@ -5728,10 +5773,15 @@ public int getSerializedSize() {
         size += dataSize;
         size += 1 * getNegativeCountList().size();
       }
-      for (int i = 0; i < positiveSpan_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, positiveSpan_.get(i));
-      }
+
+          {
+            final int count = positiveSpan_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(positiveSpan_.get(i));
+            }
+            size += 1 * count;
+          }
       {
         int dataSize = 0;
         for (int i = 0; i < positiveDelta_.size(); i++) {
@@ -5751,10 +5801,24 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(15, getCreatedTimestamp());
       }
-      for (int i = 0; i < exemplars_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(16, exemplars_.get(i));
-      }
+
+          {
+            final int count = exemplars_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(exemplars_.get(i));
+            }
+            size += 2 * count;
+          }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -5765,10 +5829,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram) obj;
 
       if (hasSampleCount() != other.hasSampleCount()) return false;
       if (hasSampleCount()) {
@@ -5916,44 +5980,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5961,26 +6025,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5993,7 +6057,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -6014,21 +6078,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Histogram)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Histogram_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Histogram_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -6102,17 +6166,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Histogram_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -6120,15 +6184,15 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram result) {
+      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram result) {
         if (bucketBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0)) {
             bucket_ = java.util.Collections.unmodifiableList(bucket_);
@@ -6167,7 +6231,7 @@ private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.
         }
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -6225,16 +6289,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance()) return this;
         if (other.hasSampleCount()) {
           setSampleCount(other.getSampleCount());
         }
@@ -6422,9 +6486,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -6444,9 +6506,9 @@ public Builder mergeFrom(
                 break;
               } // case 17
               case 26: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.parser(),
                         extensionRegistry);
                 if (bucketBuilder_ == null) {
                   ensureBucketIsMutable();
@@ -6482,9 +6544,9 @@ public Builder mergeFrom(
                 break;
               } // case 65
               case 74: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.parser(),
                         extensionRegistry);
                 if (negativeSpanBuilder_ == null) {
                   ensureNegativeSpanIsMutable();
@@ -6528,9 +6590,9 @@ public Builder mergeFrom(
                 break;
               } // case 90
               case 98: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.parser(),
                         extensionRegistry);
                 if (positiveSpanBuilder_ == null) {
                   ensurePositiveSpanIsMutable();
@@ -6581,9 +6643,9 @@ public Builder mergeFrom(
                 break;
               } // case 122
               case 130: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.parser(),
                         extensionRegistry);
                 if (exemplarsBuilder_ == null) {
                   ensureExemplarsIsMutable();
@@ -6746,17 +6808,17 @@ public Builder clearSampleSum() {
         return this;
       }
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket> bucket_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket> bucket_ =
         java.util.Collections.emptyList();
       private void ensureBucketIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          bucket_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket>(bucket_);
+          bucket_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket>(bucket_);
           bitField0_ |= 0x00000008;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder> bucketBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder> bucketBuilder_;
 
       /**
        * <pre>
@@ -6765,7 +6827,7 @@ private void ensureBucketIsMutable() {
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket> getBucketList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket> getBucketList() {
         if (bucketBuilder_ == null) {
           return java.util.Collections.unmodifiableList(bucket_);
         } else {
@@ -6793,7 +6855,7 @@ public int getBucketCount() {
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket getBucket(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket getBucket(int index) {
         if (bucketBuilder_ == null) {
           return bucket_.get(index);
         } else {
@@ -6808,11 +6870,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
       public Builder setBucket(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket value) {
         if (bucketBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureBucketIsMutable();
           bucket_.set(index, value);
           onChanged();
@@ -6829,7 +6889,7 @@ public Builder setBucket(
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
       public Builder setBucket(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder builderForValue) {
         if (bucketBuilder_ == null) {
           ensureBucketIsMutable();
           bucket_.set(index, builderForValue.build());
@@ -6846,11 +6906,9 @@ public Builder setBucket(
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public Builder addBucket(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket value) {
+      public Builder addBucket(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket value) {
         if (bucketBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureBucketIsMutable();
           bucket_.add(value);
           onChanged();
@@ -6867,11 +6925,9 @@ public Builder addBucket(io.prometheus.metrics.expositionformats.generated.com_g
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
       public Builder addBucket(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket value) {
         if (bucketBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureBucketIsMutable();
           bucket_.add(index, value);
           onChanged();
@@ -6888,7 +6944,7 @@ public Builder addBucket(
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
       public Builder addBucket(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder builderForValue) {
         if (bucketBuilder_ == null) {
           ensureBucketIsMutable();
           bucket_.add(builderForValue.build());
@@ -6906,7 +6962,7 @@ public Builder addBucket(
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
       public Builder addBucket(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder builderForValue) {
         if (bucketBuilder_ == null) {
           ensureBucketIsMutable();
           bucket_.add(index, builderForValue.build());
@@ -6924,7 +6980,7 @@ public Builder addBucket(
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
       public Builder addAllBucket(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket> values) {
         if (bucketBuilder_ == null) {
           ensureBucketIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -6976,7 +7032,7 @@ public Builder removeBucket(int index) {
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder getBucketBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder getBucketBuilder(
           int index) {
         return internalGetBucketFieldBuilder().getBuilder(index);
       }
@@ -6987,7 +7043,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder getBucketOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder getBucketOrBuilder(
           int index) {
         if (bucketBuilder_ == null) {
           return bucket_.get(index);  } else {
@@ -7001,7 +7057,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder> 
            getBucketOrBuilderList() {
         if (bucketBuilder_ != null) {
           return bucketBuilder_.getMessageOrBuilderList();
@@ -7016,9 +7072,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder addBucketBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder addBucketBuilder() {
         return internalGetBucketFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.getDefaultInstance());
       }
       /**
        * <pre>
@@ -7027,10 +7083,10 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder addBucketBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder addBucketBuilder(
           int index) {
         return internalGetBucketFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.getDefaultInstance());
       }
       /**
        * <pre>
@@ -7039,16 +7095,16 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Bucket bucket = 3;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder> 
            getBucketBuilderList() {
         return internalGetBucketFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder> 
           internalGetBucketFieldBuilder() {
         if (bucketBuilder_ == null) {
           bucketBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder>(
                   bucket_,
                   ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
@@ -7084,9 +7140,7 @@ public com.google.protobuf.Timestamp getCreatedTimestamp() {
        */
       public Builder setCreatedTimestamp(com.google.protobuf.Timestamp value) {
         if (createdTimestampBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           createdTimestamp_ = value;
         } else {
           createdTimestampBuilder_.setMessage(value);
@@ -7419,17 +7473,17 @@ public Builder clearZeroCountFloat() {
         return this;
       }
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> negativeSpan_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> negativeSpan_ =
         java.util.Collections.emptyList();
       private void ensureNegativeSpanIsMutable() {
         if (!((bitField0_ & 0x00000200) != 0)) {
-          negativeSpan_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan>(negativeSpan_);
+          negativeSpan_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan>(negativeSpan_);
           bitField0_ |= 0x00000200;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> negativeSpanBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> negativeSpanBuilder_;
 
       /**
        * <pre>
@@ -7438,7 +7492,7 @@ private void ensureNegativeSpanIsMutable() {
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> getNegativeSpanList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> getNegativeSpanList() {
         if (negativeSpanBuilder_ == null) {
           return java.util.Collections.unmodifiableList(negativeSpan_);
         } else {
@@ -7466,7 +7520,7 @@ public int getNegativeSpanCount() {
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getNegativeSpan(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getNegativeSpan(int index) {
         if (negativeSpanBuilder_ == null) {
           return negativeSpan_.get(index);
         } else {
@@ -7481,11 +7535,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
       public Builder setNegativeSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan value) {
         if (negativeSpanBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureNegativeSpanIsMutable();
           negativeSpan_.set(index, value);
           onChanged();
@@ -7502,7 +7554,7 @@ public Builder setNegativeSpan(
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
       public Builder setNegativeSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder builderForValue) {
         if (negativeSpanBuilder_ == null) {
           ensureNegativeSpanIsMutable();
           negativeSpan_.set(index, builderForValue.build());
@@ -7519,11 +7571,9 @@ public Builder setNegativeSpan(
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public Builder addNegativeSpan(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan value) {
+      public Builder addNegativeSpan(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan value) {
         if (negativeSpanBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureNegativeSpanIsMutable();
           negativeSpan_.add(value);
           onChanged();
@@ -7540,11 +7590,9 @@ public Builder addNegativeSpan(io.prometheus.metrics.expositionformats.generated
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
       public Builder addNegativeSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan value) {
         if (negativeSpanBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureNegativeSpanIsMutable();
           negativeSpan_.add(index, value);
           onChanged();
@@ -7561,7 +7609,7 @@ public Builder addNegativeSpan(
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
       public Builder addNegativeSpan(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder builderForValue) {
         if (negativeSpanBuilder_ == null) {
           ensureNegativeSpanIsMutable();
           negativeSpan_.add(builderForValue.build());
@@ -7579,7 +7627,7 @@ public Builder addNegativeSpan(
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
       public Builder addNegativeSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder builderForValue) {
         if (negativeSpanBuilder_ == null) {
           ensureNegativeSpanIsMutable();
           negativeSpan_.add(index, builderForValue.build());
@@ -7597,7 +7645,7 @@ public Builder addNegativeSpan(
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
       public Builder addAllNegativeSpan(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> values) {
         if (negativeSpanBuilder_ == null) {
           ensureNegativeSpanIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -7649,7 +7697,7 @@ public Builder removeNegativeSpan(int index) {
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder getNegativeSpanBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder getNegativeSpanBuilder(
           int index) {
         return internalGetNegativeSpanFieldBuilder().getBuilder(index);
       }
@@ -7660,7 +7708,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder getNegativeSpanOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder getNegativeSpanOrBuilder(
           int index) {
         if (negativeSpanBuilder_ == null) {
           return negativeSpan_.get(index);  } else {
@@ -7674,7 +7722,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
            getNegativeSpanOrBuilderList() {
         if (negativeSpanBuilder_ != null) {
           return negativeSpanBuilder_.getMessageOrBuilderList();
@@ -7689,9 +7737,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder addNegativeSpanBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder addNegativeSpanBuilder() {
         return internalGetNegativeSpanFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.getDefaultInstance());
       }
       /**
        * <pre>
@@ -7700,10 +7748,10 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder addNegativeSpanBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder addNegativeSpanBuilder(
           int index) {
         return internalGetNegativeSpanFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.getDefaultInstance());
       }
       /**
        * <pre>
@@ -7712,16 +7760,16 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan negative_span = 9;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder> 
            getNegativeSpanBuilderList() {
         return internalGetNegativeSpanFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
           internalGetNegativeSpanFieldBuilder() {
         if (negativeSpanBuilder_ == null) {
           negativeSpanBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder>(
                   negativeSpan_,
                   ((bitField0_ & 0x00000200) != 0),
                   getParentForChildren(),
@@ -7975,17 +8023,17 @@ public Builder clearNegativeCount() {
         return this;
       }
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> positiveSpan_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> positiveSpan_ =
         java.util.Collections.emptyList();
       private void ensurePositiveSpanIsMutable() {
         if (!((bitField0_ & 0x00001000) != 0)) {
-          positiveSpan_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan>(positiveSpan_);
+          positiveSpan_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan>(positiveSpan_);
           bitField0_ |= 0x00001000;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> positiveSpanBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> positiveSpanBuilder_;
 
       /**
        * <pre>
@@ -7997,7 +8045,7 @@ private void ensurePositiveSpanIsMutable() {
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> getPositiveSpanList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> getPositiveSpanList() {
         if (positiveSpanBuilder_ == null) {
           return java.util.Collections.unmodifiableList(positiveSpan_);
         } else {
@@ -8031,7 +8079,7 @@ public int getPositiveSpanCount() {
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getPositiveSpan(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getPositiveSpan(int index) {
         if (positiveSpanBuilder_ == null) {
           return positiveSpan_.get(index);
         } else {
@@ -8049,11 +8097,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
       public Builder setPositiveSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan value) {
         if (positiveSpanBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensurePositiveSpanIsMutable();
           positiveSpan_.set(index, value);
           onChanged();
@@ -8073,7 +8119,7 @@ public Builder setPositiveSpan(
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
       public Builder setPositiveSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder builderForValue) {
         if (positiveSpanBuilder_ == null) {
           ensurePositiveSpanIsMutable();
           positiveSpan_.set(index, builderForValue.build());
@@ -8093,11 +8139,9 @@ public Builder setPositiveSpan(
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public Builder addPositiveSpan(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan value) {
+      public Builder addPositiveSpan(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan value) {
         if (positiveSpanBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensurePositiveSpanIsMutable();
           positiveSpan_.add(value);
           onChanged();
@@ -8117,11 +8161,9 @@ public Builder addPositiveSpan(io.prometheus.metrics.expositionformats.generated
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
       public Builder addPositiveSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan value) {
         if (positiveSpanBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensurePositiveSpanIsMutable();
           positiveSpan_.add(index, value);
           onChanged();
@@ -8141,7 +8183,7 @@ public Builder addPositiveSpan(
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
       public Builder addPositiveSpan(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder builderForValue) {
         if (positiveSpanBuilder_ == null) {
           ensurePositiveSpanIsMutable();
           positiveSpan_.add(builderForValue.build());
@@ -8162,7 +8204,7 @@ public Builder addPositiveSpan(
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
       public Builder addPositiveSpan(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder builderForValue) {
         if (positiveSpanBuilder_ == null) {
           ensurePositiveSpanIsMutable();
           positiveSpan_.add(index, builderForValue.build());
@@ -8183,7 +8225,7 @@ public Builder addPositiveSpan(
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
       public Builder addAllPositiveSpan(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan> values) {
         if (positiveSpanBuilder_ == null) {
           ensurePositiveSpanIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -8244,7 +8286,7 @@ public Builder removePositiveSpan(int index) {
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder getPositiveSpanBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder getPositiveSpanBuilder(
           int index) {
         return internalGetPositiveSpanFieldBuilder().getBuilder(index);
       }
@@ -8258,7 +8300,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder getPositiveSpanOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder getPositiveSpanOrBuilder(
           int index) {
         if (positiveSpanBuilder_ == null) {
           return positiveSpan_.get(index);  } else {
@@ -8275,7 +8317,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
            getPositiveSpanOrBuilderList() {
         if (positiveSpanBuilder_ != null) {
           return positiveSpanBuilder_.getMessageOrBuilderList();
@@ -8293,9 +8335,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder addPositiveSpanBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder addPositiveSpanBuilder() {
         return internalGetPositiveSpanFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.getDefaultInstance());
       }
       /**
        * <pre>
@@ -8307,10 +8349,10 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder addPositiveSpanBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder addPositiveSpanBuilder(
           int index) {
         return internalGetPositiveSpanFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.getDefaultInstance());
       }
       /**
        * <pre>
@@ -8322,16 +8364,16 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.BucketSpan positive_span = 12;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder> 
            getPositiveSpanBuilderList() {
         return internalGetPositiveSpanFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder> 
           internalGetPositiveSpanFieldBuilder() {
         if (positiveSpanBuilder_ == null) {
           positiveSpanBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder>(
                   positiveSpan_,
                   ((bitField0_ & 0x00001000) != 0),
                   getParentForChildren(),
@@ -8585,17 +8627,17 @@ public Builder clearPositiveCount() {
         return this;
       }
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar> exemplars_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar> exemplars_ =
         java.util.Collections.emptyList();
       private void ensureExemplarsIsMutable() {
         if (!((bitField0_ & 0x00008000) != 0)) {
-          exemplars_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar>(exemplars_);
+          exemplars_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar>(exemplars_);
           bitField0_ |= 0x00008000;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> exemplarsBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> exemplarsBuilder_;
 
       /**
        * <pre>
@@ -8604,7 +8646,7 @@ private void ensureExemplarsIsMutable() {
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar> getExemplarsList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar> getExemplarsList() {
         if (exemplarsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(exemplars_);
         } else {
@@ -8632,7 +8674,7 @@ public int getExemplarsCount() {
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplars(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplars(int index) {
         if (exemplarsBuilder_ == null) {
           return exemplars_.get(index);
         } else {
@@ -8647,11 +8689,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
       public Builder setExemplars(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureExemplarsIsMutable();
           exemplars_.set(index, value);
           onChanged();
@@ -8668,7 +8708,7 @@ public Builder setExemplars(
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
       public Builder setExemplars(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder builderForValue) {
         if (exemplarsBuilder_ == null) {
           ensureExemplarsIsMutable();
           exemplars_.set(index, builderForValue.build());
@@ -8685,11 +8725,9 @@ public Builder setExemplars(
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public Builder addExemplars(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+      public Builder addExemplars(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureExemplarsIsMutable();
           exemplars_.add(value);
           onChanged();
@@ -8706,11 +8744,9 @@ public Builder addExemplars(io.prometheus.metrics.expositionformats.generated.co
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
       public Builder addExemplars(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureExemplarsIsMutable();
           exemplars_.add(index, value);
           onChanged();
@@ -8727,7 +8763,7 @@ public Builder addExemplars(
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
       public Builder addExemplars(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder builderForValue) {
         if (exemplarsBuilder_ == null) {
           ensureExemplarsIsMutable();
           exemplars_.add(builderForValue.build());
@@ -8745,7 +8781,7 @@ public Builder addExemplars(
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
       public Builder addExemplars(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder builderForValue) {
         if (exemplarsBuilder_ == null) {
           ensureExemplarsIsMutable();
           exemplars_.add(index, builderForValue.build());
@@ -8763,7 +8799,7 @@ public Builder addExemplars(
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
       public Builder addAllExemplars(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar> values) {
         if (exemplarsBuilder_ == null) {
           ensureExemplarsIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -8815,7 +8851,7 @@ public Builder removeExemplars(int index) {
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder getExemplarsBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder getExemplarsBuilder(
           int index) {
         return internalGetExemplarsFieldBuilder().getBuilder(index);
       }
@@ -8826,7 +8862,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarsOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarsOrBuilder(
           int index) {
         if (exemplarsBuilder_ == null) {
           return exemplars_.get(index);  } else {
@@ -8840,7 +8876,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> 
            getExemplarsOrBuilderList() {
         if (exemplarsBuilder_ != null) {
           return exemplarsBuilder_.getMessageOrBuilderList();
@@ -8855,9 +8891,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder addExemplarsBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder addExemplarsBuilder() {
         return internalGetExemplarsFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance());
       }
       /**
        * <pre>
@@ -8866,10 +8902,10 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder addExemplarsBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder addExemplarsBuilder(
           int index) {
         return internalGetExemplarsFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance());
       }
       /**
        * <pre>
@@ -8878,16 +8914,16 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        *
        * <code>repeated .io.prometheus.client.Exemplar exemplars = 16;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder> 
            getExemplarsBuilderList() {
         return internalGetExemplarsFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> 
           internalGetExemplarsFieldBuilder() {
         if (exemplarsBuilder_ == null) {
           exemplarsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder>(
                   exemplars_,
                   ((bitField0_ & 0x00008000) != 0),
                   getParentForChildren(),
@@ -8901,12 +8937,12 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Histogram)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -8942,7 +8978,7 @@ public com.google.protobuf.Parser<Histogram> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9018,11 +9054,11 @@ public interface BucketOrBuilder extends
      * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
      * @return The exemplar.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplar();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplar();
     /**
      * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder();
   }
   /**
    * <pre>
@@ -9041,7 +9077,7 @@ public static final class Bucket extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Bucket");
@@ -9055,15 +9091,20 @@ private Bucket() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Bucket_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Bucket_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder.class);
     }
 
     private int bitField0_;
@@ -9149,7 +9190,7 @@ public double getUpperBound() {
     }
 
     public static final int EXEMPLAR_FIELD_NUMBER = 3;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar exemplar_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar exemplar_;
     /**
      * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
      * @return Whether the exemplar field is set.
@@ -9163,15 +9204,15 @@ public boolean hasExemplar() {
      * @return The exemplar.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplar() {
-      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplar() {
+      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
     }
     /**
      * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
-      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
+      return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -9202,13 +9243,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(1, cumulativeCount_);
@@ -9225,6 +9261,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(4, cumulativeCountFloat_);
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -9235,10 +9280,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket) obj;
 
       if (hasCumulativeCount() != other.hasCumulativeCount()) return false;
       if (hasCumulativeCount()) {
@@ -9297,44 +9342,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9342,26 +9387,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9374,7 +9419,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -9400,21 +9445,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Bucket)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Bucket_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Bucket_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -9448,17 +9493,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Bucket_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -9466,14 +9511,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -9499,16 +9544,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket.getDefaultInstance()) return this;
         if (other.hasCumulativeCount()) {
           setCumulativeCount(other.getCumulativeCount());
         }
@@ -9536,9 +9581,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -9754,9 +9797,9 @@ public Builder clearUpperBound() {
         return this;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar exemplar_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar exemplar_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> exemplarBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> exemplarBuilder_;
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        * @return Whether the exemplar field is set.
@@ -9768,9 +9811,9 @@ public boolean hasExemplar() {
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        * @return The exemplar.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getExemplar() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getExemplar() {
         if (exemplarBuilder_ == null) {
-          return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+          return exemplar_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
         } else {
           return exemplarBuilder_.getMessage();
         }
@@ -9778,11 +9821,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        */
-      public Builder setExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+      public Builder setExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           exemplar_ = value;
         } else {
           exemplarBuilder_.setMessage(value);
@@ -9795,7 +9836,7 @@ public Builder setExemplar(io.prometheus.metrics.expositionformats.generated.com
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        */
       public Builder setExemplar(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder builderForValue) {
         if (exemplarBuilder_ == null) {
           exemplar_ = builderForValue.build();
         } else {
@@ -9808,11 +9849,11 @@ public Builder setExemplar(
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        */
-      public Builder mergeExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar value) {
+      public Builder mergeExemplar(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar value) {
         if (exemplarBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
             exemplar_ != null &&
-            exemplar_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance()) {
+            exemplar_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance()) {
             getExemplarBuilder().mergeFrom(value);
           } else {
             exemplar_ = value;
@@ -9842,7 +9883,7 @@ public Builder clearExemplar() {
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder getExemplarBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder getExemplarBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return internalGetExemplarFieldBuilder().getBuilder();
@@ -9850,23 +9891,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder getExemplarOrBuilder() {
         if (exemplarBuilder_ != null) {
           return exemplarBuilder_.getMessageOrBuilder();
         } else {
           return exemplar_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance() : exemplar_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Exemplar exemplar = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder> 
           internalGetExemplarFieldBuilder() {
         if (exemplarBuilder_ == null) {
           exemplarBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder>(
                   getExemplar(),
                   getParentForChildren(),
                   isClean());
@@ -9879,12 +9920,12 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Bucket)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9920,7 +9961,7 @@ public com.google.protobuf.Parser<Bucket> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Bucket getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Bucket getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -9989,7 +10030,7 @@ public static final class BucketSpan extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "BucketSpan");
@@ -10003,15 +10044,20 @@ private BucketSpan() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_BucketSpan_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_BucketSpan_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder.class);
     }
 
     private int bitField0_;
@@ -10091,13 +10137,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeSInt32Size(1, offset_);
@@ -10106,6 +10147,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, length_);
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -10116,10 +10166,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan) obj;
 
       if (hasOffset() != other.hasOffset()) return false;
       if (hasOffset()) {
@@ -10155,44 +10205,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -10200,26 +10250,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -10232,7 +10282,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -10262,21 +10312,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.BucketSpan)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpanOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpanOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_BucketSpan_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_BucketSpan_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.newBuilder()
       private Builder() {
 
       }
@@ -10298,17 +10348,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_BucketSpan_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -10316,14 +10366,14 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan(this);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -10339,16 +10389,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan.getDefaultInstance()) return this;
         if (other.hasOffset()) {
           setOffset(other.getOffset());
         }
@@ -10370,9 +10420,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -10524,12 +10572,12 @@ public Builder clearLength() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.BucketSpan)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10565,7 +10613,7 @@ public com.google.protobuf.Parser<BucketSpan> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.BucketSpan getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.BucketSpan getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -10578,12 +10626,12 @@ public interface ExemplarOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> 
         getLabelList();
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getLabel(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getLabel(int index);
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
@@ -10591,12 +10639,12 @@ public interface ExemplarOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
         getLabelOrBuilderList();
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
         int index);
 
     /**
@@ -10649,7 +10697,7 @@ public static final class Exemplar extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Exemplar");
@@ -10664,33 +10712,38 @@ private Exemplar() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Exemplar_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Exemplar_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder.class);
     }
 
     private int bitField0_;
     public static final int LABEL_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> label_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> label_;
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> getLabelList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> getLabelList() {
       return label_;
     }
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
         getLabelOrBuilderList() {
       return label_;
     }
@@ -10705,14 +10758,14 @@ public int getLabelCount() {
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getLabel(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getLabel(int index) {
       return label_.get(index);
     }
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
         int index) {
       return label_.get(index);
     }
@@ -10799,17 +10852,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
+    private int computeSerializedSize_0() {
+      int size = 0;
 
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < label_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, label_.get(i));
-      }
+          {
+            final int count = label_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(label_.get(i));
+            }
+            size += 1 * count;
+          }
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(2, value_);
@@ -10818,6 +10871,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, getTimestamp());
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -10828,10 +10890,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar) obj;
 
       if (!getLabelList()
           .equals(other.getLabelList())) return false;
@@ -10875,44 +10937,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -10920,26 +10982,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -10952,7 +11014,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -10973,21 +11035,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Exemplar)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.ExemplarOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.ExemplarOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Exemplar_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Exemplar_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -11027,17 +11089,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Exemplar_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -11045,15 +11107,15 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar result) {
+      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar result) {
         if (labelBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             label_ = java.util.Collections.unmodifiableList(label_);
@@ -11065,7 +11127,7 @@ private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.
         }
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -11083,16 +11145,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar.getDefaultInstance()) return this;
         if (labelBuilder_ == null) {
           if (!other.label_.isEmpty()) {
             if (label_.isEmpty()) {
@@ -11140,9 +11202,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -11152,9 +11212,9 @@ public Builder mergeFrom(
                 done = true;
                 break;
               case 10: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.parser(),
                         extensionRegistry);
                 if (labelBuilder_ == null) {
                   ensureLabelIsMutable();
@@ -11193,22 +11253,22 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> label_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> label_ =
         java.util.Collections.emptyList();
       private void ensureLabelIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          label_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair>(label_);
+          label_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair>(label_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> labelBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> labelBuilder_;
 
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> getLabelList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> getLabelList() {
         if (labelBuilder_ == null) {
           return java.util.Collections.unmodifiableList(label_);
         } else {
@@ -11228,7 +11288,7 @@ public int getLabelCount() {
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getLabel(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getLabel(int index) {
         if (labelBuilder_ == null) {
           return label_.get(index);
         } else {
@@ -11239,11 +11299,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder setLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair value) {
         if (labelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureLabelIsMutable();
           label_.set(index, value);
           onChanged();
@@ -11256,7 +11314,7 @@ public Builder setLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder setLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder builderForValue) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           label_.set(index, builderForValue.build());
@@ -11269,11 +11327,9 @@ public Builder setLabel(
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public Builder addLabel(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair value) {
+      public Builder addLabel(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair value) {
         if (labelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureLabelIsMutable();
           label_.add(value);
           onChanged();
@@ -11286,11 +11342,9 @@ public Builder addLabel(io.prometheus.metrics.expositionformats.generated.com_go
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair value) {
         if (labelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureLabelIsMutable();
           label_.add(index, value);
           onChanged();
@@ -11303,7 +11357,7 @@ public Builder addLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addLabel(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder builderForValue) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           label_.add(builderForValue.build());
@@ -11317,7 +11371,7 @@ public Builder addLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder builderForValue) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           label_.add(index, builderForValue.build());
@@ -11331,7 +11385,7 @@ public Builder addLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addAllLabel(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> values) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -11371,14 +11425,14 @@ public Builder removeLabel(int index) {
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder getLabelBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder getLabelBuilder(
           int index) {
         return internalGetLabelFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
           int index) {
         if (labelBuilder_ == null) {
           return label_.get(index);  } else {
@@ -11388,7 +11442,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
            getLabelOrBuilderList() {
         if (labelBuilder_ != null) {
           return labelBuilder_.getMessageOrBuilderList();
@@ -11399,31 +11453,31 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder addLabelBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder addLabelBuilder() {
         return internalGetLabelFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder addLabelBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder addLabelBuilder(
           int index) {
         return internalGetLabelFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder> 
            getLabelBuilderList() {
         return internalGetLabelFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
           internalGetLabelFieldBuilder() {
         if (labelBuilder_ == null) {
           labelBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder>(
                   label_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -11511,9 +11565,7 @@ public com.google.protobuf.Timestamp getTimestamp() {
        */
       public Builder setTimestamp(com.google.protobuf.Timestamp value) {
         if (timestampBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           timestamp_ = value;
         } else {
           timestampBuilder_.setMessage(value);
@@ -11634,12 +11686,12 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Exemplar)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -11675,7 +11727,7 @@ public com.google.protobuf.Parser<Exemplar> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Exemplar getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Exemplar getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -11688,12 +11740,12 @@ public interface MetricOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> 
         getLabelList();
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getLabel(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getLabel(int index);
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
@@ -11701,12 +11753,12 @@ public interface MetricOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
         getLabelOrBuilderList();
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
         int index);
 
     /**
@@ -11718,11 +11770,11 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
      * @return The gauge.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge getGauge();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge getGauge();
     /**
      * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder getGaugeOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder getGaugeOrBuilder();
 
     /**
      * <code>optional .io.prometheus.client.Counter counter = 3;</code>
@@ -11733,11 +11785,11 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      * <code>optional .io.prometheus.client.Counter counter = 3;</code>
      * @return The counter.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter getCounter();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter getCounter();
     /**
      * <code>optional .io.prometheus.client.Counter counter = 3;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder getCounterOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder getCounterOrBuilder();
 
     /**
      * <code>optional .io.prometheus.client.Summary summary = 4;</code>
@@ -11748,11 +11800,11 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      * <code>optional .io.prometheus.client.Summary summary = 4;</code>
      * @return The summary.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary getSummary();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary getSummary();
     /**
      * <code>optional .io.prometheus.client.Summary summary = 4;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder getSummaryOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder getSummaryOrBuilder();
 
     /**
      * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
@@ -11763,11 +11815,11 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
      * @return The untyped.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped getUntyped();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped getUntyped();
     /**
      * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder getUntypedOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder getUntypedOrBuilder();
 
     /**
      * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
@@ -11778,11 +11830,11 @@ io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Met
      * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
      * @return The histogram.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram getHistogram();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram getHistogram();
     /**
      * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder getHistogramOrBuilder();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder getHistogramOrBuilder();
 
     /**
      * <code>optional int64 timestamp_ms = 6;</code>
@@ -11807,7 +11859,7 @@ public static final class Metric extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "Metric");
@@ -11822,33 +11874,38 @@ private Metric() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Metric_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Metric_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder.class);
     }
 
     private int bitField0_;
     public static final int LABEL_FIELD_NUMBER = 1;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> label_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> label_;
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> getLabelList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> getLabelList() {
       return label_;
     }
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
         getLabelOrBuilderList() {
       return label_;
     }
@@ -11863,20 +11920,20 @@ public int getLabelCount() {
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getLabel(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getLabel(int index) {
       return label_.get(index);
     }
     /**
      * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
         int index) {
       return label_.get(index);
     }
 
     public static final int GAUGE_FIELD_NUMBER = 2;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge gauge_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge gauge_;
     /**
      * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
      * @return Whether the gauge field is set.
@@ -11890,19 +11947,19 @@ public boolean hasGauge() {
      * @return The gauge.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge getGauge() {
-      return gauge_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance() : gauge_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge getGauge() {
+      return gauge_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance() : gauge_;
     }
     /**
      * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder getGaugeOrBuilder() {
-      return gauge_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance() : gauge_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder getGaugeOrBuilder() {
+      return gauge_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance() : gauge_;
     }
 
     public static final int COUNTER_FIELD_NUMBER = 3;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter counter_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter counter_;
     /**
      * <code>optional .io.prometheus.client.Counter counter = 3;</code>
      * @return Whether the counter field is set.
@@ -11916,19 +11973,19 @@ public boolean hasCounter() {
      * @return The counter.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter getCounter() {
-      return counter_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance() : counter_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter getCounter() {
+      return counter_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance() : counter_;
     }
     /**
      * <code>optional .io.prometheus.client.Counter counter = 3;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder getCounterOrBuilder() {
-      return counter_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance() : counter_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder getCounterOrBuilder() {
+      return counter_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance() : counter_;
     }
 
     public static final int SUMMARY_FIELD_NUMBER = 4;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary summary_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary summary_;
     /**
      * <code>optional .io.prometheus.client.Summary summary = 4;</code>
      * @return Whether the summary field is set.
@@ -11942,19 +11999,19 @@ public boolean hasSummary() {
      * @return The summary.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary getSummary() {
-      return summary_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance() : summary_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary getSummary() {
+      return summary_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance() : summary_;
     }
     /**
      * <code>optional .io.prometheus.client.Summary summary = 4;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder getSummaryOrBuilder() {
-      return summary_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance() : summary_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder getSummaryOrBuilder() {
+      return summary_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance() : summary_;
     }
 
     public static final int UNTYPED_FIELD_NUMBER = 5;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped untyped_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped untyped_;
     /**
      * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
      * @return Whether the untyped field is set.
@@ -11968,19 +12025,19 @@ public boolean hasUntyped() {
      * @return The untyped.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped getUntyped() {
-      return untyped_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance() : untyped_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped getUntyped() {
+      return untyped_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance() : untyped_;
     }
     /**
      * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder getUntypedOrBuilder() {
-      return untyped_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance() : untyped_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder getUntypedOrBuilder() {
+      return untyped_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance() : untyped_;
     }
 
     public static final int HISTOGRAM_FIELD_NUMBER = 7;
-    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram histogram_;
+    private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram histogram_;
     /**
      * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
      * @return Whether the histogram field is set.
@@ -11994,15 +12051,15 @@ public boolean hasHistogram() {
      * @return The histogram.
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram getHistogram() {
-      return histogram_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance() : histogram_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram getHistogram() {
+      return histogram_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance() : histogram_;
     }
     /**
      * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder getHistogramOrBuilder() {
-      return histogram_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance() : histogram_;
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder getHistogramOrBuilder() {
+      return histogram_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance() : histogram_;
     }
 
     public static final int TIMESTAMP_MS_FIELD_NUMBER = 6;
@@ -12061,17 +12118,17 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
+    private int computeSerializedSize_0() {
+      int size = 0;
 
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < label_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, label_.get(i));
-      }
+          {
+            final int count = label_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(label_.get(i));
+            }
+            size += 1 * count;
+          }
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, getGauge());
@@ -12096,6 +12153,15 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(7, getHistogram());
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -12106,10 +12172,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric) obj;
 
       if (!getLabelList()
           .equals(other.getLabelList())) return false;
@@ -12188,44 +12254,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -12233,26 +12299,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -12265,7 +12331,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -12286,21 +12352,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.Metric)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Metric_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Metric_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -12364,17 +12430,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_Metric_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -12382,15 +12448,15 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric result) {
+      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric result) {
         if (labelBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             label_ = java.util.Collections.unmodifiableList(label_);
@@ -12402,7 +12468,7 @@ private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.
         }
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000002) != 0)) {
@@ -12444,16 +12510,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.getDefaultInstance()) return this;
         if (labelBuilder_ == null) {
           if (!other.label_.isEmpty()) {
             if (label_.isEmpty()) {
@@ -12513,9 +12579,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -12525,9 +12589,9 @@ public Builder mergeFrom(
                 done = true;
                 break;
               case 10: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.parser(),
                         extensionRegistry);
                 if (labelBuilder_ == null) {
                   ensureLabelIsMutable();
@@ -12594,22 +12658,22 @@ public Builder mergeFrom(
       }
       private int bitField0_;
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> label_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> label_ =
         java.util.Collections.emptyList();
       private void ensureLabelIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          label_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair>(label_);
+          label_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair>(label_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> labelBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> labelBuilder_;
 
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> getLabelList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> getLabelList() {
         if (labelBuilder_ == null) {
           return java.util.Collections.unmodifiableList(label_);
         } else {
@@ -12629,7 +12693,7 @@ public int getLabelCount() {
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair getLabel(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair getLabel(int index) {
         if (labelBuilder_ == null) {
           return label_.get(index);
         } else {
@@ -12640,11 +12704,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder setLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair value) {
         if (labelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureLabelIsMutable();
           label_.set(index, value);
           onChanged();
@@ -12657,7 +12719,7 @@ public Builder setLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder setLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder builderForValue) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           label_.set(index, builderForValue.build());
@@ -12670,11 +12732,9 @@ public Builder setLabel(
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public Builder addLabel(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair value) {
+      public Builder addLabel(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair value) {
         if (labelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureLabelIsMutable();
           label_.add(value);
           onChanged();
@@ -12687,11 +12747,9 @@ public Builder addLabel(io.prometheus.metrics.expositionformats.generated.com_go
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair value) {
         if (labelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureLabelIsMutable();
           label_.add(index, value);
           onChanged();
@@ -12704,7 +12762,7 @@ public Builder addLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addLabel(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder builderForValue) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           label_.add(builderForValue.build());
@@ -12718,7 +12776,7 @@ public Builder addLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addLabel(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder builderForValue) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           label_.add(index, builderForValue.build());
@@ -12732,7 +12790,7 @@ public Builder addLabel(
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
       public Builder addAllLabel(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair> values) {
         if (labelBuilder_ == null) {
           ensureLabelIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -12772,14 +12830,14 @@ public Builder removeLabel(int index) {
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder getLabelBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder getLabelBuilder(
           int index) {
         return internalGetLabelFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder getLabelOrBuilder(
           int index) {
         if (labelBuilder_ == null) {
           return label_.get(index);  } else {
@@ -12789,7 +12847,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
            getLabelOrBuilderList() {
         if (labelBuilder_ != null) {
           return labelBuilder_.getMessageOrBuilderList();
@@ -12800,31 +12858,31 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder addLabelBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder addLabelBuilder() {
         return internalGetLabelFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder addLabelBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder addLabelBuilder(
           int index) {
         return internalGetLabelFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.LabelPair label = 1;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder> 
            getLabelBuilderList() {
         return internalGetLabelFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder> 
           internalGetLabelFieldBuilder() {
         if (labelBuilder_ == null) {
           labelBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.LabelPairOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPair.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.LabelPairOrBuilder>(
                   label_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -12834,9 +12892,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
         return labelBuilder_;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge gauge_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge gauge_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder> gaugeBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder> gaugeBuilder_;
       /**
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        * @return Whether the gauge field is set.
@@ -12848,9 +12906,9 @@ public boolean hasGauge() {
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        * @return The gauge.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge getGauge() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge getGauge() {
         if (gaugeBuilder_ == null) {
-          return gauge_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance() : gauge_;
+          return gauge_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance() : gauge_;
         } else {
           return gaugeBuilder_.getMessage();
         }
@@ -12858,11 +12916,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        */
-      public Builder setGauge(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge value) {
+      public Builder setGauge(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge value) {
         if (gaugeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           gauge_ = value;
         } else {
           gaugeBuilder_.setMessage(value);
@@ -12875,7 +12931,7 @@ public Builder setGauge(io.prometheus.metrics.expositionformats.generated.com_go
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        */
       public Builder setGauge(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder builderForValue) {
         if (gaugeBuilder_ == null) {
           gauge_ = builderForValue.build();
         } else {
@@ -12888,11 +12944,11 @@ public Builder setGauge(
       /**
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        */
-      public Builder mergeGauge(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge value) {
+      public Builder mergeGauge(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge value) {
         if (gaugeBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0) &&
             gauge_ != null &&
-            gauge_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance()) {
+            gauge_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance()) {
             getGaugeBuilder().mergeFrom(value);
           } else {
             gauge_ = value;
@@ -12922,7 +12978,7 @@ public Builder clearGauge() {
       /**
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder getGaugeBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder getGaugeBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return internalGetGaugeFieldBuilder().getBuilder();
@@ -12930,23 +12986,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder getGaugeOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder getGaugeOrBuilder() {
         if (gaugeBuilder_ != null) {
           return gaugeBuilder_.getMessageOrBuilder();
         } else {
           return gauge_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.getDefaultInstance() : gauge_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.getDefaultInstance() : gauge_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Gauge gauge = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder> 
           internalGetGaugeFieldBuilder() {
         if (gaugeBuilder_ == null) {
           gaugeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Gauge.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.GaugeOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Gauge.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.GaugeOrBuilder>(
                   getGauge(),
                   getParentForChildren(),
                   isClean());
@@ -12955,9 +13011,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
         return gaugeBuilder_;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter counter_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter counter_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder> counterBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder> counterBuilder_;
       /**
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        * @return Whether the counter field is set.
@@ -12969,9 +13025,9 @@ public boolean hasCounter() {
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        * @return The counter.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter getCounter() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter getCounter() {
         if (counterBuilder_ == null) {
-          return counter_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance() : counter_;
+          return counter_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance() : counter_;
         } else {
           return counterBuilder_.getMessage();
         }
@@ -12979,11 +13035,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        */
-      public Builder setCounter(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter value) {
+      public Builder setCounter(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter value) {
         if (counterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           counter_ = value;
         } else {
           counterBuilder_.setMessage(value);
@@ -12996,7 +13050,7 @@ public Builder setCounter(io.prometheus.metrics.expositionformats.generated.com_
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        */
       public Builder setCounter(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder builderForValue) {
         if (counterBuilder_ == null) {
           counter_ = builderForValue.build();
         } else {
@@ -13009,11 +13063,11 @@ public Builder setCounter(
       /**
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        */
-      public Builder mergeCounter(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter value) {
+      public Builder mergeCounter(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter value) {
         if (counterBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0) &&
             counter_ != null &&
-            counter_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance()) {
+            counter_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance()) {
             getCounterBuilder().mergeFrom(value);
           } else {
             counter_ = value;
@@ -13043,7 +13097,7 @@ public Builder clearCounter() {
       /**
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder getCounterBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder getCounterBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return internalGetCounterFieldBuilder().getBuilder();
@@ -13051,23 +13105,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder getCounterOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder getCounterOrBuilder() {
         if (counterBuilder_ != null) {
           return counterBuilder_.getMessageOrBuilder();
         } else {
           return counter_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.getDefaultInstance() : counter_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.getDefaultInstance() : counter_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Counter counter = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder> 
           internalGetCounterFieldBuilder() {
         if (counterBuilder_ == null) {
           counterBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Counter.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.CounterOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Counter.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.CounterOrBuilder>(
                   getCounter(),
                   getParentForChildren(),
                   isClean());
@@ -13076,9 +13130,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
         return counterBuilder_;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary summary_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary summary_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder> summaryBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder> summaryBuilder_;
       /**
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        * @return Whether the summary field is set.
@@ -13090,9 +13144,9 @@ public boolean hasSummary() {
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        * @return The summary.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary getSummary() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary getSummary() {
         if (summaryBuilder_ == null) {
-          return summary_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance() : summary_;
+          return summary_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance() : summary_;
         } else {
           return summaryBuilder_.getMessage();
         }
@@ -13100,11 +13154,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        */
-      public Builder setSummary(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary value) {
+      public Builder setSummary(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary value) {
         if (summaryBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           summary_ = value;
         } else {
           summaryBuilder_.setMessage(value);
@@ -13117,7 +13169,7 @@ public Builder setSummary(io.prometheus.metrics.expositionformats.generated.com_
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        */
       public Builder setSummary(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder builderForValue) {
         if (summaryBuilder_ == null) {
           summary_ = builderForValue.build();
         } else {
@@ -13130,11 +13182,11 @@ public Builder setSummary(
       /**
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        */
-      public Builder mergeSummary(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary value) {
+      public Builder mergeSummary(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary value) {
         if (summaryBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0) &&
             summary_ != null &&
-            summary_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance()) {
+            summary_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance()) {
             getSummaryBuilder().mergeFrom(value);
           } else {
             summary_ = value;
@@ -13164,7 +13216,7 @@ public Builder clearSummary() {
       /**
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder getSummaryBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder getSummaryBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return internalGetSummaryFieldBuilder().getBuilder();
@@ -13172,23 +13224,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder getSummaryOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder getSummaryOrBuilder() {
         if (summaryBuilder_ != null) {
           return summaryBuilder_.getMessageOrBuilder();
         } else {
           return summary_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.getDefaultInstance() : summary_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.getDefaultInstance() : summary_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Summary summary = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder> 
           internalGetSummaryFieldBuilder() {
         if (summaryBuilder_ == null) {
           summaryBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Summary.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.SummaryOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Summary.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.SummaryOrBuilder>(
                   getSummary(),
                   getParentForChildren(),
                   isClean());
@@ -13197,9 +13249,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
         return summaryBuilder_;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped untyped_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped untyped_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder> untypedBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder> untypedBuilder_;
       /**
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        * @return Whether the untyped field is set.
@@ -13211,9 +13263,9 @@ public boolean hasUntyped() {
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        * @return The untyped.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped getUntyped() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped getUntyped() {
         if (untypedBuilder_ == null) {
-          return untyped_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance() : untyped_;
+          return untyped_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance() : untyped_;
         } else {
           return untypedBuilder_.getMessage();
         }
@@ -13221,11 +13273,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        */
-      public Builder setUntyped(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped value) {
+      public Builder setUntyped(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped value) {
         if (untypedBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           untyped_ = value;
         } else {
           untypedBuilder_.setMessage(value);
@@ -13238,7 +13288,7 @@ public Builder setUntyped(io.prometheus.metrics.expositionformats.generated.com_
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        */
       public Builder setUntyped(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder builderForValue) {
         if (untypedBuilder_ == null) {
           untyped_ = builderForValue.build();
         } else {
@@ -13251,11 +13301,11 @@ public Builder setUntyped(
       /**
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        */
-      public Builder mergeUntyped(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped value) {
+      public Builder mergeUntyped(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped value) {
         if (untypedBuilder_ == null) {
           if (((bitField0_ & 0x00000010) != 0) &&
             untyped_ != null &&
-            untyped_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance()) {
+            untyped_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance()) {
             getUntypedBuilder().mergeFrom(value);
           } else {
             untyped_ = value;
@@ -13285,7 +13335,7 @@ public Builder clearUntyped() {
       /**
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder getUntypedBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder getUntypedBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return internalGetUntypedFieldBuilder().getBuilder();
@@ -13293,23 +13343,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder getUntypedOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder getUntypedOrBuilder() {
         if (untypedBuilder_ != null) {
           return untypedBuilder_.getMessageOrBuilder();
         } else {
           return untyped_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.getDefaultInstance() : untyped_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.getDefaultInstance() : untyped_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Untyped untyped = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder> 
           internalGetUntypedFieldBuilder() {
         if (untypedBuilder_ == null) {
           untypedBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Untyped.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.UntypedOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Untyped.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.UntypedOrBuilder>(
                   getUntyped(),
                   getParentForChildren(),
                   isClean());
@@ -13318,9 +13368,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
         return untypedBuilder_;
       }
 
-      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram histogram_;
+      private io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram histogram_;
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder> histogramBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder> histogramBuilder_;
       /**
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        * @return Whether the histogram field is set.
@@ -13332,9 +13382,9 @@ public boolean hasHistogram() {
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        * @return The histogram.
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram getHistogram() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram getHistogram() {
         if (histogramBuilder_ == null) {
-          return histogram_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance() : histogram_;
+          return histogram_ == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance() : histogram_;
         } else {
           return histogramBuilder_.getMessage();
         }
@@ -13342,11 +13392,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        */
-      public Builder setHistogram(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram value) {
+      public Builder setHistogram(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram value) {
         if (histogramBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           histogram_ = value;
         } else {
           histogramBuilder_.setMessage(value);
@@ -13359,7 +13407,7 @@ public Builder setHistogram(io.prometheus.metrics.expositionformats.generated.co
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        */
       public Builder setHistogram(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder builderForValue) {
         if (histogramBuilder_ == null) {
           histogram_ = builderForValue.build();
         } else {
@@ -13372,11 +13420,11 @@ public Builder setHistogram(
       /**
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        */
-      public Builder mergeHistogram(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram value) {
+      public Builder mergeHistogram(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram value) {
         if (histogramBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0) &&
             histogram_ != null &&
-            histogram_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance()) {
+            histogram_ != io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance()) {
             getHistogramBuilder().mergeFrom(value);
           } else {
             histogram_ = value;
@@ -13406,7 +13454,7 @@ public Builder clearHistogram() {
       /**
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder getHistogramBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder getHistogramBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return internalGetHistogramFieldBuilder().getBuilder();
@@ -13414,23 +13462,23 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder getHistogramOrBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder getHistogramOrBuilder() {
         if (histogramBuilder_ != null) {
           return histogramBuilder_.getMessageOrBuilder();
         } else {
           return histogram_ == null ?
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.getDefaultInstance() : histogram_;
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.getDefaultInstance() : histogram_;
         }
       }
       /**
        * <code>optional .io.prometheus.client.Histogram histogram = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder> 
           internalGetHistogramFieldBuilder() {
         if (histogramBuilder_ == null) {
           histogramBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Histogram.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.HistogramOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Histogram.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.HistogramOrBuilder>(
                   getHistogram(),
                   getParentForChildren(),
                   isClean());
@@ -13483,12 +13531,12 @@ public Builder clearTimestampMs() {
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.Metric)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13524,7 +13572,7 @@ public com.google.protobuf.Parser<Metric> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -13577,17 +13625,17 @@ public interface MetricFamilyOrBuilder extends
      * <code>optional .io.prometheus.client.MetricType type = 3;</code>
      * @return The type.
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType getType();
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType getType();
 
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
-    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric> 
+    java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric> 
         getMetricList();
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric getMetric(int index);
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric getMetric(int index);
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
@@ -13595,12 +13643,12 @@ public interface MetricFamilyOrBuilder extends
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
-    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder> 
+    java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder> 
         getMetricOrBuilderList();
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
-    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder getMetricOrBuilder(
+    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder getMetricOrBuilder(
         int index);
 
     /**
@@ -13632,7 +13680,7 @@ public static final class MetricFamily extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 33,
+        /* minor= */ 36,
         /* patch= */ 0,
         /* suffix= */ "",
         "MetricFamily");
@@ -13651,15 +13699,20 @@ private MetricFamily() {
 
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
     }
 
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_MetricFamily_fieldAccessorTable
+      return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_MetricFamily_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.Builder.class);
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.Builder.class);
     }
 
     private int bitField0_;
@@ -13774,26 +13827,26 @@ public java.lang.String getHelp() {
      * <code>optional .io.prometheus.client.MetricType type = 3;</code>
      * @return The type.
      */
-    @java.lang.Override public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType getType() {
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType result = io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType.forNumber(type_);
-      return result == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType.COUNTER : result;
+    @java.lang.Override public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType getType() {
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType result = io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType.forNumber(type_);
+      return result == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType.COUNTER : result;
     }
 
     public static final int METRIC_FIELD_NUMBER = 4;
     @SuppressWarnings("serial")
-    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric> metric_;
+    private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric> metric_;
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
     @java.lang.Override
-    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric> getMetricList() {
+    public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric> getMetricList() {
       return metric_;
     }
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder> 
+    public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder> 
         getMetricOrBuilderList() {
       return metric_;
     }
@@ -13808,14 +13861,14 @@ public int getMetricCount() {
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric getMetric(int index) {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric getMetric(int index) {
       return metric_.get(index);
     }
     /**
      * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
      */
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder getMetricOrBuilder(
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder getMetricOrBuilder(
         int index) {
       return metric_.get(index);
     }
@@ -13900,13 +13953,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       }
       getUnknownFields().writeTo(output);
     }
-
-    @java.lang.Override
-    public int getSerializedSize() {
-      int size = memoizedSize;
-      if (size != -1) return size;
-
-      size = 0;
+    private int computeSerializedSize_0() {
+      int size = 0;
       if (((bitField0_ & 0x00000001) != 0)) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(1, name_);
       }
@@ -13917,13 +13965,27 @@ public int getSerializedSize() {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(3, type_);
       }
-      for (int i = 0; i < metric_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, metric_.get(i));
-      }
+
+          {
+            final int count = metric_.size();
+            for (int i = 0; i < count; i++) {
+              size += com.google.protobuf.CodedOutputStream
+                .computeMessageSizeNoTag(metric_.get(i));
+            }
+            size += 1 * count;
+          }
       if (((bitField0_ & 0x00000008) != 0)) {
         size += com.google.protobuf.GeneratedMessage.computeStringSize(5, unit_);
       }
+      return size;
+    }
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += computeSerializedSize_0();
       size += getUnknownFields().getSerializedSize();
       memoizedSize = size;
       return size;
@@ -13934,10 +13996,10 @@ public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
        return true;
       }
-      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily)) {
+      if (!(obj instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily)) {
         return super.equals(obj);
       }
-      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily) obj;
+      io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily other = (io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily) obj;
 
       if (hasName() != other.hasName()) return false;
       if (hasName()) {
@@ -13996,44 +14058,44 @@ public int hashCode() {
       return hash;
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         java.nio.ByteBuffer data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         java.nio.ByteBuffer data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(byte[] data)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14041,26 +14103,26 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseDelimitedFrom(java.io.InputStream input)
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseDelimitedFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily parseFrom(
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14073,7 +14135,7 @@ public static io.prometheus.metrics.expositionformats.generated.com_google_proto
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
     }
-    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily prototype) {
+    public static Builder newBuilder(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
     @java.lang.Override
@@ -14094,21 +14156,21 @@ protected Builder newBuilderForType(
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:io.prometheus.client.MetricFamily)
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamilyOrBuilder {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamilyOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
       }
 
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_MetricFamily_fieldAccessorTable
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_MetricFamily_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.Builder.class);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.class, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.Builder.class);
       }
 
-      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.newBuilder()
+      // Construct using io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.newBuilder()
       private Builder() {
 
       }
@@ -14139,17 +14201,17 @@ public Builder clear() {
       @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.internal_static_io_prometheus_client_MetricFamily_descriptor;
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily getDefaultInstanceForType() {
-        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.getDefaultInstance();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily getDefaultInstanceForType() {
+        return io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.getDefaultInstance();
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily build() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily result = buildPartial();
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily build() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
@@ -14157,15 +14219,15 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       }
 
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily buildPartial() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily(this);
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily buildPartial() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily result = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily(this);
         buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily result) {
+      private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily result) {
         if (metricBuilder_ == null) {
           if (((bitField0_ & 0x00000008) != 0)) {
             metric_ = java.util.Collections.unmodifiableList(metric_);
@@ -14177,7 +14239,7 @@ private void buildPartialRepeatedFields(io.prometheus.metrics.expositionformats.
         }
       }
 
-      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily result) {
+      private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily result) {
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -14201,16 +14263,16 @@ private void buildPartial0(io.prometheus.metrics.expositionformats.generated.com
 
       @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily) {
-          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily)other);
+        if (other instanceof io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily) {
+          return mergeFrom((io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily other) {
-        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily other) {
+        if (other == io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily.getDefaultInstance()) return this;
         if (other.hasName()) {
           name_ = other.name_;
           bitField0_ |= 0x00000001;
@@ -14270,9 +14332,7 @@ public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
+        java.util.Objects.requireNonNull(extensionRegistry);
         try {
           boolean done = false;
           while (!done) {
@@ -14293,8 +14353,8 @@ public Builder mergeFrom(
               } // case 18
               case 24: {
                 int tmpRaw = input.readEnum();
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType tmpValue =
-                    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType.forNumber(tmpRaw);
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType tmpValue =
+                    io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType.forNumber(tmpRaw);
                 if (tmpValue == null) {
                   mergeUnknownVarintField(3, tmpRaw);
                 } else {
@@ -14304,9 +14364,9 @@ public Builder mergeFrom(
                 break;
               } // case 24
               case 34: {
-                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric m =
+                io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric m =
                     input.readMessage(
-                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.parser(),
+                        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.parser(),
                         extensionRegistry);
                 if (metricBuilder_ == null) {
                   ensureMetricIsMutable();
@@ -14388,7 +14448,7 @@ public java.lang.String getName() {
        */
       public Builder setName(
           java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         name_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -14411,7 +14471,7 @@ public Builder clearName() {
        */
       public Builder setNameBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         name_ = value;
         bitField0_ |= 0x00000001;
         onChanged();
@@ -14468,7 +14528,7 @@ public java.lang.String getHelp() {
        */
       public Builder setHelp(
           java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         help_ = value;
         bitField0_ |= 0x00000002;
         onChanged();
@@ -14491,7 +14551,7 @@ public Builder clearHelp() {
        */
       public Builder setHelpBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         help_ = value;
         bitField0_ |= 0x00000002;
         onChanged();
@@ -14511,17 +14571,17 @@ public Builder setHelpBytes(
        * @return The type.
        */
       @java.lang.Override
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType getType() {
-        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType result = io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType.forNumber(type_);
-        return result == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType.COUNTER : result;
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType getType() {
+        io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType result = io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType.forNumber(type_);
+        return result == null ? io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType.COUNTER : result;
       }
       /**
        * <code>optional .io.prometheus.client.MetricType type = 3;</code>
        * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder setType(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricType value) {
-        if (value == null) { throw new NullPointerException(); }
+      public Builder setType(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricType value) {
+        java.util.Objects.requireNonNull(value);
         bitField0_ |= 0x00000004;
         type_ = value.getNumber();
         onChanged();
@@ -14538,22 +14598,22 @@ public Builder clearType() {
         return this;
       }
 
-      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric> metric_ =
+      private java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric> metric_ =
         java.util.Collections.emptyList();
       private void ensureMetricIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          metric_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric>(metric_);
+          metric_ = new java.util.ArrayList<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric>(metric_);
           bitField0_ |= 0x00000008;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder> metricBuilder_;
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder> metricBuilder_;
 
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric> getMetricList() {
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric> getMetricList() {
         if (metricBuilder_ == null) {
           return java.util.Collections.unmodifiableList(metric_);
         } else {
@@ -14573,7 +14633,7 @@ public int getMetricCount() {
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric getMetric(int index) {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric getMetric(int index) {
         if (metricBuilder_ == null) {
           return metric_.get(index);
         } else {
@@ -14584,11 +14644,9 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
       public Builder setMetric(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric value) {
         if (metricBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureMetricIsMutable();
           metric_.set(index, value);
           onChanged();
@@ -14601,7 +14659,7 @@ public Builder setMetric(
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
       public Builder setMetric(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder builderForValue) {
         if (metricBuilder_ == null) {
           ensureMetricIsMutable();
           metric_.set(index, builderForValue.build());
@@ -14614,11 +14672,9 @@ public Builder setMetric(
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public Builder addMetric(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric value) {
+      public Builder addMetric(io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric value) {
         if (metricBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureMetricIsMutable();
           metric_.add(value);
           onChanged();
@@ -14631,11 +14687,9 @@ public Builder addMetric(io.prometheus.metrics.expositionformats.generated.com_g
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
       public Builder addMetric(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric value) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric value) {
         if (metricBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          java.util.Objects.requireNonNull(value);
           ensureMetricIsMutable();
           metric_.add(index, value);
           onChanged();
@@ -14648,7 +14702,7 @@ public Builder addMetric(
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
       public Builder addMetric(
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder builderForValue) {
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder builderForValue) {
         if (metricBuilder_ == null) {
           ensureMetricIsMutable();
           metric_.add(builderForValue.build());
@@ -14662,7 +14716,7 @@ public Builder addMetric(
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
       public Builder addMetric(
-          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder builderForValue) {
+          int index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder builderForValue) {
         if (metricBuilder_ == null) {
           ensureMetricIsMutable();
           metric_.add(index, builderForValue.build());
@@ -14676,7 +14730,7 @@ public Builder addMetric(
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
       public Builder addAllMetric(
-          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric> values) {
+          java.lang.Iterable<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric> values) {
         if (metricBuilder_ == null) {
           ensureMetricIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -14716,14 +14770,14 @@ public Builder removeMetric(int index) {
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder getMetricBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder getMetricBuilder(
           int index) {
         return internalGetMetricFieldBuilder().getBuilder(index);
       }
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder getMetricOrBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder getMetricOrBuilder(
           int index) {
         if (metricBuilder_ == null) {
           return metric_.get(index);  } else {
@@ -14733,7 +14787,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder> 
+      public java.util.List<? extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder> 
            getMetricOrBuilderList() {
         if (metricBuilder_ != null) {
           return metricBuilder_.getMessageOrBuilderList();
@@ -14744,31 +14798,31 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder addMetricBuilder() {
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder addMetricBuilder() {
         return internalGetMetricFieldBuilder().addBuilder(
-            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.getDefaultInstance());
+            io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder addMetricBuilder(
+      public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder addMetricBuilder(
           int index) {
         return internalGetMetricFieldBuilder().addBuilder(
-            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.getDefaultInstance());
+            index, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.getDefaultInstance());
       }
       /**
        * <code>repeated .io.prometheus.client.Metric metric = 4;</code>
        */
-      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder> 
+      public java.util.List<io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder> 
            getMetricBuilderList() {
         return internalGetMetricFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder> 
+          io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder> 
           internalGetMetricFieldBuilder() {
         if (metricBuilder_ == null) {
           metricBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.Metric.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricOrBuilder>(
+              io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.Metric.Builder, io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricOrBuilder>(
                   metric_,
                   ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
@@ -14828,7 +14882,7 @@ public java.lang.String getUnit() {
        */
       public Builder setUnit(
           java.lang.String value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         unit_ = value;
         bitField0_ |= 0x00000010;
         onChanged();
@@ -14851,7 +14905,7 @@ public Builder clearUnit() {
        */
       public Builder setUnitBytes(
           com.google.protobuf.ByteString value) {
-        if (value == null) { throw new NullPointerException(); }
+        java.util.Objects.requireNonNull(value);
         unit_ = value;
         bitField0_ |= 0x00000010;
         onChanged();
@@ -14862,12 +14916,12 @@ public Builder setUnitBytes(
     }
 
     // @@protoc_insertion_point(class_scope:io.prometheus.client.MetricFamily)
-    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily DEFAULT_INSTANCE;
+    private static final io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily DEFAULT_INSTANCE;
     static {
-      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily();
+      DEFAULT_INSTANCE = new io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily();
     }
 
-    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily getDefaultInstance() {
+    public static io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily getDefaultInstance() {
       return DEFAULT_INSTANCE;
     }
 
@@ -14903,7 +14957,7 @@ public com.google.protobuf.Parser<MetricFamily> getParserForType() {
     }
 
     @java.lang.Override
-    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics.MetricFamily getDefaultInstanceForType() {
+    public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics.MetricFamily getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
 
@@ -14974,7 +15028,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       getDescriptor() {
     return descriptor;
   }
-  private static  com.google.protobuf.Descriptors.FileDescriptor
+  private static final com.google.protobuf.Descriptors.FileDescriptor
       descriptor;
   static {
     java.lang.String[] descriptorData = {
@@ -15028,7 +15082,7 @@ public io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_3
       "\002\022\013\n\007UNTYPED\020\003\022\r\n\tHISTOGRAM\020\004\022\023\n\017GAUGE_H" +
       "ISTOGRAM\020\005B\212\001\nLio.prometheus.metrics.exp" +
       "ositionformats.generated.com_google_prot" +
-      "obuf_4_33_0Z:github.com/prometheus/clien" +
+      "obuf_4_36_0Z:github.com/prometheus/clien" +
       "t_model/go;io_prometheus_client"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/generated/Metrics.java b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/generated/Metrics.java
new file mode 100644
index 000000000..efa3be908
--- /dev/null
+++ b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/generated/Metrics.java
@@ -0,0 +1,6 @@
+package io.prometheus.metrics.expositionformats.generated;
+
+public final class Metrics
+    extends io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_36_0.Metrics {
+  private Metrics() {}
+}
diff --git a/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufDebugFormat.java b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufDebugFormat.java
new file mode 100644
index 000000000..27056f93c
--- /dev/null
+++ b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufDebugFormat.java
@@ -0,0 +1,301 @@
+package io.prometheus.metrics.expositionformats.internal;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.TextFormat;
+import com.google.protobuf.Timestamp;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
+
+@SuppressWarnings("NonCanonicalType")
+class PrometheusProtobufDebugFormat {
+
+  private static final String INDENT = "  ";
+
+  static String toDebugString(Metrics.MetricFamily metricFamily) {
+    StringBuilder result = new StringBuilder();
+    appendMetricFamily(result, "", metricFamily);
+    return result.toString();
+  }
+
+  private static void appendMetricFamily(
+      StringBuilder result, String indent, Metrics.MetricFamily metricFamily) {
+    appendString(result, indent, "name", metricFamily.hasName(), metricFamily.getName());
+    appendString(result, indent, "help", metricFamily.hasHelp(), metricFamily.getHelp());
+    if (metricFamily.hasType()) {
+      appendScalar(result, indent, "type", metricFamily.getType().name());
+    }
+    for (Metrics.Metric metric : metricFamily.getMetricList()) {
+      appendMessage(result, indent, "metric", () -> appendMetric(result, indent + INDENT, metric));
+    }
+    appendString(result, indent, "unit", metricFamily.hasUnit(), metricFamily.getUnit());
+  }
+
+  private static void appendMetric(StringBuilder result, String indent, Metrics.Metric metric) {
+    for (Metrics.LabelPair label : metric.getLabelList()) {
+      appendMessage(result, indent, "label", () -> appendLabel(result, indent + INDENT, label));
+    }
+    if (metric.hasGauge()) {
+      appendMessage(
+          result, indent, "gauge", () -> appendGauge(result, indent + INDENT, metric.getGauge()));
+    }
+    if (metric.hasCounter()) {
+      appendMessage(
+          result,
+          indent,
+          "counter",
+          () -> appendCounter(result, indent + INDENT, metric.getCounter()));
+    }
+    if (metric.hasSummary()) {
+      appendMessage(
+          result,
+          indent,
+          "summary",
+          () -> appendSummary(result, indent + INDENT, metric.getSummary()));
+    }
+    if (metric.hasUntyped()) {
+      appendMessage(
+          result,
+          indent,
+          "untyped",
+          () -> appendUntyped(result, indent + INDENT, metric.getUntyped()));
+    }
+    appendScalar(result, indent, "timestamp_ms", metric.hasTimestampMs(), metric.getTimestampMs());
+    if (metric.hasHistogram()) {
+      appendMessage(
+          result,
+          indent,
+          "histogram",
+          () -> appendHistogram(result, indent + INDENT, metric.getHistogram()));
+    }
+  }
+
+  private static void appendLabel(StringBuilder result, String indent, Metrics.LabelPair label) {
+    appendString(result, indent, "name", label.hasName(), label.getName());
+    appendString(result, indent, "value", label.hasValue(), label.getValue());
+  }
+
+  private static void appendGauge(StringBuilder result, String indent, Metrics.Gauge gauge) {
+    appendScalar(result, indent, "value", gauge.hasValue(), gauge.getValue());
+  }
+
+  private static void appendCounter(StringBuilder result, String indent, Metrics.Counter counter) {
+    appendScalar(result, indent, "value", counter.hasValue(), counter.getValue());
+    if (counter.hasExemplar()) {
+      appendMessage(
+          result,
+          indent,
+          "exemplar",
+          () -> appendExemplar(result, indent + INDENT, counter.getExemplar()));
+    }
+    appendTimestamp(
+        result,
+        indent,
+        "created_timestamp",
+        counter.hasCreatedTimestamp(),
+        counter.getCreatedTimestamp());
+  }
+
+  private static void appendSummary(StringBuilder result, String indent, Metrics.Summary summary) {
+    appendScalar(
+        result, indent, "sample_count", summary.hasSampleCount(), summary.getSampleCount());
+    appendScalar(result, indent, "sample_sum", summary.hasSampleSum(), summary.getSampleSum());
+    for (Metrics.Quantile quantile : summary.getQuantileList()) {
+      appendMessage(
+          result, indent, "quantile", () -> appendQuantile(result, indent + INDENT, quantile));
+    }
+    appendTimestamp(
+        result,
+        indent,
+        "created_timestamp",
+        summary.hasCreatedTimestamp(),
+        summary.getCreatedTimestamp());
+  }
+
+  private static void appendQuantile(
+      StringBuilder result, String indent, Metrics.Quantile quantile) {
+    appendScalar(result, indent, "quantile", quantile.hasQuantile(), quantile.getQuantile());
+    appendScalar(result, indent, "value", quantile.hasValue(), quantile.getValue());
+  }
+
+  private static void appendUntyped(StringBuilder result, String indent, Metrics.Untyped untyped) {
+    appendScalar(result, indent, "value", untyped.hasValue(), untyped.getValue());
+  }
+
+  private static void appendHistogram(
+      StringBuilder result, String indent, Metrics.Histogram histogram) {
+    appendScalar(
+        result, indent, "sample_count", histogram.hasSampleCount(), histogram.getSampleCount());
+    appendScalar(result, indent, "sample_sum", histogram.hasSampleSum(), histogram.getSampleSum());
+    for (Metrics.Bucket bucket : histogram.getBucketList()) {
+      appendMessage(result, indent, "bucket", () -> appendBucket(result, indent + INDENT, bucket));
+    }
+    appendScalar(
+        result,
+        indent,
+        "sample_count_float",
+        histogram.hasSampleCountFloat(),
+        histogram.getSampleCountFloat());
+    appendScalar(result, indent, "schema", histogram.hasSchema(), histogram.getSchema());
+    appendScalar(
+        result,
+        indent,
+        "zero_threshold",
+        histogram.hasZeroThreshold(),
+        histogram.getZeroThreshold());
+    appendScalar(result, indent, "zero_count", histogram.hasZeroCount(), histogram.getZeroCount());
+    appendScalar(
+        result,
+        indent,
+        "zero_count_float",
+        histogram.hasZeroCountFloat(),
+        histogram.getZeroCountFloat());
+    for (Metrics.BucketSpan span : histogram.getNegativeSpanList()) {
+      appendMessage(
+          result, indent, "negative_span", () -> appendBucketSpan(result, indent + INDENT, span));
+    }
+    for (int i = 0; i < histogram.getNegativeDeltaCount(); i++) {
+      appendScalar(result, indent, "negative_delta", histogram.getNegativeDelta(i));
+    }
+    for (int i = 0; i < histogram.getNegativeCountCount(); i++) {
+      appendScalar(result, indent, "negative_count", histogram.getNegativeCount(i));
+    }
+    for (Metrics.BucketSpan span : histogram.getPositiveSpanList()) {
+      appendMessage(
+          result, indent, "positive_span", () -> appendBucketSpan(result, indent + INDENT, span));
+    }
+    for (int i = 0; i < histogram.getPositiveDeltaCount(); i++) {
+      appendScalar(result, indent, "positive_delta", histogram.getPositiveDelta(i));
+    }
+    for (int i = 0; i < histogram.getPositiveCountCount(); i++) {
+      appendScalar(result, indent, "positive_count", histogram.getPositiveCount(i));
+    }
+    appendTimestamp(
+        result,
+        indent,
+        "created_timestamp",
+        histogram.hasCreatedTimestamp(),
+        histogram.getCreatedTimestamp());
+    for (Metrics.Exemplar exemplar : histogram.getExemplarsList()) {
+      appendMessage(
+          result, indent, "exemplars", () -> appendExemplar(result, indent + INDENT, exemplar));
+    }
+  }
+
+  private static void appendBucket(StringBuilder result, String indent, Metrics.Bucket bucket) {
+    appendScalar(
+        result,
+        indent,
+        "cumulative_count",
+        bucket.hasCumulativeCount(),
+        bucket.getCumulativeCount());
+    appendScalar(result, indent, "upper_bound", bucket.hasUpperBound(), bucket.getUpperBound());
+    if (bucket.hasExemplar()) {
+      appendMessage(
+          result,
+          indent,
+          "exemplar",
+          () -> appendExemplar(result, indent + INDENT, bucket.getExemplar()));
+    }
+    appendScalar(
+        result,
+        indent,
+        "cumulative_count_float",
+        bucket.hasCumulativeCountFloat(),
+        bucket.getCumulativeCountFloat());
+  }
+
+  private static void appendBucketSpan(
+      StringBuilder result, String indent, Metrics.BucketSpan span) {
+    appendScalar(result, indent, "offset", span.hasOffset(), span.getOffset());
+    appendScalar(result, indent, "length", span.hasLength(), span.getLength());
+  }
+
+  private static void appendExemplar(
+      StringBuilder result, String indent, Metrics.Exemplar exemplar) {
+    for (Metrics.LabelPair label : exemplar.getLabelList()) {
+      appendMessage(result, indent, "label", () -> appendLabel(result, indent + INDENT, label));
+    }
+    appendScalar(result, indent, "value", exemplar.hasValue(), exemplar.getValue());
+    appendTimestamp(result, indent, "timestamp", exemplar.hasTimestamp(), exemplar.getTimestamp());
+  }
+
+  private static void appendTimestamp(
+      StringBuilder result, String indent, String fieldName, boolean present, Timestamp timestamp) {
+    if (present) {
+      appendMessage(
+          result,
+          indent,
+          fieldName,
+          () -> {
+            appendScalar(result, indent + INDENT, "seconds", timestamp.getSeconds());
+            appendScalar(result, indent + INDENT, "nanos", timestamp.getNanos());
+          });
+    }
+  }
+
+  private static void appendString(
+      StringBuilder result, String indent, String fieldName, boolean present, String value) {
+    if (present) {
+      appendScalar(result, indent, fieldName, quote(value));
+    }
+  }
+
+  private static void appendScalar(
+      StringBuilder result, String indent, String fieldName, boolean present, double value) {
+    if (present) {
+      appendScalar(result, indent, fieldName, formatDouble(value));
+    }
+  }
+
+  private static void appendScalar(
+      StringBuilder result, String indent, String fieldName, boolean present, long value) {
+    if (present) {
+      appendScalar(result, indent, fieldName, Long.toString(value));
+    }
+  }
+
+  private static void appendScalar(
+      StringBuilder result, String indent, String fieldName, boolean present, int value) {
+    if (present) {
+      appendScalar(result, indent, fieldName, Integer.toString(value));
+    }
+  }
+
+  private static void appendScalar(
+      StringBuilder result, String indent, String fieldName, double value) {
+    appendScalar(result, indent, fieldName, formatDouble(value));
+  }
+
+  private static void appendScalar(
+      StringBuilder result, String indent, String fieldName, long value) {
+    appendScalar(result, indent, fieldName, Long.toString(value));
+  }
+
+  private static void appendScalar(
+      StringBuilder result, String indent, String fieldName, String value) {
+    result.append(indent).append(fieldName).append(": ").append(value).append('\n');
+  }
+
+  private static void appendMessage(
+      StringBuilder result, String indent, String fieldName, Runnable appendBody) {
+    result.append(indent).append(fieldName).append(" {\n");
+    appendBody.run();
+    result.append(indent).append("}\n");
+  }
+
+  private static String quote(String value) {
+    return "\"" + TextFormat.escapeBytes(ByteString.copyFromUtf8(value)) + "\"";
+  }
+
+  private static String formatDouble(double value) {
+    if (Double.isNaN(value)) {
+      return "nan";
+    }
+    if (value == Double.POSITIVE_INFINITY) {
+      return "inf";
+    }
+    if (value == Double.NEGATIVE_INFINITY) {
+      return "-inf";
+    }
+    return Double.toString(value);
+  }
+}
diff --git a/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java
index 3cc3421bf..734dc5b1d 100644
--- a/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java
+++ b/prometheus-metrics-exposition-formats/src/main/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufWriterImpl.java
@@ -3,10 +3,10 @@
 import static io.prometheus.metrics.expositionformats.internal.ProtobufUtil.timestampFromMillis;
 import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
 
-import com.google.protobuf.TextFormat;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.expositionformats.ExpositionFormatWriter;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.TextFormatUtil;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;
@@ -29,6 +29,7 @@
 import java.io.OutputStream;
 import javax.annotation.Nullable;
 
+@SuppressWarnings("NonCanonicalType")
 public class PrometheusProtobufWriterImpl implements ExpositionFormatWriter {
 
   @Override
@@ -43,11 +44,14 @@ public String getContentType() {
 
   @Override
   public String toDebugString(MetricSnapshots metricSnapshots, EscapingScheme escapingScheme) {
+    MetricSnapshots merged = TextFormatUtil.mergeDuplicates(metricSnapshots);
     StringBuilder stringBuilder = new StringBuilder();
-    for (MetricSnapshot s : metricSnapshots) {
+    for (MetricSnapshot s : merged) {
       MetricSnapshot snapshot = SnapshotEscaper.escapeMetricSnapshot(s, escapingScheme);
       if (!snapshot.getDataPoints().isEmpty()) {
-        stringBuilder.append(TextFormat.printer().printToString(convert(snapshot, escapingScheme)));
+        stringBuilder.append(
+            PrometheusProtobufDebugFormat.toDebugString(
+                convert(snapshot, s.getMetadata().getOriginalName(), escapingScheme)));
       }
     }
     return stringBuilder.toString();
@@ -57,15 +61,21 @@ public String toDebugString(MetricSnapshots metricSnapshots, EscapingScheme esca
   public void write(
       OutputStream out, MetricSnapshots metricSnapshots, EscapingScheme escapingScheme)
       throws IOException {
-    for (MetricSnapshot s : metricSnapshots) {
+    MetricSnapshots merged = TextFormatUtil.mergeDuplicates(metricSnapshots);
+    for (MetricSnapshot s : merged) {
       MetricSnapshot snapshot = SnapshotEscaper.escapeMetricSnapshot(s, escapingScheme);
       if (!snapshot.getDataPoints().isEmpty()) {
-        convert(snapshot, escapingScheme).writeDelimitedTo(out);
+        convert(snapshot, s.getMetadata().getOriginalName(), escapingScheme).writeDelimitedTo(out);
       }
     }
   }
 
   public Metrics.MetricFamily convert(MetricSnapshot snapshot, EscapingScheme scheme) {
+    return convert(snapshot, snapshot.getMetadata().getOriginalName(), scheme);
+  }
+
+  private Metrics.MetricFamily convert(
+      MetricSnapshot snapshot, String rawOriginalName, EscapingScheme scheme) {
     Metrics.MetricFamily.Builder builder = Metrics.MetricFamily.newBuilder();
     if (snapshot instanceof CounterSnapshot) {
       for (CounterDataPointSnapshot data : ((CounterSnapshot) snapshot).getDataPoints()) {
@@ -78,7 +88,13 @@ public Metrics.MetricFamily convert(MetricSnapshot snapshot, EscapingScheme sche
         builder.addMetric(convert(data, scheme));
       }
       setMetadataUnlessEmpty(
-          builder, snapshot.getMetadata(), null, Metrics.MetricType.GAUGE, scheme);
+          builder,
+          snapshot.getMetadata(),
+          rawOriginalName,
+          null,
+          Metrics.MetricType.GAUGE,
+          scheme,
+          true);
     } else if (snapshot instanceof HistogramSnapshot) {
       HistogramSnapshot histogram = (HistogramSnapshot) snapshot;
       for (HistogramSnapshot.HistogramDataPointSnapshot data : histogram.getDataPoints()) {
@@ -286,20 +302,49 @@ private void setMetadataUnlessEmpty(
       @Nullable String nameSuffix,
       Metrics.MetricType type,
       EscapingScheme scheme) {
+    setMetadataUnlessEmpty(
+        builder, metadata, metadata.getOriginalName(), nameSuffix, type, scheme, false);
+  }
+
+  private void setMetadataUnlessEmpty(
+      Metrics.MetricFamily.Builder builder,
+      MetricMetadata metadata,
+      String rawOriginalName,
+      @Nullable String nameSuffix,
+      Metrics.MetricType type,
+      EscapingScheme scheme,
+      boolean normalizeLegacyGaugeName) {
     if (builder.getMetricCount() == 0) {
       return;
     }
-    if (nameSuffix == null) {
-      builder.setName(SnapshotEscaper.getMetadataName(metadata, scheme));
-    } else {
-      builder.setName(SnapshotEscaper.getMetadataName(metadata, scheme) + nameSuffix);
-    }
+    builder.setName(
+        resolveMetricFamilyName(
+            metadata, rawOriginalName, nameSuffix, scheme, normalizeLegacyGaugeName));
     if (metadata.getHelp() != null) {
       builder.setHelp(metadata.getHelp());
     }
     builder.setType(type);
   }
 
+  private String resolveMetricFamilyName(
+      MetricMetadata metadata,
+      String rawOriginalName,
+      @Nullable String nameSuffix,
+      EscapingScheme scheme,
+      boolean normalizeLegacyGaugeName) {
+    if (normalizeLegacyGaugeName) {
+      return SnapshotEscaper.getLegacyGaugeName(metadata, rawOriginalName, scheme);
+    }
+    if (nameSuffix == null) {
+      return SnapshotEscaper.getMetadataName(metadata, scheme);
+    }
+    String expositionBaseName = SnapshotEscaper.getExpositionBaseMetadataName(metadata, scheme);
+    if (expositionBaseName.endsWith(nameSuffix)) {
+      return expositionBaseName;
+    }
+    return SnapshotEscaper.getMetadataName(metadata, scheme) + nameSuffix;
+  }
+
   private long getNativeCount(HistogramSnapshot.HistogramDataPointSnapshot data) {
     if (data.hasCount()) {
       return data.getCount();
diff --git a/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesProtobufTest.java b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesProtobufTest.java
new file mode 100644
index 000000000..1ae7e3179
--- /dev/null
+++ b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesProtobufTest.java
@@ -0,0 +1,348 @@
+package io.prometheus.metrics.expositionformats;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
+import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
+import io.prometheus.metrics.model.registry.Collector;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+@SuppressWarnings({"NonCanonicalType", "deprecation"})
+class DuplicateNamesProtobufTest {
+
+  private static PrometheusRegistry getPrometheusRegistry() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                        .value(100)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/hello", "outcome", "FAILURE", "error", "TIMEOUT"))
+                        .value(10)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+    return registry;
+  }
+
+  @Test
+  void testDuplicateNames_differentLabels_producesSingleMetricFamily() throws IOException {
+    PrometheusRegistry registry = getPrometheusRegistry();
+
+    MetricSnapshots snapshots = registry.scrape();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    writer.write(out, snapshots, EscapingScheme.UNDERSCORE_ESCAPING);
+
+    List<Metrics.MetricFamily> metricFamilies = parseProtobufOutput(out);
+
+    assertThat(metricFamilies).hasSize(1);
+    Metrics.MetricFamily family = metricFamilies.get(0);
+    assertThat(family.getName()).isEqualTo("api_responses_total");
+    assertThat(family.getHelp()).isEqualTo("API responses");
+    assertThat(family.getType()).isEqualTo(Metrics.MetricType.COUNTER);
+    assertThat(family.getMetricCount()).isEqualTo(2);
+
+    Metrics.Metric successMetric =
+        family.getMetricList().stream()
+            .filter(
+                m ->
+                    m.getLabelList().stream()
+                        .anyMatch(
+                            l -> l.getName().equals("outcome") && l.getValue().equals("SUCCESS")))
+            .findFirst()
+            .orElseThrow(() -> new AssertionError("SUCCESS metric not found"));
+    assertThat(successMetric.getCounter().getValue()).isEqualTo(100.0);
+
+    Metrics.Metric failureMetric =
+        family.getMetricList().stream()
+            .filter(
+                m ->
+                    m.getLabelList().stream()
+                            .anyMatch(
+                                l ->
+                                    l.getName().equals("outcome") && l.getValue().equals("FAILURE"))
+                        && m.getLabelList().stream()
+                            .anyMatch(
+                                l -> l.getName().equals("error") && l.getValue().equals("TIMEOUT")))
+            .findFirst()
+            .orElseThrow(() -> new AssertionError("FAILURE metric not found"));
+    assertThat(failureMetric.getCounter().getValue()).isEqualTo(10.0);
+  }
+
+  @Test
+  void testDuplicateNames_multipleDataPoints_producesSingleMetricFamily() throws IOException {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                        .value(100)
+                        .build())
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/world", "outcome", "SUCCESS"))
+                        .value(200)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/hello", "outcome", "FAILURE", "error", "TIMEOUT"))
+                        .value(10)
+                        .build())
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/world", "outcome", "FAILURE", "error", "NOT_FOUND"))
+                        .value(5)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    MetricSnapshots snapshots = registry.scrape();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    writer.write(out, snapshots, EscapingScheme.UNDERSCORE_ESCAPING);
+
+    List<Metrics.MetricFamily> metricFamilies = parseProtobufOutput(out);
+
+    assertThat(metricFamilies).hasSize(1);
+    Metrics.MetricFamily family = metricFamilies.get(0);
+    assertThat(family.getName()).isEqualTo("api_responses_total");
+    assertThat(family.getMetricCount()).isEqualTo(4);
+
+    long successCount =
+        family.getMetricList().stream()
+            .filter(
+                m ->
+                    m.getLabelList().stream()
+                        .anyMatch(
+                            l -> l.getName().equals("outcome") && l.getValue().equals("SUCCESS")))
+            .count();
+
+    long failureCount =
+        family.getMetricList().stream()
+            .filter(
+                m ->
+                    m.getLabelList().stream()
+                        .anyMatch(
+                            l -> l.getName().equals("outcome") && l.getValue().equals("FAILURE")))
+            .count();
+
+    assertThat(successCount).isEqualTo(2);
+    assertThat(failureCount).isEqualTo(2);
+  }
+
+  @Test
+  void testDifferentMetrics_producesSeparateMetricFamilies() throws IOException {
+    MetricSnapshots snapshots = getMetricSnapshots();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    writer.write(out, snapshots, EscapingScheme.UNDERSCORE_ESCAPING);
+
+    List<Metrics.MetricFamily> metricFamilies = parseProtobufOutput(out);
+
+    assertThat(metricFamilies).hasSize(2);
+
+    Metrics.MetricFamily counterFamily = null;
+    Metrics.MetricFamily gaugeFamily = null;
+    for (Metrics.MetricFamily family : metricFamilies) {
+      if (family.getName().equals("http_requests_total")) {
+        counterFamily = family;
+      } else if (family.getName().equals("active_sessions")) {
+        gaugeFamily = family;
+      }
+    }
+
+    assertThat(counterFamily).isNotNull();
+    assertThat(counterFamily.getType()).isEqualTo(Metrics.MetricType.COUNTER);
+    assertThat(counterFamily.getMetricCount()).isEqualTo(1);
+    assertThat(counterFamily.getMetric(0).getCounter().getValue()).isEqualTo(100.0);
+
+    assertThat(gaugeFamily).isNotNull();
+    assertThat(gaugeFamily.getType()).isEqualTo(Metrics.MetricType.GAUGE);
+    assertThat(gaugeFamily.getMetricCount()).isEqualTo(1);
+    assertThat(gaugeFamily.getMetric(0).getGauge().getValue()).isEqualTo(50.0);
+  }
+
+  @Test
+  void testLegacyGaugeNameWithAlternateEscapingSchemes_usesBaseName() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            GaugeSnapshot.builder()
+                .name("legacy.name.total")
+                .dataPoint(GaugeSnapshot.GaugeDataPointSnapshot.builder().value(7).build())
+                .build());
+
+    assertThat(getSingleMetricFamilyName(snapshots, EscapingScheme.DOTS_ESCAPING))
+        .isEqualTo("legacy_dot_name");
+    assertThat(getSingleMetricFamilyName(snapshots, EscapingScheme.VALUE_ENCODING_ESCAPING))
+        .isEqualTo("U__legacy_2e_name");
+  }
+
+  @Test
+  void testLegacyGaugeNameWithDotTotal_usesBaseName() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            GaugeSnapshot.builder()
+                .name("legacy.total")
+                .dataPoint(GaugeSnapshot.GaugeDataPointSnapshot.builder().value(7).build())
+                .build());
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    writer.write(out, snapshots, EscapingScheme.UNDERSCORE_ESCAPING);
+
+    List<Metrics.MetricFamily> metricFamilies = parseProtobufOutput(out);
+
+    assertThat(metricFamilies).hasSize(1);
+    Metrics.MetricFamily family = metricFamilies.get(0);
+    assertThat(family.getName()).isEqualTo("legacy");
+    assertThat(family.getType()).isEqualTo(Metrics.MetricType.GAUGE);
+    assertThat(family.getMetricCount()).isEqualTo(1);
+    assertThat(family.getMetric(0).getGauge().getValue()).isEqualTo(7.0);
+  }
+
+  private static String getSingleMetricFamilyName(
+      MetricSnapshots snapshots, EscapingScheme escapingScheme) throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    writer.write(out, snapshots, escapingScheme);
+    List<Metrics.MetricFamily> metricFamilies = parseProtobufOutput(out);
+    assertThat(metricFamilies).hasSize(1);
+    return metricFamilies.get(0).getName();
+  }
+
+  private static MetricSnapshots getMetricSnapshots() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("http_requests")
+                .help("HTTP Request counter")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("method", "GET"))
+                        .value(100)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "http_requests";
+          }
+        });
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder()
+                .name("active_sessions")
+                .help("Active sessions gauge")
+                .dataPoint(
+                    GaugeSnapshot.GaugeDataPointSnapshot.builder()
+                        .labels(Labels.of("region", "us-east-1"))
+                        .value(50)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "active_sessions";
+          }
+        });
+
+    return registry.scrape();
+  }
+
+  private static List<Metrics.MetricFamily> parseProtobufOutput(ByteArrayOutputStream out)
+      throws IOException {
+    List<Metrics.MetricFamily> metricFamilies = new ArrayList<>();
+    try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
+      Metrics.MetricFamily family;
+      while ((family = Metrics.MetricFamily.parseDelimitedFrom(in)) != null) {
+        metricFamilies.add(family);
+      }
+    }
+    return metricFamilies;
+  }
+}
diff --git a/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java
index b478570b7..0a3dc3f69 100644
--- a/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java
+++ b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/ProtobufExpositionFormatsTest.java
@@ -2,12 +2,18 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.protobuf.TextFormat;
 import io.prometheus.metrics.config.EscapingScheme;
-import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_0.Metrics;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
 import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
 import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
+import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("NonCanonicalType")
 class ProtobufExpositionFormatsTest extends ExpositionFormatsTest {
 
   @Override
@@ -18,4 +24,30 @@ protected void assertPrometheusProtobuf(String expected, MetricSnapshot snapshot
     String actual = ProtobufUtil.shortDebugString(protobufData);
     assertThat(actual).isEqualTo(expected);
   }
+
+  @Test
+  void testNativeHistogramDebugString() {
+    HistogramSnapshot histogram =
+        HistogramSnapshot.builder()
+            .name("request_latency_seconds")
+            .help("request latency")
+            .dataPoint(
+                HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                    .sum(0.123)
+                    .nativeSchema(5)
+                    .nativeZeroThreshold(2.938735877055719E-39)
+                    .nativeZeroCount(0)
+                    .nativeBucketsForPositiveValues(
+                        NativeHistogramBuckets.builder().bucket(-96, 1).build())
+                    .build())
+            .build();
+
+    PrometheusProtobufWriterImpl writer = new PrometheusProtobufWriterImpl();
+    Metrics.MetricFamily protobufData =
+        writer.convert(histogram, EscapingScheme.UNDERSCORE_ESCAPING);
+
+    assertThat(
+            writer.toDebugString(MetricSnapshots.of(histogram), EscapingScheme.UNDERSCORE_ESCAPING))
+        .isEqualTo(TextFormat.printer().printToString(protobufData));
+  }
 }
diff --git a/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufDebugFormatTest.java b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufDebugFormatTest.java
new file mode 100644
index 000000000..8aaab257b
--- /dev/null
+++ b/prometheus-metrics-exposition-formats/src/test/java/io/prometheus/metrics/expositionformats/internal/PrometheusProtobufDebugFormatTest.java
@@ -0,0 +1,124 @@
+package io.prometheus.metrics.expositionformats.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.google.protobuf.TextFormat;
+import com.google.protobuf.Timestamp;
+import io.prometheus.metrics.expositionformats.generated.Metrics;
+import org.junit.jupiter.api.Test;
+
+@SuppressWarnings("NonCanonicalType")
+class PrometheusProtobufDebugFormatTest {
+
+  @Test
+  void testHistogramFieldsAreEmittedInProtobufFieldNumberOrder() throws Exception {
+    Metrics.MetricFamily metricFamily =
+        Metrics.MetricFamily.newBuilder()
+            .setName("request_latency_seconds")
+            .setHelp("request latency")
+            .setType(Metrics.MetricType.HISTOGRAM)
+            .addMetric(
+                Metrics.Metric.newBuilder()
+                    .setTimestampMs(123)
+                    .setHistogram(
+                        Metrics.Histogram.newBuilder()
+                            .setSampleCountFloat(3.0)
+                            .setSampleSum(4.0)
+                            .addBucket(
+                                Metrics.Bucket.newBuilder()
+                                    .setCumulativeCount(1)
+                                    .setUpperBound(2.0)
+                                    .setCumulativeCountFloat(1.0))
+                            .setSchema(5)
+                            .setZeroThreshold(2.938735877055719E-39)
+                            .setZeroCount(0)
+                            .addPositiveSpan(
+                                Metrics.BucketSpan.newBuilder().setOffset(-96).setLength(1))
+                            .addPositiveDelta(1)
+                            .setCreatedTimestamp(
+                                Timestamp.newBuilder().setSeconds(1000).setNanos(123000000))))
+            .build();
+
+    assertThat(PrometheusProtobufDebugFormat.toDebugString(metricFamily))
+        .isEqualTo(TextFormat.printer().printToString(metricFamily));
+  }
+
+  @Test
+  void testAllMetricTypesMatchProtobufTextFormat() throws Exception {
+    Metrics.MetricFamily metricFamily =
+        Metrics.MetricFamily.newBuilder()
+            .setName("test_metric")
+            .setHelp("test metric")
+            .setType(Metrics.MetricType.UNTYPED)
+            .setUnit("seconds")
+            .addMetric(
+                Metrics.Metric.newBuilder()
+                    .addLabel(label("path", "/Björn"))
+                    .setGauge(Metrics.Gauge.newBuilder().setValue(2.0)))
+            .addMetric(
+                Metrics.Metric.newBuilder()
+                    .setCounter(
+                        Metrics.Counter.newBuilder()
+                            .setValue(3.0)
+                            .setExemplar(exemplar())
+                            .setCreatedTimestamp(timestamp())))
+            .addMetric(
+                Metrics.Metric.newBuilder()
+                    .setSummary(
+                        Metrics.Summary.newBuilder()
+                            .setSampleCount(7)
+                            .setSampleSum(8.0)
+                            .addQuantile(
+                                Metrics.Quantile.newBuilder().setQuantile(0.99).setValue(42.0))
+                            .setCreatedTimestamp(timestamp())))
+            .addMetric(
+                Metrics.Metric.newBuilder().setUntyped(Metrics.Untyped.newBuilder().setValue(1.5)))
+            .addMetric(
+                Metrics.Metric.newBuilder()
+                    .setHistogram(
+                        Metrics.Histogram.newBuilder()
+                            .setSampleCount(3)
+                            .setSampleSum(4.0)
+                            .addBucket(
+                                Metrics.Bucket.newBuilder()
+                                    .setCumulativeCount(1)
+                                    .setUpperBound(2.0)
+                                    .setExemplar(exemplar())
+                                    .setCumulativeCountFloat(1.0))
+                            .setSampleCountFloat(3.0)
+                            .setSchema(5)
+                            .setZeroThreshold(2.938735877055719E-39)
+                            .setZeroCount(0)
+                            .setZeroCountFloat(0.0)
+                            .addNegativeSpan(
+                                Metrics.BucketSpan.newBuilder().setOffset(-96).setLength(1))
+                            .addNegativeDelta(1)
+                            .addNegativeCount(1.0)
+                            .addPositiveSpan(
+                                Metrics.BucketSpan.newBuilder().setOffset(96).setLength(1))
+                            .addPositiveDelta(1)
+                            .addPositiveCount(1.0)
+                            .setCreatedTimestamp(timestamp())
+                            .addExemplars(exemplar())))
+            .build();
+
+    assertThat(PrometheusProtobufDebugFormat.toDebugString(metricFamily))
+        .isEqualTo(TextFormat.printer().printToString(metricFamily));
+  }
+
+  private static Metrics.LabelPair label(String name, String value) {
+    return Metrics.LabelPair.newBuilder().setName(name).setValue(value).build();
+  }
+
+  private static Metrics.Exemplar exemplar() {
+    return Metrics.Exemplar.newBuilder()
+        .addLabel(label("trace_id", "abc"))
+        .setValue(1.0)
+        .setTimestamp(timestamp())
+        .build();
+  }
+
+  private static Timestamp timestamp() {
+    return Timestamp.newBuilder().setSeconds(1000).setNanos(123000000).build();
+  }
+}
diff --git a/prometheus-metrics-exposition-textformats/pom.xml b/prometheus-metrics-exposition-textformats/pom.xml
index 1aeba0707..55a4d5375 100644
--- a/prometheus-metrics-exposition-textformats/pom.xml
+++ b/prometheus-metrics-exposition-textformats/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-exposition-textformats</artifactId>
@@ -19,10 +18,16 @@
 
   <properties>
     <automatic.module.name>io.prometheus.writer.text</automatic.module.name>
-    <jacoco.line-coverage>0.50</jacoco.line-coverage>
+    <jacoco.line-coverage>0.60</jacoco.line-coverage>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-model</artifactId>
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormatWriter.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormatWriter.java
index 67f1ee41e..7ea071bf7 100644
--- a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormatWriter.java
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormatWriter.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.expositionformats;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.io.ByteArrayOutputStream;
@@ -7,6 +8,7 @@
 import java.io.OutputStream;
 import javax.annotation.Nullable;
 
+@StableApi
 public interface ExpositionFormatWriter {
   boolean accepts(@Nullable String acceptHeader);
 
@@ -20,6 +22,8 @@ default void write(OutputStream out, MetricSnapshots metricSnapshots) throws IOE
   }
 
   /** Converts the metric snapshots to a debug string using the specified escaping scheme. */
+  // toString with Charset is only available in Java 10+, but we want to support Java 8
+  @SuppressWarnings("JdkObsolete")
   default String toDebugString(MetricSnapshots metricSnapshots, EscapingScheme escapingScheme) {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     try {
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java
index 0ffa23a58..0cfce9b5f 100644
--- a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/ExpositionFormats.java
@@ -1,52 +1,94 @@
 package io.prometheus.metrics.expositionformats;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.ExporterProperties;
+import io.prometheus.metrics.config.OpenMetrics2Properties;
 import io.prometheus.metrics.config.PrometheusProperties;
 import javax.annotation.Nullable;
 
+@StableApi
 public class ExpositionFormats {
 
   private final PrometheusProtobufWriter prometheusProtobufWriter;
   private final PrometheusTextFormatWriter prometheusTextFormatWriter;
   private final OpenMetricsTextFormatWriter openMetricsTextFormatWriter;
+  private final OpenMetrics2TextFormatWriter openMetrics2TextFormatWriter;
 
   private ExpositionFormats(
       PrometheusProtobufWriter prometheusProtobufWriter,
       PrometheusTextFormatWriter prometheusTextFormatWriter,
-      OpenMetricsTextFormatWriter openMetricsTextFormatWriter) {
+      OpenMetricsTextFormatWriter openMetricsTextFormatWriter,
+      OpenMetrics2TextFormatWriter openMetrics2TextFormatWriter) {
     this.prometheusProtobufWriter = prometheusProtobufWriter;
     this.prometheusTextFormatWriter = prometheusTextFormatWriter;
     this.openMetricsTextFormatWriter = openMetricsTextFormatWriter;
+    this.openMetrics2TextFormatWriter = openMetrics2TextFormatWriter;
   }
 
   public static ExpositionFormats init() {
-    return init(PrometheusProperties.get().getExporterProperties());
+    return init(PrometheusProperties.get());
   }
 
   @SuppressWarnings("deprecation")
-  public static ExpositionFormats init(ExporterProperties properties) {
+  public static ExpositionFormats init(PrometheusProperties properties) {
+    ExporterProperties exporterProps = properties.getExporterProperties();
+    OpenMetrics2Properties om2Props = properties.getOpenMetrics2Properties();
+
     return new ExpositionFormats(
         new PrometheusProtobufWriter(),
         PrometheusTextFormatWriter.builder()
-            .setIncludeCreatedTimestamps(properties.getIncludeCreatedTimestamps())
-            .setTimestampsInMs(properties.getPrometheusTimestampsInMs())
+            .setIncludeCreatedTimestamps(exporterProps.getIncludeCreatedTimestamps())
+            .setTimestampsInMs(exporterProps.getPrometheusTimestampsInMs())
             .build(),
         OpenMetricsTextFormatWriter.builder()
-            .setCreatedTimestampsEnabled(properties.getIncludeCreatedTimestamps())
-            .setExemplarsOnAllMetricTypesEnabled(properties.getExemplarsOnAllMetricTypes())
+            .setCreatedTimestampsEnabled(exporterProps.getIncludeCreatedTimestamps())
+            .setExemplarsOnAllMetricTypesEnabled(exporterProps.getExemplarsOnAllMetricTypes())
+            .build(),
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(om2Props)
+            .setCreatedTimestampsEnabled(exporterProps.getIncludeCreatedTimestamps())
+            .setExemplarsOnAllMetricTypesEnabled(exporterProps.getExemplarsOnAllMetricTypes())
             .build());
   }
 
+  /**
+   * @deprecated Use {@link #init(PrometheusProperties)} instead.
+   */
+  @Deprecated
+  @SuppressWarnings({"InlineMeSuggester"})
+  public static ExpositionFormats init(ExporterProperties properties) {
+    return init(PrometheusProperties.builder().exporterProperties(properties).build());
+  }
+
   public ExpositionFormatWriter findWriter(@Nullable String acceptHeader) {
     if (prometheusProtobufWriter.accepts(acceptHeader)) {
       return prometheusProtobufWriter;
     }
+
+    if (isOpenMetrics2Enabled() && openMetrics2TextFormatWriter.accepts(acceptHeader)) {
+      if (openMetrics2TextFormatWriter.getOpenMetrics2Properties().getContentNegotiation()) {
+        String version = parseOpenMetricsVersion(acceptHeader);
+        if ("2.0.0".equals(version)) {
+          return openMetrics2TextFormatWriter;
+        }
+        // version=1.0.0 or no version: fall through to OM1.
+      } else {
+        // contentNegotiation=false: OM2 handles all OpenMetrics requests.
+        return openMetrics2TextFormatWriter;
+      }
+    }
+
     if (openMetricsTextFormatWriter.accepts(acceptHeader)) {
       return openMetricsTextFormatWriter;
     }
+
     return prometheusTextFormatWriter;
   }
 
+  private boolean isOpenMetrics2Enabled() {
+    return openMetrics2TextFormatWriter.getOpenMetrics2Properties().getEnabled();
+  }
+
   public PrometheusProtobufWriter getPrometheusProtobufWriter() {
     return prometheusProtobufWriter;
   }
@@ -58,4 +100,31 @@ public PrometheusTextFormatWriter getPrometheusTextFormatWriter() {
   public OpenMetricsTextFormatWriter getOpenMetricsTextFormatWriter() {
     return openMetricsTextFormatWriter;
   }
+
+  public OpenMetrics2TextFormatWriter getOpenMetrics2TextFormatWriter() {
+    return openMetrics2TextFormatWriter;
+  }
+
+  @Nullable
+  private static String parseOpenMetricsVersion(@Nullable String acceptHeader) {
+    if (acceptHeader == null) {
+      return null;
+    }
+    for (String mediaType : acceptHeader.split(",")) {
+      if (mediaType.contains("application/openmetrics-text")) {
+        for (String param : mediaType.split(";")) {
+          String[] tokens = param.split("=");
+          if (tokens.length == 2) {
+            String key = tokens[0].trim();
+            String value = tokens[1].trim();
+            if (key.equals("version")) {
+              return value;
+            }
+          }
+        }
+        return null;
+      }
+    }
+    return null;
+  }
 }
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetrics2TextFormatWriter.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetrics2TextFormatWriter.java
new file mode 100644
index 000000000..f400ecce0
--- /dev/null
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetrics2TextFormatWriter.java
@@ -0,0 +1,723 @@
+package io.prometheus.metrics.expositionformats;
+
+import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeDouble;
+import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeEscapedString;
+import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLabels;
+import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLong;
+import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
+import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeOpenMetricsTimestamp;
+import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getOriginalMetadataName;
+import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
+
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.config.OpenMetrics2Properties;
+import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.Exemplar;
+import io.prometheus.metrics.model.snapshots.Exemplars;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.InfoSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.PrometheusNaming;
+import io.prometheus.metrics.model.snapshots.Quantile;
+import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
+import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
+import io.prometheus.metrics.model.snapshots.SummarySnapshot;
+import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import javax.annotation.Nullable;
+
+/**
+ * Write the OpenMetrics 2.0 text format. Unlike the OM1 writer, this writer outputs metric names as
+ * provided by the user, without appending {@code _total} or unit suffixes. The {@code _info} suffix
+ * is enforced per the OM2 spec (MUST). This is experimental and subject to change as the <a
+ * href="https://github.com/prometheus/docs/blob/main/docs/specs/om/open_metrics_spec_2_0.md">OpenMetrics
+ * 2.0 specification</a> evolves.
+ */
+@StableApi
+public class OpenMetrics2TextFormatWriter implements ExpositionFormatWriter {
+
+  public static class Builder {
+    private OpenMetrics2Properties openMetrics2Properties =
+        OpenMetrics2Properties.builder().build();
+    boolean createdTimestampsEnabled;
+    boolean exemplarsOnAllMetricTypesEnabled;
+
+    private Builder() {}
+
+    /**
+     * @param openMetrics2Properties OpenMetrics 2.0 feature flags
+     */
+    public Builder setOpenMetrics2Properties(OpenMetrics2Properties openMetrics2Properties) {
+      this.openMetrics2Properties = openMetrics2Properties;
+      return this;
+    }
+
+    /**
+     * @param createdTimestampsEnabled whether delegated OM1 output includes _created metrics
+     */
+    public Builder setCreatedTimestampsEnabled(boolean createdTimestampsEnabled) {
+      this.createdTimestampsEnabled = createdTimestampsEnabled;
+      return this;
+    }
+
+    /**
+     * @param exemplarsOnAllMetricTypesEnabled whether to include exemplars in the output for all
+     *     metric types
+     */
+    public Builder setExemplarsOnAllMetricTypesEnabled(boolean exemplarsOnAllMetricTypesEnabled) {
+      this.exemplarsOnAllMetricTypesEnabled = exemplarsOnAllMetricTypesEnabled;
+      return this;
+    }
+
+    public OpenMetrics2TextFormatWriter build() {
+      return new OpenMetrics2TextFormatWriter(
+          openMetrics2Properties, createdTimestampsEnabled, exemplarsOnAllMetricTypesEnabled);
+    }
+  }
+
+  public static final String CONTENT_TYPE =
+      "application/openmetrics-text; version=2.0.0; charset=utf-8";
+  private final OpenMetrics2Properties openMetrics2Properties;
+  private final boolean createdTimestampsEnabled;
+  private final boolean exemplarsOnAllMetricTypesEnabled;
+  private final OpenMetricsTextFormatWriter om1Writer;
+
+  /**
+   * @param openMetrics2Properties OpenMetrics 2.0 feature flags
+   * @param createdTimestampsEnabled whether delegated OM1 output includes _created metrics
+   * @param exemplarsOnAllMetricTypesEnabled whether to include exemplars on all metric types
+   */
+  public OpenMetrics2TextFormatWriter(
+      OpenMetrics2Properties openMetrics2Properties,
+      boolean createdTimestampsEnabled,
+      boolean exemplarsOnAllMetricTypesEnabled) {
+    this.openMetrics2Properties = openMetrics2Properties;
+    this.createdTimestampsEnabled = createdTimestampsEnabled;
+    this.exemplarsOnAllMetricTypesEnabled = exemplarsOnAllMetricTypesEnabled;
+    this.om1Writer =
+        new OpenMetricsTextFormatWriter(createdTimestampsEnabled, exemplarsOnAllMetricTypesEnabled);
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  public static OpenMetrics2TextFormatWriter create() {
+    return builder().build();
+  }
+
+  @Override
+  public boolean accepts(@Nullable String acceptHeader) {
+    if (acceptHeader == null) {
+      return false;
+    }
+    return acceptHeader.contains("application/openmetrics-text");
+  }
+
+  @Override
+  public String getContentType() {
+    // When contentNegotiation=false (default), masquerade as OM1 for compatibility.
+    // When contentNegotiation=true, use proper OM2 version.
+    if (openMetrics2Properties.getContentNegotiation()) {
+      return CONTENT_TYPE;
+    } else {
+      return OpenMetricsTextFormatWriter.CONTENT_TYPE;
+    }
+  }
+
+  public OpenMetrics2Properties getOpenMetrics2Properties() {
+    return openMetrics2Properties;
+  }
+
+  @Override
+  public void write(OutputStream out, MetricSnapshots metricSnapshots, EscapingScheme scheme)
+      throws IOException {
+    Writer writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8));
+    MetricSnapshots merged = TextFormatUtil.mergeDuplicates(metricSnapshots);
+    for (MetricSnapshot s : merged) {
+      MetricSnapshot snapshot = SnapshotEscaper.escapeMetricSnapshot(s, scheme);
+      if (!snapshot.getDataPoints().isEmpty()) {
+        if (snapshot instanceof CounterSnapshot) {
+          writeCounter(writer, (CounterSnapshot) snapshot, scheme);
+        } else if (snapshot instanceof GaugeSnapshot) {
+          writeGauge(writer, (GaugeSnapshot) snapshot, scheme);
+        } else if (snapshot instanceof HistogramSnapshot) {
+          writeHistogram(writer, (HistogramSnapshot) snapshot, scheme);
+        } else if (snapshot instanceof SummarySnapshot) {
+          writeSummary(writer, (SummarySnapshot) snapshot, scheme);
+        } else if (snapshot instanceof InfoSnapshot) {
+          writeInfo(writer, (InfoSnapshot) snapshot, scheme);
+        } else if (snapshot instanceof StateSetSnapshot) {
+          writeStateSet(writer, (StateSetSnapshot) snapshot, scheme);
+        } else if (snapshot instanceof UnknownSnapshot) {
+          writeUnknown(writer, (UnknownSnapshot) snapshot, scheme);
+        }
+      }
+    }
+    writer.write("# EOF\n");
+    writer.flush();
+  }
+
+  private void writeCounter(Writer writer, CounterSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    MetricMetadata metadata = snapshot.getMetadata();
+    // OM2: use the original name, no _total or unit suffix appending.
+    String counterName = getOriginalMetadataName(metadata, scheme);
+    writeMetadataWithName(writer, counterName, "counter", metadata);
+    for (CounterSnapshot.CounterDataPointSnapshot data : snapshot.getDataPoints()) {
+      writeNameAndLabels(writer, counterName, null, data.getLabels(), scheme);
+      writeDouble(writer, data.getValue());
+      if (data.hasScrapeTimestamp()) {
+        writer.write(' ');
+        writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
+      }
+      if (data.hasCreatedTimestamp()) {
+        writer.write(" st@");
+        writeOpenMetricsTimestamp(writer, data.getCreatedTimestampMillis());
+      }
+      writeExemplar(writer, data.getExemplar(), scheme);
+      writer.write('\n');
+    }
+  }
+
+  private void writeGauge(Writer writer, GaugeSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    MetricMetadata metadata = snapshot.getMetadata();
+    String name = getOriginalMetadataName(metadata, scheme);
+    writeMetadataWithName(writer, name, "gauge", metadata);
+    for (GaugeSnapshot.GaugeDataPointSnapshot data : snapshot.getDataPoints()) {
+      writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
+      writeDouble(writer, data.getValue());
+      if (exemplarsOnAllMetricTypesEnabled) {
+        writeScrapeTimestampAndExemplar(writer, data, data.getExemplar(), scheme);
+      } else {
+        writeScrapeTimestampAndExemplar(writer, data, null, scheme);
+      }
+    }
+  }
+
+  private void writeHistogram(Writer writer, HistogramSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    boolean compositeHistogram =
+        openMetrics2Properties.getCompositeValues() || openMetrics2Properties.getNativeHistograms();
+    MetricMetadata metadata = snapshot.getMetadata();
+    String name = getOriginalMetadataName(metadata, scheme);
+    if (!compositeHistogram && !openMetrics2Properties.getExemplarCompliance()) {
+      writeClassicHistogram(writer, name, snapshot, scheme);
+      return;
+    }
+    if (snapshot.isGaugeHistogram()) {
+      writeMetadataWithName(writer, name, "gaugehistogram", metadata);
+      for (HistogramSnapshot.HistogramDataPointSnapshot data : snapshot.getDataPoints()) {
+        if (openMetrics2Properties.getNativeHistograms() && data.hasNativeHistogramData()) {
+          writeNativeHistogramDataPoint(writer, name, "gcount", "gsum", data, scheme, false);
+        } else {
+          writeCompositeHistogramDataPoint(writer, name, "gcount", "gsum", data, scheme, false);
+        }
+      }
+    } else {
+      writeMetadataWithName(writer, name, "histogram", metadata);
+      for (HistogramSnapshot.HistogramDataPointSnapshot data : snapshot.getDataPoints()) {
+        if (openMetrics2Properties.getNativeHistograms() && data.hasNativeHistogramData()) {
+          writeNativeHistogramDataPoint(writer, name, "count", "sum", data, scheme, true);
+        } else {
+          writeCompositeHistogramDataPoint(writer, name, "count", "sum", data, scheme, true);
+        }
+      }
+    }
+  }
+
+  private void writeClassicHistogram(
+      Writer writer, String name, HistogramSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    if (snapshot.isGaugeHistogram()) {
+      writeMetadataWithName(writer, name, "gaugehistogram", snapshot.getMetadata());
+      writeClassicHistogramDataPoints(writer, name, "_gcount", "_gsum", snapshot, scheme);
+    } else {
+      writeMetadataWithName(writer, name, "histogram", snapshot.getMetadata());
+      writeClassicHistogramDataPoints(writer, name, "_count", "_sum", snapshot, scheme);
+    }
+  }
+
+  private void writeClassicHistogramDataPoints(
+      Writer writer,
+      String name,
+      String countSuffix,
+      String sumSuffix,
+      HistogramSnapshot snapshot,
+      EscapingScheme scheme)
+      throws IOException {
+    String bucketName = name + "_bucket";
+    for (HistogramSnapshot.HistogramDataPointSnapshot data : snapshot.getDataPoints()) {
+      ClassicHistogramBuckets buckets = getClassicBuckets(data);
+      Exemplars exemplars = data.getExemplars();
+      long cumulativeCount = 0;
+      for (int i = 0; i < buckets.size(); i++) {
+        cumulativeCount += buckets.getCount(i);
+        writeNameAndLabels(
+            writer, bucketName, null, data.getLabels(), scheme, "le", buckets.getUpperBound(i));
+        writeLong(writer, cumulativeCount);
+        Exemplar exemplar;
+        if (i == 0) {
+          exemplar = exemplars.get(Double.NEGATIVE_INFINITY, buckets.getUpperBound(i));
+        } else {
+          exemplar = exemplars.get(buckets.getUpperBound(i - 1), buckets.getUpperBound(i));
+        }
+        writeScrapeTimestampAndExemplar(writer, data, exemplar, scheme);
+      }
+      if (data.hasCount() && data.hasSum()) {
+        writeClassicCountAndSum(writer, name, data, countSuffix, sumSuffix, exemplars, scheme);
+      }
+      writeClassicCreated(writer, name, data, scheme);
+    }
+  }
+
+  private void writeClassicCountAndSum(
+      Writer writer,
+      String name,
+      HistogramSnapshot.HistogramDataPointSnapshot data,
+      String countSuffix,
+      String sumSuffix,
+      Exemplars exemplars,
+      EscapingScheme scheme)
+      throws IOException {
+    writeNameAndLabels(writer, name, countSuffix, data.getLabels(), scheme);
+    writeLong(writer, data.getCount());
+    if (exemplarsOnAllMetricTypesEnabled) {
+      writeScrapeTimestampAndExemplar(writer, data, exemplars.getLatest(), scheme);
+    } else {
+      writeScrapeTimestampAndExemplar(writer, data, null, scheme);
+    }
+    writeNameAndLabels(writer, name, sumSuffix, data.getLabels(), scheme);
+    writeDouble(writer, data.getSum());
+    writeScrapeTimestampAndExemplar(writer, data, null, scheme);
+  }
+
+  private void writeClassicCreated(
+      Writer writer,
+      String name,
+      HistogramSnapshot.HistogramDataPointSnapshot data,
+      EscapingScheme scheme)
+      throws IOException {
+    if (createdTimestampsEnabled && data.hasCreatedTimestamp()) {
+      writeNameAndLabels(writer, name, "_created", data.getLabels(), scheme);
+      writeOpenMetricsTimestamp(writer, data.getCreatedTimestampMillis());
+      if (data.hasScrapeTimestamp()) {
+        writer.write(' ');
+        writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
+      }
+      writer.write('\n');
+    }
+  }
+
+  private void writeCompositeHistogramDataPoint(
+      Writer writer,
+      String name,
+      String countKey,
+      String sumKey,
+      HistogramSnapshot.HistogramDataPointSnapshot data,
+      EscapingScheme scheme,
+      boolean includeStartTimestamp)
+      throws IOException {
+    writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
+    writer.write('{');
+    writer.write(countKey);
+    writer.write(':');
+    writeLong(writer, data.getCount());
+    writer.write(',');
+    writer.write(sumKey);
+    writer.write(':');
+    writeDouble(writer, data.getSum());
+    writeClassicBucketsField(writer, data);
+    writer.write('}');
+    if (data.hasScrapeTimestamp()) {
+      writer.write(' ');
+      writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
+    }
+    if (includeStartTimestamp && data.hasCreatedTimestamp()) {
+      writer.write(" st@");
+      writeOpenMetricsTimestamp(writer, data.getCreatedTimestampMillis());
+    }
+    writeExemplars(writer, data.getExemplars(), scheme);
+    writer.write('\n');
+  }
+
+  private void writeNativeHistogramDataPoint(
+      Writer writer,
+      String name,
+      String countKey,
+      String sumKey,
+      HistogramSnapshot.HistogramDataPointSnapshot data,
+      EscapingScheme scheme,
+      boolean includeStartTimestamp)
+      throws IOException {
+    writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
+    writer.write('{');
+    writer.write(countKey);
+    writer.write(':');
+    writeLong(writer, data.getCount());
+    writer.write(',');
+    writer.write(sumKey);
+    writer.write(':');
+    writeDouble(writer, data.getSum());
+    writer.write(",schema:");
+    writer.write(Integer.toString(data.getNativeSchema()));
+    writer.write(",zero_threshold:");
+    writeDouble(writer, data.getNativeZeroThreshold());
+    writer.write(",zero_count:");
+    writeLong(writer, data.getNativeZeroCount());
+    writeNativeBucketFields(writer, "negative", data.getNativeBucketsForNegativeValues());
+    writeNativeBucketFields(writer, "positive", data.getNativeBucketsForPositiveValues());
+    if (data.hasClassicHistogramData()) {
+      writeClassicBucketsField(writer, data);
+    }
+    writer.write('}');
+    if (data.hasScrapeTimestamp()) {
+      writer.write(' ');
+      writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
+    }
+    if (includeStartTimestamp && data.hasCreatedTimestamp()) {
+      writer.write(" st@");
+      writeOpenMetricsTimestamp(writer, data.getCreatedTimestampMillis());
+    }
+    writeExemplars(writer, data.getExemplars(), scheme);
+    writer.write('\n');
+  }
+
+  private ClassicHistogramBuckets getClassicBuckets(
+      HistogramSnapshot.HistogramDataPointSnapshot data) {
+    if (data.getClassicBuckets().isEmpty()) {
+      return ClassicHistogramBuckets.of(
+          new double[] {Double.POSITIVE_INFINITY}, new long[] {data.getCount()});
+    } else {
+      return data.getClassicBuckets();
+    }
+  }
+
+  private void writeClassicBucketsField(
+      Writer writer, HistogramSnapshot.HistogramDataPointSnapshot data) throws IOException {
+    writer.write(",bucket:[");
+    ClassicHistogramBuckets buckets = getClassicBuckets(data);
+    long cumulativeCount = 0;
+    for (int i = 0; i < buckets.size(); i++) {
+      if (i > 0) {
+        writer.write(',');
+      }
+      cumulativeCount += buckets.getCount(i);
+      writeDouble(writer, buckets.getUpperBound(i));
+      writer.write(':');
+      writeLong(writer, cumulativeCount);
+    }
+    writer.write(']');
+  }
+
+  private void writeNativeBucketFields(Writer writer, String prefix, NativeHistogramBuckets buckets)
+      throws IOException {
+    if (buckets.size() == 0) {
+      return;
+    }
+    writer.write(',');
+    writer.write(prefix);
+    writer.write("_spans:[");
+    writeNativeBucketSpans(writer, buckets);
+    writer.write("],");
+    writer.write(prefix);
+    writer.write("_buckets:[");
+    for (int i = 0; i < buckets.size(); i++) {
+      if (i > 0) {
+        writer.write(',');
+      }
+      writeLong(writer, buckets.getCount(i));
+    }
+    writer.write(']');
+  }
+
+  private void writeNativeBucketSpans(Writer writer, NativeHistogramBuckets buckets)
+      throws IOException {
+    int spanOffset = buckets.getBucketIndex(0);
+    int spanLength = 1;
+    int previousIndex = buckets.getBucketIndex(0);
+    boolean firstSpan = true;
+    for (int i = 1; i < buckets.size(); i++) {
+      int bucketIndex = buckets.getBucketIndex(i);
+      if (bucketIndex == previousIndex + 1) {
+        spanLength++;
+      } else {
+        firstSpan = writeNativeBucketSpan(writer, spanOffset, spanLength, firstSpan);
+        spanOffset = bucketIndex - previousIndex - 1;
+        spanLength = 1;
+      }
+      previousIndex = bucketIndex;
+    }
+    writeNativeBucketSpan(writer, spanOffset, spanLength, firstSpan);
+  }
+
+  private boolean writeNativeBucketSpan(Writer writer, int offset, int length, boolean firstSpan)
+      throws IOException {
+    if (!firstSpan) {
+      writer.write(',');
+    }
+    writer.write(Integer.toString(offset));
+    writer.write(':');
+    writer.write(Integer.toString(length));
+    return false;
+  }
+
+  private void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    if (!openMetrics2Properties.getCompositeValues()
+        && !openMetrics2Properties.getExemplarCompliance()) {
+      om1Writer.writeSummary(writer, snapshot, scheme);
+      return;
+    }
+    boolean metadataWritten = false;
+    MetricMetadata metadata = snapshot.getMetadata();
+    String name = getOriginalMetadataName(metadata, scheme);
+    for (SummarySnapshot.SummaryDataPointSnapshot data : snapshot.getDataPoints()) {
+      if (data.getQuantiles().size() == 0 && !data.hasCount() && !data.hasSum()) {
+        continue;
+      }
+      if (!metadataWritten) {
+        writeMetadataWithName(writer, name, "summary", metadata);
+        metadataWritten = true;
+      }
+      writeCompositeSummaryDataPoint(writer, name, data, scheme);
+    }
+  }
+
+  private void writeCompositeSummaryDataPoint(
+      Writer writer,
+      String name,
+      SummarySnapshot.SummaryDataPointSnapshot data,
+      EscapingScheme scheme)
+      throws IOException {
+    writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
+    writer.write('{');
+    boolean first = true;
+    if (data.hasCount()) {
+      writer.write("count:");
+      writeLong(writer, data.getCount());
+      first = false;
+    }
+    if (data.hasSum()) {
+      if (!first) {
+        writer.write(',');
+      }
+      writer.write("sum:");
+      writeDouble(writer, data.getSum());
+      first = false;
+    }
+    if (!first) {
+      writer.write(',');
+    }
+    writer.write("quantile:[");
+    for (int i = 0; i < data.getQuantiles().size(); i++) {
+      if (i > 0) {
+        writer.write(',');
+      }
+      Quantile q = data.getQuantiles().get(i);
+      writeDouble(writer, q.getQuantile());
+      writer.write(':');
+      writeDouble(writer, q.getValue());
+    }
+    writer.write(']');
+    writer.write('}');
+    if (data.hasScrapeTimestamp()) {
+      writer.write(' ');
+      writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
+    }
+    if (data.hasCreatedTimestamp()) {
+      writer.write(" st@");
+      writeOpenMetricsTimestamp(writer, data.getCreatedTimestampMillis());
+    }
+    writeExemplars(writer, data.getExemplars(), scheme);
+    writer.write('\n');
+  }
+
+  private void writeInfo(Writer writer, InfoSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    MetricMetadata metadata = snapshot.getMetadata();
+    // OM2 spec: Info MetricFamily name MUST end in _info.
+    // In OM2, TYPE/HELP use the same name as the data lines.
+    String infoName = ensureSuffix(getOriginalMetadataName(metadata, scheme), "_info");
+    writeMetadataWithName(writer, infoName, "info", metadata);
+    for (InfoSnapshot.InfoDataPointSnapshot data : snapshot.getDataPoints()) {
+      writeNameAndLabels(writer, infoName, null, data.getLabels(), scheme);
+      writer.write("1");
+      writeScrapeTimestampAndExemplar(writer, data, null, scheme);
+    }
+  }
+
+  private void writeStateSet(Writer writer, StateSetSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    MetricMetadata metadata = snapshot.getMetadata();
+    String name = getOriginalMetadataName(metadata, scheme);
+    writeMetadataWithName(writer, name, "stateset", metadata);
+    for (StateSetSnapshot.StateSetDataPointSnapshot data : snapshot.getDataPoints()) {
+      for (int i = 0; i < data.size(); i++) {
+        writer.write(name);
+        writer.write('{');
+        Labels labels = data.getLabels();
+        for (int j = 0; j < labels.size(); j++) {
+          if (j > 0) {
+            writer.write(",");
+          }
+          writer.write(getSnapshotLabelName(labels, j, scheme));
+          writer.write("=\"");
+          writeEscapedString(writer, labels.getValue(j));
+          writer.write("\"");
+        }
+        if (!labels.isEmpty()) {
+          writer.write(",");
+        }
+        writer.write(name);
+        writer.write("=\"");
+        writeEscapedString(writer, data.getName(i));
+        writer.write("\"} ");
+        if (data.isTrue(i)) {
+          writer.write("1");
+        } else {
+          writer.write("0");
+        }
+        writeScrapeTimestampAndExemplar(writer, data, null, scheme);
+      }
+    }
+  }
+
+  private void writeUnknown(Writer writer, UnknownSnapshot snapshot, EscapingScheme scheme)
+      throws IOException {
+    MetricMetadata metadata = snapshot.getMetadata();
+    String name = getOriginalMetadataName(metadata, scheme);
+    writeMetadataWithName(writer, name, "unknown", metadata);
+    for (UnknownSnapshot.UnknownDataPointSnapshot data : snapshot.getDataPoints()) {
+      writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
+      writeDouble(writer, data.getValue());
+      if (exemplarsOnAllMetricTypesEnabled) {
+        writeScrapeTimestampAndExemplar(writer, data, data.getExemplar(), scheme);
+      } else {
+        writeScrapeTimestampAndExemplar(writer, data, null, scheme);
+      }
+    }
+  }
+
+  private void writeNameAndLabels(
+      Writer writer,
+      String name,
+      @Nullable String suffix,
+      Labels labels,
+      EscapingScheme escapingScheme)
+      throws IOException {
+    writeNameAndLabels(writer, name, suffix, labels, escapingScheme, null, 0.0);
+  }
+
+  private void writeNameAndLabels(
+      Writer writer,
+      String name,
+      @Nullable String suffix,
+      Labels labels,
+      EscapingScheme escapingScheme,
+      @Nullable String additionalLabelName,
+      double additionalLabelValue)
+      throws IOException {
+    boolean metricInsideBraces = false;
+    // If the name does not pass the legacy validity check, we must put the
+    // metric name inside the braces.
+    if (!PrometheusNaming.isValidLegacyMetricName(name)) {
+      metricInsideBraces = true;
+      writer.write('{');
+    }
+    writeName(writer, suffix != null ? name + suffix : name, NameType.Metric);
+    if (!labels.isEmpty() || additionalLabelName != null) {
+      writeLabels(
+          writer,
+          labels,
+          additionalLabelName,
+          additionalLabelValue,
+          metricInsideBraces,
+          escapingScheme);
+    } else if (metricInsideBraces) {
+      writer.write('}');
+    }
+    writer.write(' ');
+  }
+
+  private void writeScrapeTimestampAndExemplar(
+      Writer writer, DataPointSnapshot data, @Nullable Exemplar exemplar, EscapingScheme scheme)
+      throws IOException {
+    if (!openMetrics2Properties.getExemplarCompliance()) {
+      om1Writer.writeScrapeTimestampAndExemplar(writer, data, exemplar, scheme);
+      return;
+    }
+    if (data.hasScrapeTimestamp()) {
+      writer.write(' ');
+      writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
+    }
+    writeExemplar(writer, exemplar, scheme);
+    writer.write('\n');
+  }
+
+  private void writeExemplar(Writer writer, @Nullable Exemplar exemplar, EscapingScheme scheme)
+      throws IOException {
+    if (exemplar == null) {
+      return;
+    }
+    if (!openMetrics2Properties.getExemplarCompliance()) {
+      om1Writer.writeExemplar(writer, exemplar, scheme);
+      return;
+    }
+    // exemplarCompliance=true: exemplars MUST have a timestamp per the OM2 spec.
+    if (exemplar.hasTimestamp()) {
+      om1Writer.writeExemplar(writer, exemplar, scheme);
+    }
+  }
+
+  private void writeExemplars(Writer writer, Exemplars exemplars, EscapingScheme scheme)
+      throws IOException {
+    for (Exemplar exemplar : exemplars) {
+      writeExemplar(writer, exemplar, scheme);
+    }
+  }
+
+  private void writeMetadataWithName(
+      Writer writer, String name, String typeName, MetricMetadata metadata) throws IOException {
+    writer.write("# TYPE ");
+    writeName(writer, name, NameType.Metric);
+    writer.write(' ');
+    writer.write(typeName);
+    writer.write('\n');
+    if (metadata.getUnit() != null) {
+      writer.write("# UNIT ");
+      writeName(writer, name, NameType.Metric);
+      writer.write(' ');
+      writeEscapedString(writer, metadata.getUnit().toString());
+      writer.write('\n');
+    }
+    if (metadata.getHelp() != null && !metadata.getHelp().isEmpty()) {
+      writer.write("# HELP ");
+      writeName(writer, name, NameType.Metric);
+      writer.write(' ');
+      writeEscapedString(writer, metadata.getHelp());
+      writer.write('\n');
+    }
+  }
+
+  private static String ensureSuffix(String name, String suffix) {
+    if (name.endsWith(suffix)) {
+      return name;
+    }
+    return name + suffix;
+  }
+}
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java
index 1ba1c627d..02614a561 100644
--- a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/OpenMetricsTextFormatWriter.java
@@ -6,9 +6,11 @@
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeLong;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeOpenMetricsTimestamp;
+import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getExpositionBaseMetadataName;
 import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getMetadataName;
 import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -42,6 +44,7 @@
  * Write the OpenMetrics text format as defined on <a
  * href="https://openmetrics.io/">https://openmetrics.io</a>.
  */
+@StableApi
 public class OpenMetricsTextFormatWriter implements ExpositionFormatWriter {
 
   public static class Builder {
@@ -113,7 +116,8 @@ public String getContentType() {
   public void write(OutputStream out, MetricSnapshots metricSnapshots, EscapingScheme scheme)
       throws IOException {
     Writer writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8));
-    for (MetricSnapshot s : metricSnapshots) {
+    MetricSnapshots merged = TextFormatUtil.mergeDuplicates(metricSnapshots);
+    for (MetricSnapshot s : merged) {
       MetricSnapshot snapshot = SnapshotEscaper.escapeMetricSnapshot(s, scheme);
       if (!snapshot.getDataPoints().isEmpty()) {
         if (snapshot instanceof CounterSnapshot) {
@@ -140,13 +144,14 @@ public void write(OutputStream out, MetricSnapshots metricSnapshots, EscapingSch
   private void writeCounter(Writer writer, CounterSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "counter", metadata, scheme);
+    String counterName = resolveExpositionName(metadata, "_total", scheme);
+    String baseName = resolveBaseName(counterName, "_total");
+    writeMetadataWithName(writer, baseName, "counter", metadata);
     for (CounterSnapshot.CounterDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(
-          writer, getMetadataName(metadata, scheme), "_total", data.getLabels(), scheme);
+      writeNameAndLabels(writer, counterName, null, data.getLabels(), scheme);
       writeDouble(writer, data.getValue());
       writeScrapeTimestampAndExemplar(writer, data, data.getExemplar(), scheme);
-      writeCreated(writer, metadata, data, scheme);
+      writeCreated(writer, baseName, data, scheme);
     }
   }
 
@@ -154,8 +159,9 @@ private void writeGauge(Writer writer, GaugeSnapshot snapshot, EscapingScheme sc
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
     writeMetadata(writer, "gauge", metadata, scheme);
+    String name = getMetadataName(metadata, scheme);
     for (GaugeSnapshot.GaugeDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(writer, getMetadataName(metadata, scheme), null, data.getLabels(), scheme);
+      writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
       writeDouble(writer, data.getValue());
       if (exemplarsOnAllMetricTypesEnabled) {
         writeScrapeTimestampAndExemplar(writer, data, data.getExemplar(), scheme);
@@ -165,7 +171,7 @@ private void writeGauge(Writer writer, GaugeSnapshot snapshot, EscapingScheme sc
     }
   }
 
-  private void writeHistogram(Writer writer, HistogramSnapshot snapshot, EscapingScheme scheme)
+  void writeHistogram(Writer writer, HistogramSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
     if (snapshot.isGaugeHistogram()) {
@@ -187,6 +193,10 @@ private void writeClassicHistogramBuckets(
       List<HistogramSnapshot.HistogramDataPointSnapshot> dataList,
       EscapingScheme scheme)
       throws IOException {
+    String name = getMetadataName(metadata, scheme);
+    String bucketName = name + "_bucket";
+    String countName = name + countSuffix;
+    String sumName = name + sumSuffix;
     for (HistogramSnapshot.HistogramDataPointSnapshot data : dataList) {
       ClassicHistogramBuckets buckets = getClassicBuckets(data);
       Exemplars exemplars = data.getExemplars();
@@ -194,13 +204,7 @@ private void writeClassicHistogramBuckets(
       for (int i = 0; i < buckets.size(); i++) {
         cumulativeCount += buckets.getCount(i);
         writeNameAndLabels(
-            writer,
-            getMetadataName(metadata, scheme),
-            "_bucket",
-            data.getLabels(),
-            scheme,
-            "le",
-            buckets.getUpperBound(i));
+            writer, bucketName, null, data.getLabels(), scheme, "le", buckets.getUpperBound(i));
         writeLong(writer, cumulativeCount);
         Exemplar exemplar;
         if (i == 0) {
@@ -212,9 +216,9 @@ private void writeClassicHistogramBuckets(
       }
       // In OpenMetrics format, histogram _count and _sum are either both present or both absent.
       if (data.hasCount() && data.hasSum()) {
-        writeCountAndSum(writer, metadata, data, countSuffix, sumSuffix, exemplars, scheme);
+        writeCountAndSum(writer, countName, sumName, data, exemplars, scheme);
       }
-      writeCreated(writer, metadata, data, scheme);
+      writeCreated(writer, name, data, scheme);
     }
   }
 
@@ -228,10 +232,13 @@ private ClassicHistogramBuckets getClassicBuckets(
     }
   }
 
-  private void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingScheme scheme)
+  void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     boolean metadataWritten = false;
     MetricMetadata metadata = snapshot.getMetadata();
+    String name = getMetadataName(metadata, scheme);
+    String countName = name + "_count";
+    String sumName = name + "_sum";
     for (SummarySnapshot.SummaryDataPointSnapshot data : snapshot.getDataPoints()) {
       if (data.getQuantiles().size() == 0 && !data.hasCount() && !data.hasSum()) {
         continue;
@@ -249,13 +256,7 @@ private void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingSchem
       int exemplarIndex = 1;
       for (Quantile quantile : data.getQuantiles()) {
         writeNameAndLabels(
-            writer,
-            getMetadataName(metadata, scheme),
-            null,
-            data.getLabels(),
-            scheme,
-            "quantile",
-            quantile.getQuantile());
+            writer, name, null, data.getLabels(), scheme, "quantile", quantile.getQuantile());
         writeDouble(writer, quantile.getValue());
         if (exemplars.size() > 0 && exemplarsOnAllMetricTypesEnabled) {
           exemplarIndex = (exemplarIndex + 1) % exemplars.size();
@@ -265,18 +266,19 @@ private void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingSchem
         }
       }
       // Unlike histograms, summaries can have only a count or only a sum according to OpenMetrics.
-      writeCountAndSum(writer, metadata, data, "_count", "_sum", exemplars, scheme);
-      writeCreated(writer, metadata, data, scheme);
+      writeCountAndSum(writer, countName, sumName, data, exemplars, scheme);
+      writeCreated(writer, name, data, scheme);
     }
   }
 
   private void writeInfo(Writer writer, InfoSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "info", metadata, scheme);
+    String infoName = resolveExpositionName(metadata, "_info", scheme);
+    String baseName = resolveBaseName(infoName, "_info");
+    writeMetadataWithName(writer, baseName, "info", metadata);
     for (InfoSnapshot.InfoDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(
-          writer, getMetadataName(metadata, scheme), "_info", data.getLabels(), scheme);
+      writeNameAndLabels(writer, infoName, null, data.getLabels(), scheme);
       writer.write("1");
       writeScrapeTimestampAndExemplar(writer, data, null, scheme);
     }
@@ -286,9 +288,10 @@ private void writeStateSet(Writer writer, StateSetSnapshot snapshot, EscapingSch
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
     writeMetadata(writer, "stateset", metadata, scheme);
+    String name = getMetadataName(metadata, scheme);
     for (StateSetSnapshot.StateSetDataPointSnapshot data : snapshot.getDataPoints()) {
       for (int i = 0; i < data.size(); i++) {
-        writer.write(getMetadataName(metadata, scheme));
+        writer.write(name);
         writer.write('{');
         Labels labels = data.getLabels();
         for (int j = 0; j < labels.size(); j++) {
@@ -303,7 +306,7 @@ private void writeStateSet(Writer writer, StateSetSnapshot snapshot, EscapingSch
         if (!labels.isEmpty()) {
           writer.write(",");
         }
-        writer.write(getMetadataName(metadata, scheme));
+        writer.write(name);
         writer.write("=\"");
         writeEscapedString(writer, data.getName(i));
         writer.write("\"} ");
@@ -321,8 +324,9 @@ private void writeUnknown(Writer writer, UnknownSnapshot snapshot, EscapingSchem
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
     writeMetadata(writer, "unknown", metadata, scheme);
+    String name = getMetadataName(metadata, scheme);
     for (UnknownSnapshot.UnknownDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(writer, getMetadataName(metadata, scheme), null, data.getLabels(), scheme);
+      writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
       writeDouble(writer, data.getValue());
       if (exemplarsOnAllMetricTypesEnabled) {
         writeScrapeTimestampAndExemplar(writer, data, data.getExemplar(), scheme);
@@ -334,16 +338,14 @@ private void writeUnknown(Writer writer, UnknownSnapshot snapshot, EscapingSchem
 
   private void writeCountAndSum(
       Writer writer,
-      MetricMetadata metadata,
+      String countName,
+      String sumName,
       DistributionDataPointSnapshot data,
-      String countSuffix,
-      String sumSuffix,
       Exemplars exemplars,
       EscapingScheme scheme)
       throws IOException {
     if (data.hasCount()) {
-      writeNameAndLabels(
-          writer, getMetadataName(metadata, scheme), countSuffix, data.getLabels(), scheme);
+      writeNameAndLabels(writer, countName, null, data.getLabels(), scheme);
       writeLong(writer, data.getCount());
       if (exemplarsOnAllMetricTypesEnabled) {
         writeScrapeTimestampAndExemplar(writer, data, exemplars.getLatest(), scheme);
@@ -352,19 +354,17 @@ private void writeCountAndSum(
       }
     }
     if (data.hasSum()) {
-      writeNameAndLabels(
-          writer, getMetadataName(metadata, scheme), sumSuffix, data.getLabels(), scheme);
+      writeNameAndLabels(writer, sumName, null, data.getLabels(), scheme);
       writeDouble(writer, data.getSum());
       writeScrapeTimestampAndExemplar(writer, data, null, scheme);
     }
   }
 
   private void writeCreated(
-      Writer writer, MetricMetadata metadata, DataPointSnapshot data, EscapingScheme scheme)
+      Writer writer, String baseName, DataPointSnapshot data, EscapingScheme scheme)
       throws IOException {
     if (createdTimestampsEnabled && data.hasCreatedTimestamp()) {
-      writeNameAndLabels(
-          writer, getMetadataName(metadata, scheme), "_created", data.getLabels(), scheme);
+      writeNameAndLabels(writer, baseName, "_created", data.getLabels(), scheme);
       writeOpenMetricsTimestamp(writer, data.getCreatedTimestampMillis());
       if (data.hasScrapeTimestamp()) {
         writer.write(' ');
@@ -400,7 +400,7 @@ private void writeNameAndLabels(
       metricInsideBraces = true;
       writer.write('{');
     }
-    writeName(writer, name + (suffix != null ? suffix : ""), NameType.Metric);
+    writeName(writer, suffix != null ? name + suffix : name, NameType.Metric);
     if (!labels.isEmpty() || additionalLabelName != null) {
       writeLabels(
           writer,
@@ -415,7 +415,7 @@ private void writeNameAndLabels(
     writer.write(' ');
   }
 
-  private void writeScrapeTimestampAndExemplar(
+  void writeScrapeTimestampAndExemplar(
       Writer writer, DataPointSnapshot data, @Nullable Exemplar exemplar, EscapingScheme scheme)
       throws IOException {
     if (data.hasScrapeTimestamp()) {
@@ -423,39 +423,69 @@ private void writeScrapeTimestampAndExemplar(
       writeOpenMetricsTimestamp(writer, data.getScrapeTimestampMillis());
     }
     if (exemplar != null) {
-      writer.write(" # ");
-      writeLabels(writer, exemplar.getLabels(), null, 0, false, scheme);
-      writer.write(' ');
-      writeDouble(writer, exemplar.getValue());
-      if (exemplar.hasTimestamp()) {
-        writer.write(' ');
-        writeOpenMetricsTimestamp(writer, exemplar.getTimestampMillis());
-      }
+      writeExemplar(writer, exemplar, scheme);
     }
     writer.write('\n');
   }
 
+  void writeExemplar(Writer writer, Exemplar exemplar, EscapingScheme scheme) throws IOException {
+    writer.write(" # ");
+    writeLabels(writer, exemplar.getLabels(), null, 0, false, scheme);
+    writer.write(' ');
+    writeDouble(writer, exemplar.getValue());
+    if (exemplar.hasTimestamp()) {
+      writer.write(' ');
+      writeOpenMetricsTimestamp(writer, exemplar.getTimestampMillis());
+    }
+  }
+
+  /**
+   * Returns the full exposition name for a metric. If the original name already ends with the given
+   * suffix (e.g. "_total" for counters), uses the original name directly. Otherwise, appends the
+   * suffix to the base name.
+   */
+  private static String resolveExpositionName(
+      MetricMetadata metadata, String suffix, EscapingScheme scheme) {
+    String expositionBaseName = getExpositionBaseMetadataName(metadata, scheme);
+    if (expositionBaseName.endsWith(suffix)) {
+      return expositionBaseName;
+    }
+    return getMetadataName(metadata, scheme) + suffix;
+  }
+
   private void writeMetadata(
       Writer writer, String typeName, MetricMetadata metadata, EscapingScheme scheme)
       throws IOException {
+    writeMetadataWithName(writer, getMetadataName(metadata, scheme), typeName, metadata);
+  }
+
+  private void writeMetadataWithName(
+      Writer writer, String name, String typeName, MetricMetadata metadata) throws IOException {
     writer.write("# TYPE ");
-    writeName(writer, getMetadataName(metadata, scheme), NameType.Metric);
+    writeName(writer, name, NameType.Metric);
     writer.write(' ');
     writer.write(typeName);
     writer.write('\n');
     if (metadata.getUnit() != null) {
       writer.write("# UNIT ");
-      writeName(writer, getMetadataName(metadata, scheme), NameType.Metric);
+      writeName(writer, name, NameType.Metric);
       writer.write(' ');
       writeEscapedString(writer, metadata.getUnit().toString());
       writer.write('\n');
     }
     if (metadata.getHelp() != null && !metadata.getHelp().isEmpty()) {
       writer.write("# HELP ");
-      writeName(writer, getMetadataName(metadata, scheme), NameType.Metric);
+      writeName(writer, name, NameType.Metric);
       writer.write(' ');
       writeEscapedString(writer, metadata.getHelp());
       writer.write('\n');
     }
   }
+
+  private static String resolveBaseName(String fullName, String suffix) {
+    if (fullName.endsWith(suffix)) {
+      return fullName.substring(0, fullName.length() - suffix.length());
+    }
+    return fullName;
+  }
 }
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java
index 342beb255..d7f4e4469 100644
--- a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriter.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.expositionformats;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.io.IOException;
@@ -12,6 +13,7 @@
  *
  * <p>As of today, this is the only exposition format that supports native histograms.
  */
+@StableApi
 public class PrometheusProtobufWriter implements ExpositionFormatWriter {
 
   @Nullable private static final ExpositionFormatWriter DELEGATE = createProtobufWriter();
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java
index 73d33504e..f94d710ba 100644
--- a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/PrometheusTextFormatWriter.java
@@ -7,9 +7,12 @@
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writeName;
 import static io.prometheus.metrics.expositionformats.TextFormatUtil.writePrometheusTimestamp;
 import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.escapeMetricSnapshot;
+import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getExpositionBaseMetadataName;
+import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getLegacyGaugeName;
 import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getMetadataName;
 import static io.prometheus.metrics.model.snapshots.SnapshotEscaper.getSnapshotLabelName;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
@@ -38,6 +41,7 @@
  * Write the Prometheus text format. This is the default if you view a Prometheus endpoint with your
  * Web browser.
  */
+@StableApi
 public class PrometheusTextFormatWriter implements ExpositionFormatWriter {
 
   public static final String CONTENT_TYPE = "text/plain; version=0.0.4; charset=utf-8";
@@ -59,6 +63,9 @@ public Builder setIncludeCreatedTimestamps(boolean includeCreatedTimestamps) {
       return this;
     }
 
+    /**
+     * @deprecated Use {@link #build()} with the default millisecond timestamps instead.
+     */
     @Deprecated
     public Builder setTimestampsInMs(boolean timestampsInMs) {
       this.timestampsInMs = timestampsInMs;
@@ -115,13 +122,14 @@ public void write(OutputStream out, MetricSnapshots metricSnapshots, EscapingSch
     // "unknown", "gauge", "counter", "stateset", "info", "histogram", "gaugehistogram", and
     // "summary".
     Writer writer = new BufferedWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8));
-    for (MetricSnapshot s : metricSnapshots) {
+    MetricSnapshots merged = TextFormatUtil.mergeDuplicates(metricSnapshots);
+    for (MetricSnapshot s : merged) {
       MetricSnapshot snapshot = escapeMetricSnapshot(s, scheme);
       if (!snapshot.getDataPoints().isEmpty()) {
         if (snapshot instanceof CounterSnapshot) {
           writeCounter(writer, (CounterSnapshot) snapshot, scheme);
         } else if (snapshot instanceof GaugeSnapshot) {
-          writeGauge(writer, (GaugeSnapshot) snapshot, scheme);
+          writeGauge(writer, (GaugeSnapshot) snapshot, s.getMetadata().getOriginalName(), scheme);
         } else if (snapshot instanceof HistogramSnapshot) {
           writeHistogram(writer, (HistogramSnapshot) snapshot, scheme);
         } else if (snapshot instanceof SummarySnapshot) {
@@ -136,7 +144,7 @@ public void write(OutputStream out, MetricSnapshots metricSnapshots, EscapingSch
       }
     }
     if (writeCreatedTimestamps) {
-      for (MetricSnapshot s : metricSnapshots) {
+      for (MetricSnapshot s : merged) {
         MetricSnapshot snapshot = escapeMetricSnapshot(s, scheme);
         if (!snapshot.getDataPoints().isEmpty()) {
           if (snapshot instanceof CounterSnapshot) {
@@ -156,14 +164,17 @@ public void writeCreated(Writer writer, MetricSnapshot snapshot, EscapingScheme
       throws IOException {
     boolean metadataWritten = false;
     MetricMetadata metadata = snapshot.getMetadata();
+    String baseName = getMetadataName(metadata, scheme);
+    if (snapshot instanceof CounterSnapshot) {
+      baseName = resolveBaseName(resolveExpositionName(metadata, "_total", scheme), "_total");
+    }
     for (DataPointSnapshot data : snapshot.getDataPoints()) {
       if (data.hasCreatedTimestamp()) {
         if (!metadataWritten) {
-          writeMetadata(writer, "_created", "gauge", metadata, scheme);
+          writeMetadataWithFullName(writer, baseName + "_created", "gauge", metadata);
           metadataWritten = true;
         }
-        writeNameAndLabels(
-            writer, getMetadataName(metadata, scheme), "_created", data.getLabels(), scheme);
+        writeNameAndLabels(writer, baseName, "_created", data.getLabels(), scheme);
         writePrometheusTimestamp(writer, data.getCreatedTimestampMillis(), timestampsInMs);
         writeScrapeTimestampAndNewline(writer, data);
       }
@@ -174,22 +185,24 @@ private void writeCounter(Writer writer, CounterSnapshot snapshot, EscapingSchem
       throws IOException {
     if (!snapshot.getDataPoints().isEmpty()) {
       MetricMetadata metadata = snapshot.getMetadata();
-      writeMetadata(writer, "_total", "counter", metadata, scheme);
+      String counterName = resolveExpositionName(metadata, "_total", scheme);
+      writeMetadataWithFullName(writer, counterName, "counter", metadata);
       for (CounterSnapshot.CounterDataPointSnapshot data : snapshot.getDataPoints()) {
-        writeNameAndLabels(
-            writer, getMetadataName(metadata, scheme), "_total", data.getLabels(), scheme);
+        writeNameAndLabels(writer, counterName, null, data.getLabels(), scheme);
         writeDouble(writer, data.getValue());
         writeScrapeTimestampAndNewline(writer, data);
       }
     }
   }
 
-  private void writeGauge(Writer writer, GaugeSnapshot snapshot, EscapingScheme scheme)
+  private void writeGauge(
+      Writer writer, GaugeSnapshot snapshot, String rawOriginalName, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "", "gauge", metadata, scheme);
+    String gaugeName = getLegacyGaugeName(metadata, rawOriginalName, scheme);
+    writeMetadataWithFullName(writer, gaugeName, "gauge", metadata);
     for (GaugeSnapshot.GaugeDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(writer, getMetadataName(metadata, scheme), null, data.getLabels(), scheme);
+      writeNameAndLabels(writer, gaugeName, null, data.getLabels(), scheme);
       writeDouble(writer, data.getValue());
       writeScrapeTimestampAndNewline(writer, data);
     }
@@ -198,33 +211,29 @@ private void writeGauge(Writer writer, GaugeSnapshot snapshot, EscapingScheme sc
   private void writeHistogram(Writer writer, HistogramSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "", "histogram", metadata, scheme);
+    writeMetadata(writer, null, "histogram", metadata, scheme);
+    String name = getMetadataName(metadata, scheme);
+    String bucketName = name + "_bucket";
+    String countName = name + "_count";
+    String sumName = name + "_sum";
     for (HistogramSnapshot.HistogramDataPointSnapshot data : snapshot.getDataPoints()) {
       ClassicHistogramBuckets buckets = getClassicBuckets(data);
       long cumulativeCount = 0;
       for (int i = 0; i < buckets.size(); i++) {
         cumulativeCount += buckets.getCount(i);
         writeNameAndLabels(
-            writer,
-            getMetadataName(metadata, scheme),
-            "_bucket",
-            data.getLabels(),
-            scheme,
-            "le",
-            buckets.getUpperBound(i));
+            writer, bucketName, null, data.getLabels(), scheme, "le", buckets.getUpperBound(i));
         writeLong(writer, cumulativeCount);
         writeScrapeTimestampAndNewline(writer, data);
       }
       if (!snapshot.isGaugeHistogram()) {
         if (data.hasCount()) {
-          writeNameAndLabels(
-              writer, getMetadataName(metadata, scheme), "_count", data.getLabels(), scheme);
+          writeNameAndLabels(writer, countName, null, data.getLabels(), scheme);
           writeLong(writer, data.getCount());
           writeScrapeTimestampAndNewline(writer, data);
         }
         if (data.hasSum()) {
-          writeNameAndLabels(
-              writer, getMetadataName(metadata, scheme), "_sum", data.getLabels(), scheme);
+          writeNameAndLabels(writer, sumName, null, data.getLabels(), scheme);
           writeDouble(writer, data.getSum());
           writeScrapeTimestampAndNewline(writer, data);
         }
@@ -250,6 +259,9 @@ private void writeGaugeCountSum(
       throws IOException {
     // Prometheus text format does not support gaugehistogram's _gcount and _gsum.
     // So we append _gcount and _gsum as gauge metrics.
+    String baseName = getMetadataName(metadata, scheme);
+    String gaugeCountName = baseName + "_gcount";
+    String gaugeSumName = baseName + "_gsum";
     boolean metadataWritten = false;
     for (HistogramSnapshot.HistogramDataPointSnapshot data : snapshot.getDataPoints()) {
       if (data.hasCount()) {
@@ -257,8 +269,7 @@ private void writeGaugeCountSum(
           writeMetadata(writer, "_gcount", "gauge", metadata, scheme);
           metadataWritten = true;
         }
-        writeNameAndLabels(
-            writer, getMetadataName(metadata, scheme), "_gcount", data.getLabels(), scheme);
+        writeNameAndLabels(writer, gaugeCountName, null, data.getLabels(), scheme);
         writeLong(writer, data.getCount());
         writeScrapeTimestampAndNewline(writer, data);
       }
@@ -270,8 +281,7 @@ private void writeGaugeCountSum(
           writeMetadata(writer, "_gsum", "gauge", metadata, scheme);
           metadataWritten = true;
         }
-        writeNameAndLabels(
-            writer, getMetadataName(metadata, scheme), "_gsum", data.getLabels(), scheme);
+        writeNameAndLabels(writer, gaugeSumName, null, data.getLabels(), scheme);
         writeDouble(writer, data.getSum());
         writeScrapeTimestampAndNewline(writer, data);
       }
@@ -282,35 +292,30 @@ private void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingSchem
       throws IOException {
     boolean metadataWritten = false;
     MetricMetadata metadata = snapshot.getMetadata();
+    String name = getMetadataName(metadata, scheme);
+    String countName = name + "_count";
+    String sumName = name + "_sum";
     for (SummarySnapshot.SummaryDataPointSnapshot data : snapshot.getDataPoints()) {
       if (data.getQuantiles().size() == 0 && !data.hasCount() && !data.hasSum()) {
         continue;
       }
       if (!metadataWritten) {
-        writeMetadata(writer, "", "summary", metadata, scheme);
+        writeMetadata(writer, null, "summary", metadata, scheme);
         metadataWritten = true;
       }
       for (Quantile quantile : data.getQuantiles()) {
         writeNameAndLabels(
-            writer,
-            getMetadataName(metadata, scheme),
-            null,
-            data.getLabels(),
-            scheme,
-            "quantile",
-            quantile.getQuantile());
+            writer, name, null, data.getLabels(), scheme, "quantile", quantile.getQuantile());
         writeDouble(writer, quantile.getValue());
         writeScrapeTimestampAndNewline(writer, data);
       }
       if (data.hasCount()) {
-        writeNameAndLabels(
-            writer, getMetadataName(metadata, scheme), "_count", data.getLabels(), scheme);
+        writeNameAndLabels(writer, countName, null, data.getLabels(), scheme);
         writeLong(writer, data.getCount());
         writeScrapeTimestampAndNewline(writer, data);
       }
       if (data.hasSum()) {
-        writeNameAndLabels(
-            writer, getMetadataName(metadata, scheme), "_sum", data.getLabels(), scheme);
+        writeNameAndLabels(writer, sumName, null, data.getLabels(), scheme);
         writeDouble(writer, data.getSum());
         writeScrapeTimestampAndNewline(writer, data);
       }
@@ -320,10 +325,10 @@ private void writeSummary(Writer writer, SummarySnapshot snapshot, EscapingSchem
   private void writeInfo(Writer writer, InfoSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "_info", "gauge", metadata, scheme);
+    String infoName = resolveExpositionName(metadata, "_info", scheme);
+    writeMetadataWithFullName(writer, infoName, "gauge", metadata);
     for (InfoSnapshot.InfoDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(
-          writer, getMetadataName(metadata, scheme), "_info", data.getLabels(), scheme);
+      writeNameAndLabels(writer, infoName, null, data.getLabels(), scheme);
       writer.write("1");
       writeScrapeTimestampAndNewline(writer, data);
     }
@@ -332,10 +337,11 @@ private void writeInfo(Writer writer, InfoSnapshot snapshot, EscapingScheme sche
   private void writeStateSet(Writer writer, StateSetSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "", "gauge", metadata, scheme);
+    writeMetadata(writer, null, "gauge", metadata, scheme);
+    String name = getMetadataName(metadata, scheme);
     for (StateSetSnapshot.StateSetDataPointSnapshot data : snapshot.getDataPoints()) {
       for (int i = 0; i < data.size(); i++) {
-        writer.write(getMetadataName(metadata, scheme));
+        writer.write(name);
         writer.write('{');
         for (int j = 0; j < data.getLabels().size(); j++) {
           if (j > 0) {
@@ -349,7 +355,7 @@ private void writeStateSet(Writer writer, StateSetSnapshot snapshot, EscapingSch
         if (!data.getLabels().isEmpty()) {
           writer.write(",");
         }
-        writer.write(getMetadataName(metadata, scheme));
+        writer.write(name);
         writer.write("=\"");
         writeEscapedString(writer, data.getName(i));
         writer.write("\"} ");
@@ -366,9 +372,10 @@ private void writeStateSet(Writer writer, StateSetSnapshot snapshot, EscapingSch
   private void writeUnknown(Writer writer, UnknownSnapshot snapshot, EscapingScheme scheme)
       throws IOException {
     MetricMetadata metadata = snapshot.getMetadata();
-    writeMetadata(writer, "", "untyped", metadata, scheme);
+    writeMetadata(writer, null, "untyped", metadata, scheme);
+    String name = getMetadataName(metadata, scheme);
     for (UnknownSnapshot.UnknownDataPointSnapshot data : snapshot.getDataPoints()) {
-      writeNameAndLabels(writer, getMetadataName(metadata, scheme), null, data.getLabels(), scheme);
+      writeNameAndLabels(writer, name, null, data.getLabels(), scheme);
       writeDouble(writer, data.getValue());
       writeScrapeTimestampAndNewline(writer, data);
     }
@@ -400,7 +407,7 @@ private void writeNameAndLabels(
       metricInsideBraces = true;
       writer.write('{');
     }
-    writeName(writer, name + (suffix != null ? suffix : ""), NameType.Metric);
+    writeName(writer, suffix != null ? name + suffix : name, NameType.Metric);
     if (!labels.isEmpty() || additionalLabelName != null) {
       writeLabels(
           writer, labels, additionalLabelName, additionalLabelValue, metricInsideBraces, scheme);
@@ -417,7 +424,8 @@ private void writeMetadata(
       MetricMetadata metadata,
       EscapingScheme scheme)
       throws IOException {
-    String name = getMetadataName(metadata, scheme) + (suffix != null ? suffix : "");
+    String baseName = getMetadataName(metadata, scheme);
+    String name = suffix != null ? baseName + suffix : baseName;
     if (metadata.getHelp() != null && !metadata.getHelp().isEmpty()) {
       writer.write("# HELP ");
       writeName(writer, name, NameType.Metric);
@@ -432,6 +440,44 @@ private void writeMetadata(
     writer.write('\n');
   }
 
+  private void writeMetadataWithFullName(
+      Writer writer, String fullName, String typeString, MetricMetadata metadata)
+      throws IOException {
+    if (metadata.getHelp() != null && !metadata.getHelp().isEmpty()) {
+      writer.write("# HELP ");
+      writeName(writer, fullName, NameType.Metric);
+      writer.write(' ');
+      writeEscapedHelp(writer, metadata.getHelp());
+      writer.write('\n');
+    }
+    writer.write("# TYPE ");
+    writeName(writer, fullName, NameType.Metric);
+    writer.write(' ');
+    writer.write(typeString);
+    writer.write('\n');
+  }
+
+  /**
+   * Returns the full exposition name for a metric. If the original name already ends with the given
+   * suffix (e.g. "_total" for counters), uses the original name directly. Otherwise, appends the
+   * suffix to the base name.
+   */
+  private static String resolveExpositionName(
+      MetricMetadata metadata, String suffix, EscapingScheme scheme) {
+    String expositionBaseName = getExpositionBaseMetadataName(metadata, scheme);
+    if (expositionBaseName.endsWith(suffix)) {
+      return expositionBaseName;
+    }
+    return getMetadataName(metadata, scheme) + suffix;
+  }
+
+  private static String resolveBaseName(String fullName, String suffix) {
+    if (fullName.endsWith(suffix)) {
+      return fullName.substring(0, fullName.length() - suffix.length());
+    }
+    return fullName;
+  }
+
   private void writeEscapedHelp(Writer writer, String s) throws IOException {
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
diff --git a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java
index fb9d3f313..8cfed2b29 100644
--- a/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java
+++ b/prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java
@@ -1,17 +1,88 @@
 package io.prometheus.metrics.expositionformats;
 
 import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.InfoSnapshot;
 import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import io.prometheus.metrics.model.snapshots.PrometheusNaming;
 import io.prometheus.metrics.model.snapshots.SnapshotEscaper;
+import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
+import io.prometheus.metrics.model.snapshots.SummarySnapshot;
+import io.prometheus.metrics.model.snapshots.UnknownSnapshot;
 import java.io.IOException;
 import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import javax.annotation.Nullable;
 
+/**
+ * Utility methods for writing Prometheus text exposition formats.
+ *
+ * <p>This class provides low-level formatting utilities used by both Prometheus text format and
+ * OpenMetrics format writers. It handles escaping, label formatting, timestamp conversion, and
+ * merging of duplicate metric names.
+ */
 public class TextFormatUtil {
+  /**
+   * Merges snapshots with duplicate Prometheus names by combining their data points. This ensures
+   * only one HELP/TYPE declaration per metric family.
+   */
+  public static MetricSnapshots mergeDuplicates(MetricSnapshots metricSnapshots) {
+    if (metricSnapshots.size() <= 1) {
+      return metricSnapshots;
+    }
+
+    Map<String, List<MetricSnapshot>> grouped = new LinkedHashMap<>();
+
+    for (MetricSnapshot snapshot : metricSnapshots) {
+      String prometheusName = snapshot.getMetadata().getPrometheusName();
+      List<MetricSnapshot> list = grouped.get(prometheusName);
+      if (list == null) {
+        list = new ArrayList<>();
+        grouped.put(prometheusName, list);
+      }
+      list.add(snapshot);
+    }
+
+    MetricSnapshots.Builder builder = MetricSnapshots.builder();
+    for (List<MetricSnapshot> group : grouped.values()) {
+      if (group.size() == 1) {
+        builder.metricSnapshot(group.get(0));
+      } else {
+        MetricSnapshot merged = mergeSnapshots(group);
+        builder.metricSnapshot(merged);
+      }
+    }
+
+    return builder.build();
+  }
 
   static void writeLong(Writer writer, long value) throws IOException {
-    writer.append(Long.toString(value));
+    if (value == Long.MIN_VALUE) {
+      writer.write("-9223372036854775808");
+      return;
+    }
+    char[] buf = new char[20];
+    int pos = 20;
+    boolean negative = value < 0;
+    long v = negative ? -value : value;
+    do {
+      buf[--pos] = (char) ('0' + (v % 10));
+      v /= 10;
+    } while (v > 0);
+    if (negative) {
+      buf[--pos] = '-';
+    }
+    writer.write(buf, pos, 20 - pos);
   }
 
   static void writeDouble(Writer writer, double d) throws IOException {
@@ -21,7 +92,6 @@ static void writeDouble(Writer writer, double d) throws IOException {
       writer.write("-Inf");
     } else {
       writer.write(Double.toString(d));
-      // FloatingDecimal.getBinaryToASCIIConverter(d).appendTo(writer);
     }
   }
 
@@ -30,7 +100,7 @@ static void writePrometheusTimestamp(Writer writer, long timestampMs, boolean ti
     if (timestampsInMs) {
       // correct for prometheus exposition format
       // https://prometheus.io/docs/instrumenting/exposition_formats/#text-format-details
-      writer.write(Long.toString(timestampMs));
+      writeLong(writer, timestampMs);
     } else {
       // incorrect for prometheus exposition format -
       // but we need to support it for backwards compatibility
@@ -39,7 +109,7 @@ static void writePrometheusTimestamp(Writer writer, long timestampMs, boolean ti
   }
 
   static void writeOpenMetricsTimestamp(Writer writer, long timestampMs) throws IOException {
-    writer.write(Long.toString(timestampMs / 1000L));
+    writeLong(writer, timestampMs / 1000L);
     writer.write(".");
     long ms = timestampMs % 1000;
     if (ms < 100) {
@@ -48,7 +118,7 @@ static void writeOpenMetricsTimestamp(Writer writer, long timestampMs) throws IO
     if (ms < 10) {
       writer.write("0");
     }
-    writer.write(Long.toString(ms));
+    writeLong(writer, ms);
   }
 
   static void writeEscapedString(Writer writer, String s) throws IOException {
@@ -155,4 +225,81 @@ static void writeName(Writer writer, String name, NameType nameType) throws IOEx
     writeEscapedString(writer, name);
     writer.write('"');
   }
+
+  /**
+   * Merges multiple snapshots of the same type into a single snapshot with combined data points.
+   */
+  @SuppressWarnings("unchecked")
+  private static MetricSnapshot mergeSnapshots(List<MetricSnapshot> snapshots) {
+    MetricSnapshot first = snapshots.get(0);
+
+    int totalDataPoints = 0;
+    for (MetricSnapshot snapshot : snapshots) {
+      if (snapshot.getClass() != first.getClass()) {
+        throw new IllegalArgumentException(
+            "Cannot merge snapshots of different types: "
+                + first.getClass().getName()
+                + " and "
+                + snapshot.getClass().getName());
+      }
+      if (first instanceof HistogramSnapshot) {
+        HistogramSnapshot histogramFirst = (HistogramSnapshot) first;
+        HistogramSnapshot histogramSnapshot = (HistogramSnapshot) snapshot;
+        if (histogramFirst.isGaugeHistogram() != histogramSnapshot.isGaugeHistogram()) {
+          throw new IllegalArgumentException(
+              "Cannot merge histograms: gauge histogram and classic histogram");
+        }
+      }
+      // Validate metadata consistency so we don't silently pick one help/unit when they differ.
+      if (!Objects.equals(
+          first.getMetadata().getPrometheusName(), snapshot.getMetadata().getPrometheusName())) {
+        throw new IllegalArgumentException("Cannot merge snapshots: inconsistent metric name");
+      }
+      if (!Objects.equals(first.getMetadata().getUnit(), snapshot.getMetadata().getUnit())) {
+        throw new IllegalArgumentException(
+            "Cannot merge snapshots: conflicting unit for metric "
+                + first.getMetadata().getPrometheusName());
+      }
+      totalDataPoints += snapshot.getDataPoints().size();
+    }
+
+    List<DataPointSnapshot> allDataPoints = new ArrayList<>(totalDataPoints);
+    for (MetricSnapshot snapshot : snapshots) {
+      allDataPoints.addAll(snapshot.getDataPoints());
+    }
+
+    if (first instanceof CounterSnapshot) {
+      return new CounterSnapshot(
+          first.getMetadata(),
+          (Collection<CounterSnapshot.CounterDataPointSnapshot>) (Object) allDataPoints);
+    } else if (first instanceof GaugeSnapshot) {
+      return new GaugeSnapshot(
+          first.getMetadata(),
+          (Collection<GaugeSnapshot.GaugeDataPointSnapshot>) (Object) allDataPoints);
+    } else if (first instanceof HistogramSnapshot) {
+      HistogramSnapshot histFirst = (HistogramSnapshot) first;
+      return new HistogramSnapshot(
+          histFirst.isGaugeHistogram(),
+          first.getMetadata(),
+          (Collection<HistogramSnapshot.HistogramDataPointSnapshot>) (Object) allDataPoints);
+    } else if (first instanceof SummarySnapshot) {
+      return new SummarySnapshot(
+          first.getMetadata(),
+          (Collection<SummarySnapshot.SummaryDataPointSnapshot>) (Object) allDataPoints);
+    } else if (first instanceof InfoSnapshot) {
+      return new InfoSnapshot(
+          first.getMetadata(),
+          (Collection<InfoSnapshot.InfoDataPointSnapshot>) (Object) allDataPoints);
+    } else if (first instanceof StateSetSnapshot) {
+      return new StateSetSnapshot(
+          first.getMetadata(),
+          (Collection<StateSetSnapshot.StateSetDataPointSnapshot>) (Object) allDataPoints);
+    } else if (first instanceof UnknownSnapshot) {
+      return new UnknownSnapshot(
+          first.getMetadata(),
+          (Collection<UnknownSnapshot.UnknownDataPointSnapshot>) (Object) allDataPoints);
+    } else {
+      throw new IllegalArgumentException("Unknown snapshot type: " + first.getClass().getName());
+    }
+  }
 }
diff --git a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesExpositionTest.java b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesExpositionTest.java
new file mode 100644
index 000000000..db564d479
--- /dev/null
+++ b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/DuplicateNamesExpositionTest.java
@@ -0,0 +1,259 @@
+package io.prometheus.metrics.expositionformats;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.model.registry.Collector;
+import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import org.junit.jupiter.api.Test;
+
+@SuppressWarnings("deprecation")
+class DuplicateNamesExpositionTest {
+
+  private static PrometheusRegistry getPrometheusRegistry() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                        .value(100)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/hello", "outcome", "FAILURE", "error", "TIMEOUT"))
+                        .value(10)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+    return registry;
+  }
+
+  @Test
+  void testDuplicateNames_differentLabels_producesValidOutput() throws IOException {
+    PrometheusRegistry registry = getPrometheusRegistry();
+
+    MetricSnapshots snapshots = registry.scrape();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusTextFormatWriter writer = PrometheusTextFormatWriter.create();
+    writer.write(out, snapshots);
+    String output = out.toString(UTF_8);
+
+    String expected =
+        """
+        # HELP api_responses_total API responses
+        # TYPE api_responses_total counter
+        api_responses_total{error="TIMEOUT",outcome="FAILURE",uri="/hello"} 10.0
+        api_responses_total{outcome="SUCCESS",uri="/hello"} 100.0
+        """;
+
+    assertThat(output).isEqualTo(expected);
+  }
+
+  @Test
+  void testDuplicateNames_multipleDataPoints_producesValidOutput() throws IOException {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                        .value(100)
+                        .build())
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/world", "outcome", "SUCCESS"))
+                        .value(200)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/hello", "outcome", "FAILURE", "error", "TIMEOUT"))
+                        .value(10)
+                        .build())
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/world", "outcome", "FAILURE", "error", "NOT_FOUND"))
+                        .value(5)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    MetricSnapshots snapshots = registry.scrape();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusTextFormatWriter writer = PrometheusTextFormatWriter.create();
+    writer.write(out, snapshots);
+    String output = out.toString(UTF_8);
+
+    String expected =
+        """
+        # HELP api_responses_total API responses
+        # TYPE api_responses_total counter
+        api_responses_total{error="NOT_FOUND",outcome="FAILURE",uri="/world"} 5.0
+        api_responses_total{error="TIMEOUT",outcome="FAILURE",uri="/hello"} 10.0
+        api_responses_total{outcome="SUCCESS",uri="/hello"} 100.0
+        api_responses_total{outcome="SUCCESS",uri="/world"} 200.0
+        """;
+    assertThat(output).isEqualTo(expected);
+  }
+
+  @Test
+  void testOpenMetricsFormat_withDuplicateNames() throws IOException {
+    PrometheusRegistry registry = getPrometheusRegistry();
+
+    MetricSnapshots snapshots = registry.scrape();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    OpenMetricsTextFormatWriter writer = new OpenMetricsTextFormatWriter(false, false);
+    writer.write(out, snapshots);
+    String output = out.toString(UTF_8);
+
+    String expected =
+        """
+        # TYPE api_responses counter
+        # HELP api_responses API responses
+        api_responses_total{error="TIMEOUT",outcome="FAILURE",uri="/hello"} 10.0
+        api_responses_total{outcome="SUCCESS",uri="/hello"} 100.0
+        # EOF
+        """;
+    assertThat(output).isEqualTo(expected);
+  }
+
+  @Test
+  void testDuplicateNames_withCreatedTimestamps_emitsSingleHelpTypeAndNoDuplicateCreatedSeries()
+      throws IOException {
+    long createdTs = 1672850385800L;
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                        .value(100)
+                        .createdTimestampMillis(createdTs)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    registry.register(
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder()
+                .name("api_responses")
+                .help("API responses")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .labels(
+                            Labels.of("uri", "/hello", "outcome", "FAILURE", "error", "TIMEOUT"))
+                        .value(10)
+                        .createdTimestampMillis(createdTs + 1000)
+                        .build())
+                .build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "api_responses";
+          }
+        });
+
+    MetricSnapshots snapshots = registry.scrape();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    PrometheusTextFormatWriter writer =
+        PrometheusTextFormatWriter.builder().setIncludeCreatedTimestamps(true).build();
+    writer.write(out, snapshots);
+    String output = out.toString(UTF_8);
+
+    // Merged snapshots: one metric family with two data points. Created-timestamp section uses
+    // merged snapshots too, so single HELP/TYPE for _created and one _created line per label set.
+    String expected =
+        """
+        # HELP api_responses_total API responses
+        # TYPE api_responses_total counter
+        api_responses_total{error="TIMEOUT",outcome="FAILURE",uri="/hello"} 10.0
+        api_responses_total{outcome="SUCCESS",uri="/hello"} 100.0
+        # HELP api_responses_created API responses
+        # TYPE api_responses_created gauge
+        api_responses_created{error="TIMEOUT",outcome="FAILURE",uri="/hello"} 1672850386800
+        api_responses_created{outcome="SUCCESS",uri="/hello"} 1672850385800
+        """;
+
+    assertThat(output).isEqualTo(expected);
+  }
+}
diff --git a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java
index 8a31e41b1..c875b94b0 100644
--- a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java
+++ b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java
@@ -4,6 +4,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.config.OpenMetrics2Properties;
+import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot.CounterDataPointSnapshot;
@@ -106,10 +108,203 @@ void init() {
     assertThat(formats.getOpenMetricsTextFormatWriter()).isNotNull();
     assertThat(formats.getPrometheusProtobufWriter()).isNotNull();
     assertThat(formats.getPrometheusTextFormatWriter()).isNotNull();
+    assertThat(formats.getOpenMetrics2TextFormatWriter()).isNotNull();
   }
 
   @Test
-  public void testCounterComplete() throws IOException {
+  void testOM2DisabledByDefault() {
+    ExpositionFormats formats = ExpositionFormats.init();
+    ExpositionFormatWriter writer = formats.findWriter("application/openmetrics-text");
+    assertThat(writer).isInstanceOf(OpenMetricsTextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2EnabledOnly() {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(OpenMetrics2Properties.builder().enabled(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer = formats.findWriter("application/openmetrics-text");
+    assertThat(writer).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2NotEnabledByFeatureFlagAlone() {
+    // Feature flags without enabled=true should not activate the OM2 writer
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().contentNegotiation(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer = formats.findWriter("application/openmetrics-text");
+    assertThat(writer).isInstanceOf(OpenMetricsTextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2EnabledWithFeatureFlags() {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder()
+                    .enabled(true)
+                    .contentNegotiation(true)
+                    .compositeValues(true)
+                    .nativeHistograms(true)
+                    .build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter("application/openmetrics-text; version=2.0.0");
+    assertThat(writer).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationWithNativeHistogramOutput() throws IOException {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder()
+                    .enabled(true)
+                    .contentNegotiation(true)
+                    .nativeHistograms(true)
+                    .build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter("application/openmetrics-text; version=2.0.0");
+
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    writer.write(
+        out,
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("latency_seconds")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(1.5)
+                        .nativeSchema(5)
+                        .nativeZeroCount(1)
+                        .nativeBucketsForPositiveValues(
+                            NativeHistogramBuckets.builder().bucket(2, 3).build())
+                        .build())
+                .build()),
+        EscapingScheme.ALLOW_UTF8);
+
+    assertThat(writer).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+    assertThat(out.toString(UTF_8))
+        .isEqualTo(
+            "# TYPE latency_seconds histogram\n"
+                + "latency_seconds {count:4,sum:1.5,schema:5,zero_threshold:0.0,zero_count:1,"
+                + "positive_spans:[2:1],positive_buckets:[3]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testProtobufWriterTakesPrecedence() {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(OpenMetrics2Properties.builder().enabled(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter(
+            "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily");
+    // Protobuf writer should take precedence even when OM2 is enabled
+    assertThat(writer).isInstanceOf(PrometheusProtobufWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationWithVersion2() {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().enabled(true).contentNegotiation(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter("application/openmetrics-text; version=2.0.0");
+    assertThat(writer).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationWithVersion1() {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().enabled(true).contentNegotiation(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter("application/openmetrics-text; version=1.0.0");
+    assertThat(writer).isInstanceOf(OpenMetricsTextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationWithNoVersion() {
+    // When contentNegotiation=true and Accept header has no version, use OM1 writer
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().enabled(true).contentNegotiation(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer = formats.findWriter("application/openmetrics-text");
+    assertThat(writer).isInstanceOf(OpenMetricsTextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationDisabled() {
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().enabled(true).contentNegotiation(false).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer1 = formats.findWriter("application/openmetrics-text");
+    ExpositionFormatWriter writer2 =
+        formats.findWriter("application/openmetrics-text; version=1.0.0");
+    ExpositionFormatWriter writer3 =
+        formats.findWriter("application/openmetrics-text; version=2.0.0");
+    assertThat(writer1).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+    assertThat(writer2).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+    assertThat(writer3).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationMultiTypeAcceptHeaderWithoutOMVersion() {
+    // When the Accept header has multiple media types and only text/plain has a version,
+    // the openmetrics type should be treated as having no version (use OM1).
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().enabled(true).contentNegotiation(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter("application/openmetrics-text, text/plain; version=0.0.4");
+    assertThat(writer).isInstanceOf(OpenMetricsTextFormatWriter.class);
+  }
+
+  @Test
+  void testOM2ContentNegotiationMultiTypeAcceptHeaderWithOMVersion() {
+    // When the Accept header has multiple media types and openmetrics has version=2.0.0,
+    // the OM2 writer should be selected.
+    PrometheusProperties props =
+        PrometheusProperties.builder()
+            .openMetrics2Properties(
+                OpenMetrics2Properties.builder().enabled(true).contentNegotiation(true).build())
+            .build();
+    ExpositionFormats formats = ExpositionFormats.init(props);
+    ExpositionFormatWriter writer =
+        formats.findWriter(
+            "application/openmetrics-text; version=2.0.0, text/plain; version=0.0.4");
+    assertThat(writer).isInstanceOf(OpenMetrics2TextFormatWriter.class);
+  }
+
+  @Test
+  void testCounterComplete() throws IOException {
     String openMetricsText =
         "# TYPE service:time_seconds counter\n"
             + "# UNIT service:time_seconds seconds\n"
@@ -239,7 +434,7 @@ public void testCounterComplete() throws IOException {
   }
 
   @Test
-  public void testCounterMinimal() throws IOException {
+  void testCounterMinimal() throws IOException {
     String openMetricsText =
         """
         # TYPE my_counter counter
@@ -266,7 +461,7 @@ public void testCounterMinimal() throws IOException {
   }
 
   @Test
-  public void testCounterWithDots() throws IOException {
+  void testCounterWithDots() throws IOException {
     String openMetricsText =
         """
         # TYPE U__my_2e_request_2e_count counter
@@ -308,7 +503,7 @@ public void testCounterWithDots() throws IOException {
   }
 
   @Test
-  public void testGaugeComplete() throws IOException {
+  void testGaugeComplete() throws IOException {
     String openMetricsText =
         "# TYPE disk_usage_ratio gauge\n"
             + "# UNIT disk_usage_ratio ratio\n"
@@ -389,7 +584,7 @@ public void testGaugeComplete() throws IOException {
   }
 
   @Test
-  public void testGaugeMinimal() throws IOException {
+  void testGaugeMinimal() throws IOException {
     String openMetricsText =
         """
         # TYPE temperature_centigrade gauge
@@ -416,7 +611,7 @@ public void testGaugeMinimal() throws IOException {
   }
 
   @Test
-  public void testGaugeWithDots() throws IOException {
+  void testGaugeWithDots() throws IOException {
     String openMetricsText =
         """
         # TYPE U__my_2e_temperature_2e_celsius gauge
@@ -472,7 +667,87 @@ public void testGaugeWithDots() throws IOException {
   }
 
   @Test
-  public void testGaugeUTF8() throws IOException {
+  void testGaugeReservedSuffixCompatibilityWithAlternateEscapingSchemes() throws IOException {
+    GaugeSnapshot totalGauge =
+        GaugeSnapshot.builder()
+            .name("legacy.name.total")
+            .dataPoint(GaugeDataPointSnapshot.builder().value(6).build())
+            .build();
+    assertPrometheusText(
+        """
+        # TYPE legacy_dot_name gauge
+        legacy_dot_name 6.0
+        """,
+        totalGauge,
+        EscapingScheme.DOTS_ESCAPING);
+    assertPrometheusText(
+        """
+        # TYPE U__legacy_2e_name gauge
+        U__legacy_2e_name 6.0
+        """,
+        totalGauge,
+        EscapingScheme.VALUE_ENCODING_ESCAPING);
+  }
+
+  @Test
+  void testGaugeReservedSuffixCompatibilityOutsideOpenMetrics() throws IOException {
+    GaugeSnapshot createdGauge =
+        GaugeSnapshot.builder()
+            .name("test3.created")
+            .dataPoint(GaugeDataPointSnapshot.builder().value(3).build())
+            .build();
+    assertOpenMetricsText(
+        """
+        # TYPE U__test3_2e_created gauge
+        U__test3_2e_created 3.0
+        # EOF
+        """,
+        createdGauge);
+    assertPrometheusText(
+        """
+        # TYPE test3 gauge
+        test3 3.0
+        """,
+        createdGauge);
+    assertPrometheusTextWithoutCreated(
+        """
+        # TYPE test3 gauge
+        test3 3.0
+        """,
+        createdGauge);
+    assertPrometheusProtobuf(
+        "name: \"test3\" type: GAUGE metric { gauge { value: 3.0 } }", createdGauge);
+
+    GaugeSnapshot totalGauge =
+        GaugeSnapshot.builder()
+            .name("test6.total")
+            .dataPoint(GaugeDataPointSnapshot.builder().value(6).build())
+            .build();
+    assertOpenMetricsText(
+        """
+        # TYPE U__test6_2e_total gauge
+        U__test6_2e_total 6.0
+        # EOF
+        """,
+        totalGauge);
+    assertPrometheusText(
+        """
+        # TYPE test6 gauge
+        test6 6.0
+        """,
+        totalGauge);
+    assertPrometheusTextWithoutCreated(
+        """
+        # TYPE test6 gauge
+        test6 6.0
+        """,
+        totalGauge);
+    assertPrometheusProtobuf(
+        "name: \"test6\" type: GAUGE metric { gauge { value: 6.0 } }", totalGauge);
+  }
+
+  @Test
+  void testGaugeUTF8() throws IOException {
     String prometheusText =
         """
         # HELP "gauge.name" gauge\\ndoc\\nstr"ing
@@ -506,7 +781,7 @@ public void testGaugeUTF8() throws IOException {
   }
 
   @Test
-  public void testSummaryComplete() throws IOException {
+  void testSummaryComplete() throws IOException {
     String openMetricsText =
         "# TYPE http_request_duration_seconds summary\n"
             + "# UNIT http_request_duration_seconds seconds\n"
@@ -799,7 +1074,7 @@ public void testSummaryComplete() throws IOException {
   }
 
   @Test
-  public void testSummaryWithoutQuantiles() throws IOException {
+  void testSummaryWithoutQuantiles() throws IOException {
     String openMetricsText =
         """
         # TYPE latency_seconds summary
@@ -843,7 +1118,7 @@ public void testSummaryWithoutQuantiles() throws IOException {
   }
 
   @Test
-  public void testSummaryNoCountAndSum() throws IOException {
+  void testSummaryNoCountAndSum() throws IOException {
     String openMetricsText =
         """
         # TYPE latency_seconds summary
@@ -881,7 +1156,7 @@ public void testSummaryNoCountAndSum() throws IOException {
   }
 
   @Test
-  public void testSummaryJustCount() throws IOException {
+  void testSummaryJustCount() throws IOException {
     String openMetricsText =
         """
         # TYPE latency_seconds summary
@@ -916,7 +1191,7 @@ public void testSummaryJustCount() throws IOException {
   }
 
   @Test
-  public void testSummaryJustSum() throws IOException {
+  void testSummaryJustSum() throws IOException {
     String openMetricsText =
         """
         # TYPE latency_seconds summary
@@ -951,7 +1226,7 @@ public void testSummaryJustSum() throws IOException {
   }
 
   @Test
-  public void testSummaryEmptyData() throws IOException {
+  void testSummaryEmptyData() throws IOException {
     // SummaryData can be present but empty (no count, no sum, no quantiles).
     // This should be treated like no data is present.
     SummarySnapshot summary =
@@ -969,7 +1244,7 @@ public void testSummaryEmptyData() throws IOException {
   }
 
   @Test
-  public void testSummaryEmptyAndNonEmpty() throws IOException {
+  void testSummaryEmptyAndNonEmpty() throws IOException {
     String openMetricsText =
         """
         # TYPE latency_seconds summary
@@ -1015,7 +1290,7 @@ public void testSummaryEmptyAndNonEmpty() throws IOException {
   }
 
   @Test
-  public void testSummaryWithDots() throws IOException {
+  void testSummaryWithDots() throws IOException {
     String openMetricsText =
         """
         # TYPE U__my_2e_request_2e_duration_2e_seconds summary
@@ -1073,7 +1348,7 @@ public void testSummaryWithDots() throws IOException {
   }
 
   @Test
-  public void testClassicHistogramComplete() throws Exception {
+  void testClassicHistogramComplete() throws Exception {
     String openMetricsText =
         "# TYPE response_size_bytes histogram\n"
             + "# UNIT response_size_bytes bytes\n"
@@ -1379,7 +1654,7 @@ public void testClassicHistogramComplete() throws Exception {
   }
 
   @Test
-  public void testClassicHistogramMinimal() throws Exception {
+  void testClassicHistogramMinimal() throws Exception {
     // In OpenMetrics a histogram can have a _count if and only if it has a _sum.
     // In Prometheus format, a histogram can have a _count without a _sum.
     String openMetricsText =
@@ -1427,7 +1702,7 @@ public void testClassicHistogramMinimal() throws Exception {
   }
 
   @Test
-  public void testClassicHistogramMinimalWithDots() throws Exception {
+  void testClassicHistogramMinimalWithDots() throws Exception {
     String openMetricsText =
         """
         # TYPE "request.latency_seconds" histogram
@@ -1458,7 +1733,7 @@ public void testClassicHistogramMinimalWithDots() throws Exception {
   }
 
   @Test
-  public void testClassicHistogramCountAndSum() throws Exception {
+  void testClassicHistogramCountAndSum() throws Exception {
     String openMetricsText =
         """
         # TYPE request_latency_seconds histogram
@@ -1509,7 +1784,7 @@ public void testClassicHistogramCountAndSum() throws Exception {
   }
 
   @Test
-  public void testClassicGaugeHistogramComplete() throws IOException {
+  void testClassicGaugeHistogramComplete() throws IOException {
     String openMetricsText =
         "# TYPE cache_size_bytes gaugehistogram\n"
             + "# UNIT cache_size_bytes bytes\n"
@@ -1805,7 +2080,7 @@ public void testClassicGaugeHistogramComplete() throws IOException {
   }
 
   @Test
-  public void testClassicGaugeHistogramMinimal() throws IOException {
+  void testClassicGaugeHistogramMinimal() throws IOException {
     // In OpenMetrics a histogram can have a _count if and only if it has a _sum.
     // In Prometheus format, a histogram can have a _count without a _sum.
     String openMetricsText =
@@ -1855,7 +2130,7 @@ public void testClassicGaugeHistogramMinimal() throws IOException {
   }
 
   @Test
-  public void testClassicGaugeHistogramCountAndSum() throws IOException {
+  void testClassicGaugeHistogramCountAndSum() throws IOException {
     String openMetricsText =
         """
         # TYPE queue_size_bytes gaugehistogram
@@ -1909,17 +2184,17 @@ public void testClassicGaugeHistogramCountAndSum() throws IOException {
   }
 
   @Test
-  public void testClassicHistogramWithDots() throws IOException {
+  void testClassicHistogramWithDots() throws IOException {
     String openMetricsText =
         """
-      # TYPE U__my_2e_request_2e_duration_2e_seconds histogram
-      # UNIT U__my_2e_request_2e_duration_2e_seconds seconds
-      # HELP U__my_2e_request_2e_duration_2e_seconds Request duration in seconds
-      U__my_2e_request_2e_duration_2e_seconds_bucket{U__http_2e_path="/hello",le="+Inf"} 130 # {U__some_2e_exemplar_2e_key="some value"} 3.0 1690298864.383
-      U__my_2e_request_2e_duration_2e_seconds_count{U__http_2e_path="/hello"} 130
-      U__my_2e_request_2e_duration_2e_seconds_sum{U__http_2e_path="/hello"} 0.01
-      # EOF
-      """;
+        # TYPE U__my_2e_request_2e_duration_2e_seconds histogram
+        # UNIT U__my_2e_request_2e_duration_2e_seconds seconds
+        # HELP U__my_2e_request_2e_duration_2e_seconds Request duration in seconds
+        U__my_2e_request_2e_duration_2e_seconds_bucket{U__http_2e_path="/hello",le="+Inf"} 130 # {U__some_2e_exemplar_2e_key="some value"} 3.0 1690298864.383
+        U__my_2e_request_2e_duration_2e_seconds_count{U__http_2e_path="/hello"} 130
+        U__my_2e_request_2e_duration_2e_seconds_sum{U__http_2e_path="/hello"} 0.01
+        # EOF
+        """;
     String openMetricsTextWithExemplarsOnAllTimeSeries =
         "# TYPE my_request_duration_seconds histogram\n"
             + "# UNIT my_request_duration_seconds seconds\n"
@@ -1981,7 +2256,7 @@ public void testClassicHistogramWithDots() throws IOException {
   }
 
   @Test
-  public void testNativeHistogramComplete() throws IOException {
+  void testNativeHistogramComplete() throws IOException {
     String openMetricsText =
         "# TYPE response_size_bytes histogram\n"
             + "# UNIT response_size_bytes bytes\n"
@@ -2292,7 +2567,7 @@ public void testNativeHistogramComplete() throws IOException {
   }
 
   @Test
-  public void testNativeHistogramMinimal() throws IOException {
+  void testNativeHistogramMinimal() throws IOException {
     String openMetricsText =
         """
         # TYPE latency_seconds histogram
@@ -2330,17 +2605,17 @@ public void testNativeHistogramMinimal() throws IOException {
   }
 
   @Test
-  public void testNativeHistogramWithDots() throws IOException {
+  void testNativeHistogramWithDots() throws IOException {
     String openMetricsText =
         """
-      # TYPE U__my_2e_request_2e_duration_2e_seconds histogram
-      # UNIT U__my_2e_request_2e_duration_2e_seconds seconds
-      # HELP U__my_2e_request_2e_duration_2e_seconds Request duration in seconds
-      U__my_2e_request_2e_duration_2e_seconds_bucket{U__http_2e_path="/hello",le="+Inf"} 4 # {U__some_2e_exemplar_2e_key="some value"} 3.0 1690298864.383
-      U__my_2e_request_2e_duration_2e_seconds_count{U__http_2e_path="/hello"} 4
-      U__my_2e_request_2e_duration_2e_seconds_sum{U__http_2e_path="/hello"} 3.2
-      # EOF
-      """;
+        # TYPE U__my_2e_request_2e_duration_2e_seconds histogram
+        # UNIT U__my_2e_request_2e_duration_2e_seconds seconds
+        # HELP U__my_2e_request_2e_duration_2e_seconds Request duration in seconds
+        U__my_2e_request_2e_duration_2e_seconds_bucket{U__http_2e_path="/hello",le="+Inf"} 4 # {U__some_2e_exemplar_2e_key="some value"} 3.0 1690298864.383
+        U__my_2e_request_2e_duration_2e_seconds_count{U__http_2e_path="/hello"} 4
+        U__my_2e_request_2e_duration_2e_seconds_sum{U__http_2e_path="/hello"} 3.2
+        # EOF
+        """;
     String openMetricsTextWithExemplarsOnAllTimeSeries =
         "# TYPE my_request_duration_seconds histogram\n"
             + "# UNIT my_request_duration_seconds seconds\n"
@@ -2409,7 +2684,7 @@ public void testNativeHistogramWithDots() throws IOException {
   // TODO: Gauge Native Histogram
 
   @Test
-  public void testInfo() throws IOException {
+  void testInfo() throws IOException {
     String openMetrics =
         """
         # TYPE version info
@@ -2439,7 +2714,7 @@ public void testInfo() throws IOException {
   }
 
   @Test
-  public void testInfoWithDots() throws IOException {
+  void testInfoWithDots() throws IOException {
     String openMetricsText =
         """
         # TYPE U__jvm_2e_status info
@@ -2478,7 +2753,7 @@ public void testInfoWithDots() throws IOException {
   }
 
   @Test
-  public void testStateSetComplete() throws IOException {
+  void testStateSetComplete() throws IOException {
     String openMetrics =
         "# TYPE state stateset\n"
             + "# HELP state complete state set example\n"
@@ -2536,7 +2811,7 @@ public void testStateSetComplete() throws IOException {
   }
 
   @Test
-  public void testStateSetMinimal() throws IOException {
+  void testStateSetMinimal() throws IOException {
     String openMetrics =
         """
         # TYPE state stateset
@@ -2566,7 +2841,7 @@ public void testStateSetMinimal() throws IOException {
   }
 
   @Test
-  public void testStateSetWithDots() throws IOException {
+  void testStateSetWithDots() throws IOException {
     String openMetricsText =
         """
         # TYPE U__my_2e_application_2e_state stateset
@@ -2614,7 +2889,7 @@ public void testStateSetWithDots() throws IOException {
   }
 
   @Test
-  public void testUnknownComplete() throws IOException {
+  void testUnknownComplete() throws IOException {
     String openMetrics =
         "# TYPE my_special_thing_bytes unknown\n"
             + "# UNIT my_special_thing_bytes bytes\n"
@@ -2679,7 +2954,7 @@ public void testUnknownComplete() throws IOException {
   }
 
   @Test
-  public void testUnknownMinimal() throws IOException {
+  void testUnknownMinimal() throws IOException {
     String openMetrics =
         """
         # TYPE other unknown
@@ -2703,7 +2978,7 @@ public void testUnknownMinimal() throws IOException {
   }
 
   @Test
-  public void testUnknownWithDots() throws IOException {
+  void testUnknownWithDots() throws IOException {
     String openMetrics =
         """
         # TYPE U__some_2e_unknown_2e_metric__bytes unknown
@@ -2756,7 +3031,7 @@ public void testUnknownWithDots() throws IOException {
   }
 
   @Test
-  public void testHelpEscape() throws IOException {
+  void testHelpEscape() throws IOException {
     String openMetrics =
         """
         # TYPE test counter
@@ -2783,7 +3058,7 @@ public void testHelpEscape() throws IOException {
   }
 
   @Test
-  public void testLabelValueEscape() throws IOException {
+  void testLabelValueEscape() throws IOException {
     String openMetrics =
         """
         # TYPE test counter
@@ -2811,12 +3086,19 @@ public void testLabelValueEscape() throws IOException {
 
   @ParameterizedTest
   @CsvSource({
-    "'application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited', 'application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=underscores'",
+    "'application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited',"
+        + " 'application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily;"
+        + " encoding=delimited; escaping=underscores'",
     "'text/plain;version=0.0.4', 'text/plain; version=0.0.4; charset=utf-8; escaping=underscores'",
-    "'application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited; escaping=allow-utf-8', 'application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=allow-utf-8'",
-    "'application/openmetrics-text', 'application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=underscores'",
-    "'application/openmetrics-text;version=0.0.1; escaping=underscores', 'application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=underscores'",
-    "'text/plain;version=0.0.4; escaping=allow-utf-8', 'text/plain; version=0.0.4; charset=utf-8; escaping=allow-utf-8'"
+    "'application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited;"
+        + " escaping=allow-utf-8', 'application/vnd.google.protobuf;"
+        + " proto=io.prometheus.client.MetricFamily; encoding=delimited; escaping=allow-utf-8'",
+    "'application/openmetrics-text', 'application/openmetrics-text; version=1.0.0; charset=utf-8;"
+        + " escaping=underscores'",
+    "'application/openmetrics-text;version=0.0.1; escaping=underscores',"
+        + " 'application/openmetrics-text; version=1.0.0; charset=utf-8; escaping=underscores'",
+    "'text/plain;version=0.0.4; escaping=allow-utf-8', 'text/plain; version=0.0.4; charset=utf-8;"
+        + " escaping=allow-utf-8'"
   })
   public void testFindWriter(String acceptHeaderValue, String expectedFmt) {
     ExpositionFormats expositionFormats = ExpositionFormats.init();
@@ -2826,7 +3108,7 @@ public void testFindWriter(String acceptHeaderValue, String expectedFmt) {
   }
 
   @Test
-  public void testWrite() throws IOException {
+  void testWrite() throws IOException {
     ByteArrayOutputStream buff = new ByteArrayOutputStream(new AtomicInteger(2 << 9).get() + 1024);
     ExpositionFormats expositionFormats = ExpositionFormats.init();
     UnknownSnapshot unknown =
@@ -2845,9 +3127,9 @@ public void testWrite() throws IOException {
 
     String expected =
         """
-      # TYPE foo_metric untyped
-      foo_metric 1.234
-      """;
+        # TYPE foo_metric untyped
+        foo_metric 1.234
+        """;
 
     assertThat(new String(out, UTF_8)).hasToString(expected);
   }
@@ -2886,9 +3168,14 @@ private void assertOpenMetricsTextWithoutCreated(String expected, MetricSnapshot
   }
 
   private void assertPrometheusText(String expected, MetricSnapshot snapshot) throws IOException {
+    assertPrometheusText(expected, snapshot, EscapingScheme.UNDERSCORE_ESCAPING);
+  }
+
+  private void assertPrometheusText(
+      String expected, MetricSnapshot snapshot, EscapingScheme escapingScheme) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     getPrometheusWriter(PrometheusTextFormatWriter.builder().setIncludeCreatedTimestamps(true))
-        .write(out, MetricSnapshots.of(snapshot), EscapingScheme.UNDERSCORE_ESCAPING);
+        .write(out, MetricSnapshots.of(snapshot), escapingScheme);
     assertThat(out).hasToString(expected);
   }
 
diff --git a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/OpenMetrics2TextFormatWriterTest.java b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/OpenMetrics2TextFormatWriterTest.java
new file mode 100644
index 000000000..83c815c00
--- /dev/null
+++ b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/OpenMetrics2TextFormatWriterTest.java
@@ -0,0 +1,847 @@
+package io.prometheus.metrics.expositionformats;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.config.EscapingScheme;
+import io.prometheus.metrics.config.OpenMetrics2Properties;
+import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.Exemplar;
+import io.prometheus.metrics.model.snapshots.Exemplars;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.InfoSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.NativeHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.Quantiles;
+import io.prometheus.metrics.model.snapshots.StateSetSnapshot;
+import io.prometheus.metrics.model.snapshots.SummarySnapshot;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import org.junit.jupiter.api.Test;
+
+class OpenMetrics2TextFormatWriterTest {
+
+  @Test
+  void testContentTypeWithContentNegotiationDisabled() {
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().contentNegotiation(false).build())
+            .build();
+
+    assertThat(writer.getContentType())
+        .isEqualTo("application/openmetrics-text; version=1.0.0; charset=utf-8");
+  }
+
+  @Test
+  void testContentTypeWithContentNegotiationEnabled() {
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().contentNegotiation(true).build())
+            .build();
+
+    assertThat(writer.getContentType())
+        .isEqualTo("application/openmetrics-text; version=2.0.0; charset=utf-8");
+  }
+
+  @Test
+  void testContentTypeDefault() {
+    OpenMetrics2TextFormatWriter writer = OpenMetrics2TextFormatWriter.create();
+
+    assertThat(writer.getContentType())
+        .isEqualTo("application/openmetrics-text; version=1.0.0; charset=utf-8");
+  }
+
+  @Test
+  void testAcceptsOpenMetricsHeader() {
+    OpenMetrics2TextFormatWriter writer = OpenMetrics2TextFormatWriter.create();
+
+    assertThat(writer.accepts("application/openmetrics-text")).isTrue();
+    assertThat(writer.accepts("application/openmetrics-text; version=1.0.0")).isTrue();
+    assertThat(writer.accepts("application/openmetrics-text; version=2.0.0")).isTrue();
+    assertThat(
+            writer.accepts(
+                "text/html,application/xhtml+xml,application/xml;q=0.9,application/openmetrics-text;q=0.8"))
+        .isTrue();
+
+    assertThat(writer.accepts(null)).isFalse();
+    assertThat(writer.accepts("text/plain")).isFalse();
+    assertThat(writer.accepts("application/json")).isFalse();
+    assertThat(writer.accepts("application/vnd.google.protobuf")).isFalse();
+  }
+
+  @Test
+  void testGetOpenMetrics2Properties() {
+    OpenMetrics2Properties props =
+        OpenMetrics2Properties.builder().contentNegotiation(true).compositeValues(true).build();
+
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder().setOpenMetrics2Properties(props).build();
+
+    assertThat(writer.getOpenMetrics2Properties()).isEqualTo(props);
+    assertThat(writer.getOpenMetrics2Properties().getContentNegotiation()).isTrue();
+    assertThat(writer.getOpenMetrics2Properties().getCompositeValues()).isTrue();
+  }
+
+  @Test
+  void testCounterWithTotalSuffix() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            CounterSnapshot.builder()
+                .name("requests_total")
+                .help("Total requests")
+                .dataPoint(CounterSnapshot.CounterDataPointSnapshot.builder().value(100.0).build())
+                .build());
+
+    String om2Output = writeWithOM2(snapshots);
+
+    // OM2: preserves _total if user provided it
+    assertThat(om2Output)
+        .isEqualTo(
+            "# TYPE requests_total counter\n"
+                + "# HELP requests_total Total requests\n"
+                + "requests_total 100.0\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testOutputIdenticalToOM1ForGauge() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            GaugeSnapshot.builder()
+                .name("my_gauge")
+                .help("Test gauge")
+                .dataPoint(
+                    GaugeSnapshot.GaugeDataPointSnapshot.builder()
+                        .value(123.45)
+                        .labels(Labels.of("status", "active"))
+                        .build())
+                .build());
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om2Output).isEqualTo(om1Output);
+  }
+
+  @Test
+  void testOutputIdenticalToOM1ForHistogram() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("my_histogram")
+                .help("Test histogram")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(1.0)
+                        .classicHistogramBuckets(
+                            io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets.builder()
+                                .bucket(0.1, 0)
+                                .bucket(1.0, 1)
+                                .bucket(10.0, 2)
+                                .bucket(Double.POSITIVE_INFINITY, 2)
+                                .build())
+                        .build())
+                .build());
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om2Output).isEqualTo(om1Output);
+  }
+
+  @Test
+  void testOutputIdenticalToOM1ForSummary() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            SummarySnapshot.builder()
+                .name("my_summary")
+                .help("Test summary")
+                .dataPoint(
+                    SummarySnapshot.SummaryDataPointSnapshot.builder()
+                        .sum(100.0)
+                        .count(10)
+                        .quantiles(
+                            io.prometheus.metrics.model.snapshots.Quantiles.builder()
+                                .quantile(0.5, 50.0)
+                                .quantile(0.9, 90.0)
+                                .quantile(0.99, 99.0)
+                                .build())
+                        .build())
+                .build());
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om2Output).isEqualTo(om1Output);
+  }
+
+  @Test
+  void testInfoHelpNameMatchesMeterName() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            InfoSnapshot.builder()
+                .name("my")
+                .help("Test info")
+                .dataPoint(
+                    InfoSnapshot.InfoDataPointSnapshot.builder()
+                        .labels(Labels.of("version", "1.0", "platform", "linux"))
+                        .build())
+                .build());
+
+    String om2Output = writeWithOM2(snapshots);
+
+    // OM2: TYPE/HELP use the full name including _info (help name == meter name)
+    assertThat(om2Output)
+        .isEqualTo(
+            "# TYPE my_info info\n"
+                + "# HELP my_info Test info\n"
+                + "my_info{platform=\"linux\",version=\"1.0\"} 1\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testOutputIdenticalToOM1ForStateSet() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            StateSetSnapshot.builder()
+                .name("my_stateset")
+                .help("Test stateset")
+                .dataPoint(
+                    StateSetSnapshot.StateSetDataPointSnapshot.builder()
+                        .state("starting", false)
+                        .state("running", true)
+                        .state("stopped", false)
+                        .build())
+                .build());
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om2Output).isEqualTo(om1Output);
+  }
+
+  @Test
+  void testCounterWithExemplars() throws IOException {
+    Exemplar exemplar =
+        Exemplar.builder()
+            .value(100.0)
+            .traceId("abcde")
+            .spanId("12345")
+            .timestampMillis(1672850685829L)
+            .build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            CounterSnapshot.builder()
+                .name("requests")
+                .help("Total requests")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .value(1000.0)
+                        .exemplar(exemplar)
+                        .build())
+                .build());
+
+    String om2Output = writeWithOM2(snapshots);
+
+    // OM2: no _total, but exemplar is preserved
+    assertThat(om2Output)
+        .isEqualTo(
+            "# TYPE requests counter\n"
+                + "# HELP requests Total requests\n"
+                + "requests 1000.0 # {span_id=\"12345\",trace_id=\"abcde\"}"
+                + " 100.0 1672850685.829\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCounterStartTimestampWithDefaultWriter() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            CounterSnapshot.builder()
+                .name("my_counter")
+                .help("Test counter")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .value(42.0)
+                        .createdTimestampMillis(1672850385800L)
+                        .build())
+                .build());
+
+    String om2Output = writeWithOM2(snapshots);
+
+    // OM2: no _total, start timestamp uses st@ inline.
+    assertThat(om2Output)
+        .isEqualTo(
+            "# TYPE my_counter counter\n"
+                + "# HELP my_counter Test counter\n"
+                + "my_counter 42.0 st@1672850385.800\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCounterAndHistogramEmitStartTimestampConsistently() throws IOException {
+    long createdMs = 1672850385800L;
+    MetricSnapshots counterSnapshots =
+        MetricSnapshots.of(
+            CounterSnapshot.builder()
+                .name("my_counter")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .value(1.0)
+                        .createdTimestampMillis(createdMs)
+                        .build())
+                .build());
+    MetricSnapshots histogramSnapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("my_histogram")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(1.0)
+                        .createdTimestampMillis(createdMs)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(Double.POSITIVE_INFINITY, 1)
+                                .build())
+                        .build())
+                .build());
+
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().compositeValues(true).build())
+            .build();
+
+    assertThat(write(counterSnapshots, writer)).contains("st@1672850385.800");
+    assertThat(write(histogramSnapshots, writer)).contains("st@1672850385.800");
+  }
+
+  @Test
+  void testEmptySnapshot() throws IOException {
+    MetricSnapshots snapshots = new MetricSnapshots();
+
+    String om1Output = writeWithOM1(snapshots);
+    String om2Output = writeWithOM2(snapshots);
+
+    assertThat(om2Output).isEqualTo(om1Output);
+    assertThat(om2Output).isEqualTo("# EOF\n");
+  }
+
+  @Test
+  void testCompositeHistogram() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("http_request_duration_seconds")
+                .help("Request duration")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(324789.3)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(0.1, 8)
+                                .bucket(0.25, 2)
+                                .bucket(0.5, 1)
+                                .bucket(1.0, 3)
+                                .bucket(Double.POSITIVE_INFINITY, 3)
+                                .build())
+                        .build())
+                .build());
+
+    String output = writeWithCompositeValues(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE http_request_duration_seconds histogram\n"
+                + "# HELP http_request_duration_seconds Request duration\n"
+                + "http_request_duration_seconds"
+                + " {count:17,sum:324789.3,bucket:[0.1:8,0.25:10,0.5:11,1.0:14,+Inf:17]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCompositeHistogramWithLabelsTimestampAndCreated() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("foo")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .labels(Labels.of("method", "GET"))
+                        .sum(324789.3)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(0.1, 8)
+                                .bucket(Double.POSITIVE_INFINITY, 9)
+                                .build())
+                        .createdTimestampMillis(1520430000123L)
+                        .scrapeTimestampMillis(1520879607789L)
+                        .build())
+                .build());
+
+    String output = writeWithCompositeValues(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE foo histogram\n"
+                + "foo{method=\"GET\"} {count:17,sum:324789.3,bucket:[0.1:8,+Inf:17]}"
+                + " 1520879607.789 st@1520430000.123\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCompositeHistogramWithExemplar() throws IOException {
+    Exemplar exemplar1 =
+        Exemplar.builder().value(0.67).traceId("shaZ8oxi").timestampMillis(1520879607789L).build();
+    Exemplar exemplar2 =
+        Exemplar.builder().value(1.2).traceId("ookahn0M").timestampMillis(1520879608589L).build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("foo")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(1.5)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(1.0, 1)
+                                .bucket(Double.POSITIVE_INFINITY, 0)
+                                .build())
+                        .exemplars(Exemplars.of(exemplar1, exemplar2))
+                        .build())
+                .build());
+
+    String output = writeWithCompositeValues(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE foo histogram\n"
+                + "foo {count:1,sum:1.5,bucket:[1.0:1,+Inf:1]}"
+                + " # {trace_id=\"shaZ8oxi\"} 0.67 1520879607.789"
+                + " # {trace_id=\"ookahn0M\"} 1.2 1520879608.589\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCompositeGaugeHistogram() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("queue_size")
+                .gaugeHistogram(true)
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(3289.3)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(0.1, 20)
+                                .bucket(1.0, 14)
+                                .bucket(Double.POSITIVE_INFINITY, 8)
+                                .build())
+                        .build())
+                .build());
+
+    String output = writeWithCompositeValues(snapshots);
+
+    // GaugeHistogram uses gcount/gsum per spec
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE queue_size gaugehistogram\n"
+                + "queue_size {gcount:42,gsum:3289.3,bucket:[0.1:20,1.0:34,+Inf:42]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testNativeHistogram() throws IOException {
+    Exemplar exemplar1 =
+        Exemplar.builder().value(0.67).traceId("shaZ8oxi").timestampMillis(1520879607789L).build();
+    Exemplar exemplar2 =
+        Exemplar.builder().value(1.2).traceId("ookahn0M").timestampMillis(1520879608589L).build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("foo")
+                .help("Native histogram")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(324789.3)
+                        .nativeSchema(0)
+                        .nativeZeroThreshold(0.0001)
+                        .nativeZeroCount(0)
+                        .nativeBucketsForPositiveValues(
+                            NativeHistogramBuckets.builder().bucket(0, 5).bucket(1, 12).build())
+                        .scrapeTimestampMillis(1520879609000L)
+                        .createdTimestampMillis(1520430000000L)
+                        .exemplars(Exemplars.of(exemplar1, exemplar2))
+                        .build())
+                .build());
+
+    String output = writeWithNativeHistograms(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE foo histogram\n"
+                + "# HELP foo Native histogram\n"
+                + "foo {count:17,sum:324789.3,schema:0,zero_threshold:1.0E-4,zero_count:0,"
+                + "positive_spans:[0:2],positive_buckets:[5,12]} 1520879609.000"
+                + " st@1520430000.000 # {trace_id=\"shaZ8oxi\"} 0.67 1520879607.789"
+                + " # {trace_id=\"ookahn0M\"} 1.2 1520879608.589\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testNativeHistogramWithClassicBuckets() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("http_request_duration_seconds")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(4.0)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(0.5, 1)
+                                .bucket(1.0, 7)
+                                .bucket(Double.POSITIVE_INFINITY, 14)
+                                .build())
+                        .nativeSchema(3)
+                        .nativeZeroThreshold(0.0)
+                        .nativeZeroCount(1)
+                        .nativeBucketsForNegativeValues(
+                            NativeHistogramBuckets.builder().bucket(1, 2).bucket(2, 4).build())
+                        .nativeBucketsForPositiveValues(
+                            NativeHistogramBuckets.builder()
+                                .bucket(-1, 5)
+                                .bucket(0, 7)
+                                .bucket(4, 3)
+                                .build())
+                        .build())
+                .build());
+
+    String output = writeWithNativeHistograms(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE http_request_duration_seconds histogram\n"
+                + "http_request_duration_seconds"
+                + " {count:22,sum:4.0,schema:3,zero_threshold:0.0,zero_count:1,"
+                + "negative_spans:[1:2],negative_buckets:[2,4],"
+                + "positive_spans:[-1:2,3:1],positive_buckets:[5,7,3],"
+                + "bucket:[0.5:1,1.0:8,+Inf:22]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testNativeGaugeHistogram() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("queue_size")
+                .gaugeHistogram(true)
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(4.5)
+                        .nativeSchema(2)
+                        .nativeZeroThreshold(0.0)
+                        .nativeZeroCount(1)
+                        .nativeBucketsForPositiveValues(
+                            NativeHistogramBuckets.builder().bucket(0, 1).bucket(1, 1).build())
+                        .createdTimestampMillis(1520430000000L)
+                        .build())
+                .build());
+
+    String output = writeWithNativeHistograms(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE queue_size gaugehistogram\n"
+                + "queue_size {gcount:3,gsum:4.5,schema:2,zero_threshold:0.0,zero_count:1,"
+                + "positive_spans:[0:2],positive_buckets:[1,1]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testNativeHistogramExemplarComplianceSkipsExemplarWithoutTimestamp() throws IOException {
+    Exemplar exemplarWithoutTs = Exemplar.builder().value(2.0).traceId("bbb").build();
+    OpenMetrics2TextFormatWriter complianceWriter =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder()
+                    .nativeHistograms(true)
+                    .exemplarCompliance(true)
+                    .build())
+            .build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("requests")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(2.0)
+                        .nativeSchema(5)
+                        .nativeBucketsForPositiveValues(
+                            NativeHistogramBuckets.builder().bucket(0, 1).build())
+                        .exemplars(Exemplars.of(exemplarWithoutTs))
+                        .build())
+                .build());
+
+    String output = write(snapshots, complianceWriter);
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE requests histogram\n"
+                + "requests {count:1,sum:2.0,schema:5,zero_threshold:0.0,zero_count:0,"
+                + "positive_spans:[0:1],positive_buckets:[1]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testNativeHistogramMinimalOm2() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("latency_seconds")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(0.0)
+                        .nativeSchema(5)
+                        .build())
+                .build());
+
+    String output = writeWithNativeHistograms(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE latency_seconds histogram\n"
+                + "latency_seconds {count:0,sum:0.0,schema:5,zero_threshold:0.0,zero_count:0}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testNativeGaugeHistogramWithNegativeAndPositiveSpans() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("temperature_delta")
+                .gaugeHistogram(true)
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(0.5)
+                        .nativeSchema(1)
+                        .nativeZeroThreshold(0.25)
+                        .nativeZeroCount(3)
+                        .nativeBucketsForNegativeValues(
+                            NativeHistogramBuckets.builder().bucket(0, 2).bucket(2, 4).build())
+                        .nativeBucketsForPositiveValues(
+                            NativeHistogramBuckets.builder().bucket(1, 1).bucket(2, 5).build())
+                        .build())
+                .build());
+
+    String output = writeWithNativeHistograms(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE temperature_delta gaugehistogram\n"
+                + "temperature_delta {gcount:15,gsum:0.5,schema:1,zero_threshold:0.25,"
+                + "zero_count:3,negative_spans:[0:1,1:1],negative_buckets:[2,4],"
+                + "positive_spans:[1:2],positive_buckets:[1,5]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCompositeSummary() throws IOException {
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            SummarySnapshot.builder()
+                .name("rpc_duration_seconds")
+                .help("RPC duration")
+                .dataPoint(
+                    SummarySnapshot.SummaryDataPointSnapshot.builder()
+                        .count(17)
+                        .sum(324789.3)
+                        .quantiles(
+                            Quantiles.builder().quantile(0.95, 123.7).quantile(0.99, 150.0).build())
+                        .build())
+                .build());
+
+    String output = writeWithCompositeValues(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE rpc_duration_seconds summary\n"
+                + "# HELP rpc_duration_seconds RPC duration\n"
+                + "rpc_duration_seconds"
+                + " {count:17,sum:324789.3,quantile:[0.95:123.7,0.99:150.0]}\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testCompositeSummaryWithCreatedAndExemplar() throws IOException {
+    Exemplar exemplar1 =
+        Exemplar.builder().value(0.5).traceId("abc123").timestampMillis(1520879607000L).build();
+    Exemplar exemplar2 =
+        Exemplar.builder().value(1.5).traceId("def456").timestampMillis(1520879608000L).build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            SummarySnapshot.builder()
+                .name("rpc_duration_seconds")
+                .dataPoint(
+                    SummarySnapshot.SummaryDataPointSnapshot.builder()
+                        .count(10)
+                        .sum(100.0)
+                        .createdTimestampMillis(1520430000000L)
+                        .exemplars(Exemplars.of(exemplar1, exemplar2))
+                        .build())
+                .build());
+
+    String output = writeWithCompositeValues(snapshots);
+
+    assertThat(output)
+        .isEqualTo(
+            "# TYPE rpc_duration_seconds summary\n"
+                + "rpc_duration_seconds {count:10,sum:100.0,quantile:[]} st@1520430000.000"
+                + " # {trace_id=\"abc123\"} 0.5 1520879607.000"
+                + " # {trace_id=\"def456\"} 1.5 1520879608.000\n"
+                + "# EOF\n");
+  }
+
+  @Test
+  void testExemplarComplianceSkipsExemplarWithoutTimestamp() throws IOException {
+    Exemplar exemplarWithTs =
+        Exemplar.builder().value(1.0).traceId("aaa").timestampMillis(1672850685829L).build();
+    Exemplar exemplarWithoutTs = Exemplar.builder().value(2.0).traceId("bbb").build();
+
+    OpenMetrics2TextFormatWriter complianceWriter =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().exemplarCompliance(true).build())
+            .build();
+    OpenMetrics2TextFormatWriter defaultWriter = OpenMetrics2TextFormatWriter.create();
+
+    MetricSnapshots withTs =
+        MetricSnapshots.of(
+            CounterSnapshot.builder()
+                .name("requests")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .value(1.0)
+                        .exemplar(exemplarWithTs)
+                        .build())
+                .build());
+    MetricSnapshots withoutTs =
+        MetricSnapshots.of(
+            CounterSnapshot.builder()
+                .name("requests")
+                .dataPoint(
+                    CounterSnapshot.CounterDataPointSnapshot.builder()
+                        .value(1.0)
+                        .exemplar(exemplarWithoutTs)
+                        .build())
+                .build());
+
+    // Compliance mode: exemplar WITH timestamp is emitted
+    assertThat(write(withTs, complianceWriter)).contains("# {trace_id=\"aaa\"} 1.0 1672850685.829");
+
+    // Compliance mode: exemplar WITHOUT timestamp is skipped
+    assertThat(write(withoutTs, complianceWriter)).doesNotContain("# {");
+
+    // Default mode: exemplar without timestamp is still emitted (just no timestamp)
+    assertThat(write(withoutTs, defaultWriter)).contains("# {trace_id=\"bbb\"} 2.0\n");
+  }
+
+  @Test
+  void testExemplarComplianceSkipsHistogramExemplarWithoutTimestamp() throws IOException {
+    Exemplar exemplarWithoutTs = Exemplar.builder().value(2.0).traceId("bbb").build();
+    OpenMetrics2TextFormatWriter complianceWriter =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().exemplarCompliance(true).build())
+            .build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            HistogramSnapshot.builder()
+                .name("requests")
+                .dataPoint(
+                    HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                        .sum(2.0)
+                        .classicHistogramBuckets(
+                            ClassicHistogramBuckets.builder()
+                                .bucket(1.0, 1)
+                                .bucket(Double.POSITIVE_INFINITY, 1)
+                                .build())
+                        .exemplars(Exemplars.of(exemplarWithoutTs))
+                        .build())
+                .build());
+
+    assertThat(write(snapshots, complianceWriter)).doesNotContain("# {");
+  }
+
+  @Test
+  void testExemplarComplianceSkipsSummaryExemplarWithoutTimestamp() throws IOException {
+    Exemplar exemplarWithoutTs = Exemplar.builder().value(2.0).traceId("bbb").build();
+    OpenMetrics2TextFormatWriter complianceWriter =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().exemplarCompliance(true).build())
+            .build();
+
+    MetricSnapshots snapshots =
+        MetricSnapshots.of(
+            SummarySnapshot.builder()
+                .name("requests")
+                .dataPoint(
+                    SummarySnapshot.SummaryDataPointSnapshot.builder()
+                        .count(1)
+                        .sum(2.0)
+                        .exemplars(Exemplars.of(exemplarWithoutTs))
+                        .build())
+                .build());
+
+    assertThat(write(snapshots, complianceWriter)).doesNotContain("# {");
+  }
+
+  private String writeWithCompositeValues(MetricSnapshots snapshots) throws IOException {
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().compositeValues(true).build())
+            .build();
+    return write(snapshots, writer);
+  }
+
+  private String writeWithNativeHistograms(MetricSnapshots snapshots) throws IOException {
+    OpenMetrics2TextFormatWriter writer =
+        OpenMetrics2TextFormatWriter.builder()
+            .setOpenMetrics2Properties(
+                OpenMetrics2Properties.builder().nativeHistograms(true).build())
+            .build();
+    return write(snapshots, writer);
+  }
+
+  private String writeWithOM1(MetricSnapshots snapshots) throws IOException {
+    OpenMetricsTextFormatWriter writer = OpenMetricsTextFormatWriter.create();
+    return write(snapshots, writer);
+  }
+
+  private String writeWithOM2(MetricSnapshots snapshots) throws IOException {
+    OpenMetrics2TextFormatWriter writer = OpenMetrics2TextFormatWriter.create();
+    return write(snapshots, writer);
+  }
+
+  private String write(MetricSnapshots snapshots, ExpositionFormatWriter writer)
+      throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    writer.write(out, snapshots, EscapingScheme.ALLOW_UTF8);
+    return out.toString(StandardCharsets.UTF_8.name());
+  }
+}
diff --git a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriterTest.java b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriterTest.java
index 26561bf46..59b413d81 100644
--- a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriterTest.java
+++ b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/PrometheusProtobufWriterTest.java
@@ -13,6 +13,13 @@ class PrometheusProtobufWriterTest {
   @Test
   void accepts() {
     assertThat(writer.accepts(null)).isFalse();
+    assertThat(writer.accepts("text/plain")).isFalse();
+    assertThat(writer.accepts("application/vnd.google.protobuf")).isFalse();
+    assertThat(writer.accepts("proto=io.prometheus.client.MetricFamily")).isFalse();
+    assertThat(
+            writer.accepts(
+                "application/vnd.google.protobuf; proto=io.prometheus.client.MetricFamily"))
+        .isTrue();
   }
 
   @Test
@@ -34,4 +41,9 @@ void toDebugString() {
     assertThatCode(() -> writer.toDebugString(null, EscapingScheme.ALLOW_UTF8))
         .isInstanceOf(UnsupportedOperationException.class);
   }
+
+  @Test
+  void isAvailable() {
+    assertThat(writer.isAvailable()).isFalse();
+  }
 }
diff --git a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/TextFormatUtilTest.java b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/TextFormatUtilTest.java
index dbb707f51..5e1aa9766 100644
--- a/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/TextFormatUtilTest.java
+++ b/prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/TextFormatUtilTest.java
@@ -3,6 +3,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import io.prometheus.metrics.model.snapshots.ClassicHistogramBuckets;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.HistogramSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.io.IOException;
 import java.io.StringWriter;
 import org.junit.jupiter.api.Test;
@@ -23,6 +28,21 @@ private static String escape(String s) throws IOException {
     return writer.toString();
   }
 
+  @Test
+  void testWriteLong() throws IOException {
+    assertThat(writeLong(0)).isEqualTo("0");
+    assertThat(writeLong(1)).isEqualTo("1");
+    assertThat(writeLong(-1)).isEqualTo("-1");
+    assertThat(writeLong(Long.MAX_VALUE)).isEqualTo("9223372036854775807");
+    assertThat(writeLong(Long.MIN_VALUE)).isEqualTo("-9223372036854775808");
+  }
+
+  private static String writeLong(long value) throws IOException {
+    StringWriter writer = new StringWriter();
+    TextFormatUtil.writeLong(writer, value);
+    return writer.toString();
+  }
+
   @Test
   void testWritePrometheusTimestamp() throws IOException {
     assertThat(writePrometheusTimestamp(true)).isEqualTo("1000");
@@ -34,4 +54,128 @@ private static String writePrometheusTimestamp(boolean timestampsInMs) throws IO
     TextFormatUtil.writePrometheusTimestamp(writer, 1000, timestampsInMs);
     return writer.toString();
   }
+
+  @Test
+  void testMergeDuplicates_sameName_mergesDataPoints() {
+    CounterSnapshot counter1 =
+        CounterSnapshot.builder()
+            .name("api_responses")
+            .dataPoint(
+                CounterSnapshot.CounterDataPointSnapshot.builder()
+                    .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                    .value(100)
+                    .build())
+            .build();
+
+    CounterSnapshot counter2 =
+        CounterSnapshot.builder()
+            .name("api_responses")
+            .dataPoint(
+                CounterSnapshot.CounterDataPointSnapshot.builder()
+                    .labels(Labels.of("uri", "/hello", "outcome", "FAILURE"))
+                    .value(10)
+                    .build())
+            .build();
+
+    MetricSnapshots snapshots = new MetricSnapshots(counter1, counter2);
+    MetricSnapshots result = TextFormatUtil.mergeDuplicates(snapshots);
+
+    assertThat(result).hasSize(1);
+    assertThat(result.get(0).getMetadata().getName()).isEqualTo("api_responses");
+    assertThat(result.get(0).getDataPoints()).hasSize(2);
+
+    CounterSnapshot merged = (CounterSnapshot) result.get(0);
+    assertThat(merged.getDataPoints())
+        .anyMatch(
+            dp ->
+                dp.getLabels().equals(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                    && dp.getValue() == 100);
+    assertThat(merged.getDataPoints())
+        .anyMatch(
+            dp ->
+                dp.getLabels().equals(Labels.of("uri", "/hello", "outcome", "FAILURE"))
+                    && dp.getValue() == 10);
+  }
+
+  @Test
+  void testMergeDuplicates_multipleDataPoints_allMerged() {
+    CounterSnapshot counter1 =
+        CounterSnapshot.builder()
+            .name("api_responses")
+            .dataPoint(
+                CounterSnapshot.CounterDataPointSnapshot.builder()
+                    .labels(Labels.of("uri", "/hello", "outcome", "SUCCESS"))
+                    .value(100)
+                    .build())
+            .dataPoint(
+                CounterSnapshot.CounterDataPointSnapshot.builder()
+                    .labels(Labels.of("uri", "/world", "outcome", "SUCCESS"))
+                    .value(200)
+                    .build())
+            .build();
+
+    CounterSnapshot counter2 =
+        CounterSnapshot.builder()
+            .name("api_responses")
+            .dataPoint(
+                CounterSnapshot.CounterDataPointSnapshot.builder()
+                    .labels(Labels.of("uri", "/hello", "outcome", "FAILURE"))
+                    .value(10)
+                    .build())
+            .dataPoint(
+                CounterSnapshot.CounterDataPointSnapshot.builder()
+                    .labels(Labels.of("uri", "/world", "outcome", "FAILURE"))
+                    .value(5)
+                    .build())
+            .build();
+
+    MetricSnapshots snapshots = new MetricSnapshots(counter1, counter2);
+    MetricSnapshots result = TextFormatUtil.mergeDuplicates(snapshots);
+
+    assertThat(result).hasSize(1);
+    assertThat(result.get(0).getDataPoints()).hasSize(4);
+  }
+
+  @Test
+  void testMergeDuplicates_emptySnapshots_returnsEmpty() {
+    MetricSnapshots snapshots = MetricSnapshots.builder().build();
+    MetricSnapshots result = TextFormatUtil.mergeDuplicates(snapshots);
+
+    assertThat(result).isEmpty();
+  }
+
+  @Test
+  void testMergeDuplicates_histogramSameGaugeFlag_preservesGaugeHistogram() {
+    HistogramSnapshot gauge1 =
+        HistogramSnapshot.builder()
+            .name("my_histogram")
+            .gaugeHistogram(true)
+            .dataPoint(
+                HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                    .labels(Labels.of("a", "1"))
+                    .classicHistogramBuckets(
+                        ClassicHistogramBuckets.of(
+                            new double[] {Double.POSITIVE_INFINITY}, new long[] {0}))
+                    .build())
+            .build();
+    HistogramSnapshot gauge2 =
+        HistogramSnapshot.builder()
+            .name("my_histogram")
+            .gaugeHistogram(true)
+            .dataPoint(
+                HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                    .labels(Labels.of("a", "2"))
+                    .classicHistogramBuckets(
+                        ClassicHistogramBuckets.of(
+                            new double[] {Double.POSITIVE_INFINITY}, new long[] {0}))
+                    .build())
+            .build();
+    MetricSnapshots snapshots = new MetricSnapshots(gauge1, gauge2);
+    MetricSnapshots result = TextFormatUtil.mergeDuplicates(snapshots);
+
+    assertThat(result).hasSize(1);
+    HistogramSnapshot merged = (HistogramSnapshot) result.get(0);
+    assertThat(merged.isGaugeHistogram()).isTrue();
+    assertThat(merged.getDataPoints()).hasSize(2);
+  }
 }
diff --git a/prometheus-metrics-instrumentation-caffeine/pom.xml b/prometheus-metrics-instrumentation-caffeine/pom.xml
index f1fb57c6c..9712a4a1b 100644
--- a/prometheus-metrics-instrumentation-caffeine/pom.xml
+++ b/prometheus-metrics-instrumentation-caffeine/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-caffeine</artifactId>
@@ -30,6 +29,12 @@
   </developers>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
@@ -38,7 +43,7 @@
     <dependency>
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>
-      <version>3.2.3</version>
+      <version>3.2.4</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/prometheus-metrics-instrumentation-caffeine/src/main/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollector.java b/prometheus-metrics-instrumentation-caffeine/src/main/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollector.java
index a1b8782a3..687cd4349 100644
--- a/prometheus-metrics-instrumentation-caffeine/src/main/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollector.java
+++ b/prometheus-metrics-instrumentation-caffeine/src/main/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollector.java
@@ -5,6 +5,7 @@
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.github.benmanes.caffeine.cache.Policy;
 import com.github.benmanes.caffeine.cache.stats.CacheStats;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
@@ -19,6 +20,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 
 /**
  * Collect metrics from Caffeine's com.github.benmanes.caffeine.cache.Cache.
@@ -55,6 +57,7 @@
  *     caffeine_cache_load_duration_seconds_sum{cache="mycache"} 0.0034
  * </pre>
  */
+@StableApi
 public class CacheMetricsCollector implements MultiCollector {
   private static final double NANOSECONDS_PER_SECOND = 1_000_000_000.0;
 
@@ -95,6 +98,8 @@ public class CacheMetricsCollector implements MultiCollector {
    *
    * <p>Note that the {@link #builder()} API has different default values than this deprecated
    * constructor.
+   *
+   * @deprecated Use {@link #builder()} instead.
    */
   @Deprecated
   public CacheMetricsCollector() {
@@ -145,6 +150,7 @@ public void addCache(String cacheName, AsyncCache<?, ?> cache) {
    *
    * @param cacheName cache to be removed
    */
+  @Nullable
   public Cache<?, ?> removeCache(String cacheName) {
     return children.remove(cacheName);
   }
@@ -226,7 +232,7 @@ public MetricSnapshots collect() {
                 .labels(labels)
                 .value(stats.evictionWeight())
                 .build());
-      } catch (Exception e) {
+      } catch (UnsupportedOperationException e) {
         // EvictionWeight metric is unavailable, newer version of Caffeine is needed.
       }
 
@@ -313,7 +319,12 @@ public MetricSnapshots collect() {
         .build();
   }
 
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptors()} instead.
+   */
   @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   public List<String> getPrometheusNames() {
     if (!collectWeightedSize) {
       return ALL_METRIC_NAMES.stream()
diff --git a/prometheus-metrics-instrumentation-caffeine/src/test/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollectorTest.java b/prometheus-metrics-instrumentation-caffeine/src/test/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollectorTest.java
index 3a7b634a7..cbad48b56 100644
--- a/prometheus-metrics-instrumentation-caffeine/src/test/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollectorTest.java
+++ b/prometheus-metrics-instrumentation-caffeine/src/test/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollectorTest.java
@@ -22,10 +22,10 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-@SuppressWarnings("CheckReturnValue")
+@SuppressWarnings({"CheckReturnValue", "deprecation"})
 class CacheMetricsCollectorTest {
   // This enum was added to simplify test parametrization on argument options.
-  public enum Options {
+  enum Options {
     LEGACY(false, false),
     COLLECT_EVICTION_WEIGHT_AS_COUNTER(true, false),
     COLLECT_WEIGHTED_SIZE(false, true),
@@ -205,7 +205,7 @@ public void weightedCacheExposesMetricsForHitMissAndEvictionWeightedSize(Options
 
   @SuppressWarnings("unchecked")
   @Test
-  public void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception {
+  void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception {
     final CacheLoader<String, String> loader = mock(CacheLoader.class);
     when(loader.load(anyString()))
         .thenReturn("First User")
diff --git a/prometheus-metrics-instrumentation-dropwizard/pom.xml b/prometheus-metrics-instrumentation-dropwizard/pom.xml
index d98fdc6b7..011cbba1a 100644
--- a/prometheus-metrics-instrumentation-dropwizard/pom.xml
+++ b/prometheus-metrics-instrumentation-dropwizard/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-dropwizard</artifactId>
@@ -30,6 +29,12 @@
   </developers>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
@@ -38,7 +43,7 @@
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
-      <version>4.2.37</version>
+      <version>4.2.39</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/prometheus-metrics-instrumentation-dropwizard/src/main/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExports.java b/prometheus-metrics-instrumentation-dropwizard/src/main/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExports.java
index 4ab03341e..4e527ce87 100644
--- a/prometheus-metrics-instrumentation-dropwizard/src/main/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExports.java
+++ b/prometheus-metrics-instrumentation-dropwizard/src/main/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExports.java
@@ -9,33 +9,32 @@
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Snapshot;
 import com.codahale.metrics.Timer;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.instrumentation.dropwizard5.InvalidMetricHandler;
+import io.prometheus.metrics.instrumentation.dropwizard5.internal.AbstractDropwizardExports;
 import io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper;
-import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
-import io.prometheus.metrics.model.snapshots.CounterSnapshot;
-import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
-import io.prometheus.metrics.model.snapshots.MetricMetadata;
-import io.prometheus.metrics.model.snapshots.MetricSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
-import io.prometheus.metrics.model.snapshots.PrometheusNaming;
-import io.prometheus.metrics.model.snapshots.Quantiles;
-import io.prometheus.metrics.model.snapshots.SummarySnapshot;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiFunction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
-/** Collect Dropwizard metrics from a MetricRegistry. */
-public class DropwizardExports implements MultiCollector {
-  private static final Logger logger = Logger.getLogger(DropwizardExports.class.getName());
-  private final MetricRegistry registry;
-  private final MetricFilter metricFilter;
-  @Nullable private final CustomLabelMapper labelMapper;
-  private final InvalidMetricHandler invalidMetricHandler;
+/**
+ * Collect Dropwizard 4.x metrics from a MetricRegistry.
+ *
+ * <p>This is a thin wrapper around {@link AbstractDropwizardExports} that handles the Dropwizard
+ * 4.x specific API where metric names are Strings.
+ */
+@StableApi
+public class DropwizardExports
+    extends AbstractDropwizardExports<
+        MetricRegistry,
+        MetricFilter,
+        Counter,
+        Gauge<?>,
+        Histogram,
+        Timer,
+        Meter,
+        Metric,
+        Snapshot> {
 
   /**
    * Creates a new DropwizardExports and {@link MetricFilter#ALL}.
@@ -43,11 +42,7 @@ public class DropwizardExports implements MultiCollector {
    * @param registry a metric registry to export in prometheus.
    */
   public DropwizardExports(MetricRegistry registry) {
-    super();
-    this.registry = registry;
-    this.metricFilter = MetricFilter.ALL;
-    this.labelMapper = null;
-    this.invalidMetricHandler = InvalidMetricHandler.ALWAYS_THROW;
+    this(registry, MetricFilter.ALL, null, InvalidMetricHandler.ALWAYS_THROW);
   }
 
   /**
@@ -57,10 +52,7 @@ public DropwizardExports(MetricRegistry registry) {
    * @param metricFilter a custom metric filter.
    */
   public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) {
-    this.registry = registry;
-    this.metricFilter = metricFilter;
-    this.labelMapper = null;
-    this.invalidMetricHandler = InvalidMetricHandler.ALWAYS_THROW;
+    this(registry, metricFilter, null, InvalidMetricHandler.ALWAYS_THROW);
   }
 
   /**
@@ -70,176 +62,103 @@ public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) {
    */
   public DropwizardExports(
       MetricRegistry registry, MetricFilter metricFilter, @Nullable CustomLabelMapper labelMapper) {
-    this.registry = registry;
-    this.metricFilter = metricFilter;
-    this.labelMapper = labelMapper;
-    this.invalidMetricHandler = InvalidMetricHandler.ALWAYS_THROW;
+    this(registry, metricFilter, labelMapper, InvalidMetricHandler.ALWAYS_THROW);
   }
 
   /**
    * @param registry a metric registry to export in prometheus.
    * @param metricFilter a custom metric filter.
    * @param labelMapper a labelMapper to use to map labels.
+   * @param invalidMetricHandler handler for invalid metrics.
    */
   private DropwizardExports(
       MetricRegistry registry,
       MetricFilter metricFilter,
       @Nullable CustomLabelMapper labelMapper,
       InvalidMetricHandler invalidMetricHandler) {
-    this.registry = registry;
-    this.metricFilter = metricFilter;
-    this.labelMapper = labelMapper;
-    this.invalidMetricHandler = invalidMetricHandler;
+    super(registry, metricFilter, labelMapper, invalidMetricHandler);
   }
 
-  private static String getHelpMessage(String metricName, Metric metric) {
-    return String.format(
-        "Generated from Dropwizard metric import (metric=%s, type=%s)",
-        metricName, metric.getClass().getName());
+  @Override
+  protected MetricSnapshots collectMetricSnapshots() {
+    MetricSnapshots.Builder metricSnapshots = MetricSnapshots.builder();
+    // For Dropwizard 4.x, map keys are Strings, so we just use identity function
+    collectMetricKind(
+        metricSnapshots, registry.getGauges(metricFilter), this::fromGauge, key -> key);
+    collectMetricKind(
+        metricSnapshots, registry.getCounters(metricFilter), this::fromCounter, key -> key);
+    collectMetricKind(
+        metricSnapshots, registry.getHistograms(metricFilter), this::fromHistogram, key -> key);
+    collectMetricKind(
+        metricSnapshots, registry.getTimers(metricFilter), this::fromTimer, key -> key);
+    collectMetricKind(
+        metricSnapshots, registry.getMeters(metricFilter), this::fromMeter, key -> key);
+    return metricSnapshots.build();
   }
 
-  private MetricMetadata getMetricMetaData(String metricName, Metric metric) {
-    String name = labelMapper != null ? labelMapper.getName(metricName) : metricName;
-    return new MetricMetadata(
-        PrometheusNaming.sanitizeMetricName(name), getHelpMessage(metricName, metric));
+  @Override
+  protected long getCounterCount(Counter counter) {
+    return counter.getCount();
   }
 
-  /**
-   * Export counter as Prometheus <a
-   * href="https://prometheus.io/docs/concepts/metric_types/#gauge">Gauge</a>.
-   */
-  MetricSnapshot fromCounter(String dropwizardName, Counter counter) {
-    MetricMetadata metadata = getMetricMetaData(dropwizardName, counter);
-    CounterSnapshot.CounterDataPointSnapshot.Builder dataPointBuilder =
-        CounterSnapshot.CounterDataPointSnapshot.builder()
-            .value(Long.valueOf(counter.getCount()).doubleValue());
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new CounterSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected Object getGaugeValue(Gauge<?> gauge) {
+    return gauge.getValue();
   }
 
-  /** Export gauge as a prometheus gauge. */
-  @Nullable
-  MetricSnapshot fromGauge(String dropwizardName, Gauge<?> gauge) {
-    Object obj = gauge.getValue();
-    double value;
-    if (obj instanceof Number) {
-      value = ((Number) obj).doubleValue();
-    } else if (obj instanceof Boolean) {
-      value = ((Boolean) obj) ? 1 : 0;
-    } else {
-      logger.log(
-          Level.FINE,
-          String.format(
-              "Invalid type for Gauge %s: %s",
-              PrometheusNaming.sanitizeMetricName(dropwizardName),
-              obj == null ? "null" : obj.getClass().getName()));
-      return null;
-    }
-    MetricMetadata metadata = getMetricMetaData(dropwizardName, gauge);
-    GaugeSnapshot.GaugeDataPointSnapshot.Builder dataPointBuilder =
-        GaugeSnapshot.GaugeDataPointSnapshot.builder().value(value);
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new GaugeSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected Snapshot getHistogramSnapshot(Histogram histogram) {
+    return histogram.getSnapshot();
   }
 
-  /**
-   * Export a histogram snapshot as a prometheus SUMMARY.
-   *
-   * @param dropwizardName metric name.
-   * @param snapshot the histogram snapshot.
-   * @param count the total sample count for this snapshot.
-   * @param factor a factor to apply to histogram values.
-   */
-  MetricSnapshot fromSnapshotAndCount(
-      String dropwizardName, Snapshot snapshot, long count, double factor, String helpMessage) {
-    Quantiles quantiles =
-        Quantiles.builder()
-            .quantile(0.5, snapshot.getMedian() * factor)
-            .quantile(0.75, snapshot.get75thPercentile() * factor)
-            .quantile(0.95, snapshot.get95thPercentile() * factor)
-            .quantile(0.98, snapshot.get98thPercentile() * factor)
-            .quantile(0.99, snapshot.get99thPercentile() * factor)
-            .quantile(0.999, snapshot.get999thPercentile() * factor)
-            .build();
+  @Override
+  protected long getHistogramCount(Histogram histogram) {
+    return histogram.getCount();
+  }
 
-    String name = labelMapper != null ? labelMapper.getName(dropwizardName) : dropwizardName;
-    MetricMetadata metadata =
-        new MetricMetadata(PrometheusNaming.sanitizeMetricName(name), helpMessage);
-    SummarySnapshot.SummaryDataPointSnapshot.Builder dataPointBuilder =
-        SummarySnapshot.SummaryDataPointSnapshot.builder().quantiles(quantiles).count(count);
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new SummarySnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected Snapshot getTimerSnapshot(Timer timer) {
+    return timer.getSnapshot();
   }
 
-  /** Convert histogram snapshot. */
-  MetricSnapshot fromHistogram(String dropwizardName, Histogram histogram) {
-    return fromSnapshotAndCount(
-        dropwizardName,
-        histogram.getSnapshot(),
-        histogram.getCount(),
-        1.0,
-        getHelpMessage(dropwizardName, histogram));
+  @Override
+  protected long getTimerCount(Timer timer) {
+    return timer.getCount();
   }
 
-  /** Export Dropwizard Timer as a histogram. Use TIME_UNIT as time unit. */
-  MetricSnapshot fromTimer(String dropwizardName, Timer timer) {
-    return fromSnapshotAndCount(
-        dropwizardName,
-        timer.getSnapshot(),
-        timer.getCount(),
-        1.0D / TimeUnit.SECONDS.toNanos(1L),
-        getHelpMessage(dropwizardName, timer));
+  @Override
+  protected long getMeterCount(Meter meter) {
+    return meter.getCount();
   }
 
-  /** Export a Meter as a prometheus COUNTER. */
-  MetricSnapshot fromMeter(String dropwizardName, Meter meter) {
-    MetricMetadata metadata = getMetricMetaData(dropwizardName + "_total", meter);
-    CounterSnapshot.CounterDataPointSnapshot.Builder dataPointBuilder =
-        CounterSnapshot.CounterDataPointSnapshot.builder().value(meter.getCount());
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new CounterSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected double getMedian(Snapshot snapshot) {
+    return snapshot.getMedian();
   }
 
   @Override
-  public MetricSnapshots collect() {
-    MetricSnapshots.Builder metricSnapshots = MetricSnapshots.builder();
-    collectMetricKind(metricSnapshots, registry.getGauges(metricFilter), this::fromGauge);
-    collectMetricKind(metricSnapshots, registry.getCounters(metricFilter), this::fromCounter);
-    collectMetricKind(metricSnapshots, registry.getHistograms(metricFilter), this::fromHistogram);
-    collectMetricKind(metricSnapshots, registry.getTimers(metricFilter), this::fromTimer);
-    collectMetricKind(metricSnapshots, registry.getMeters(metricFilter), this::fromMeter);
-    return metricSnapshots.build();
+  protected double get75thPercentile(Snapshot snapshot) {
+    return snapshot.get75thPercentile();
   }
 
-  private <T> void collectMetricKind(
-      MetricSnapshots.Builder builder,
-      Map<String, T> metric,
-      BiFunction<String, T, MetricSnapshot> toSnapshot) {
-    for (Map.Entry<String, T> entry : metric.entrySet()) {
-      String metricName = entry.getKey();
-      try {
-        MetricSnapshot snapshot = toSnapshot.apply(metricName, entry.getValue());
-        if (snapshot != null) {
-          builder.metricSnapshot(snapshot);
-        }
-      } catch (Exception e) {
-        if (!invalidMetricHandler.suppressException(metricName, e)) {
-          throw e;
-        }
-      }
-    }
+  @Override
+  protected double get95thPercentile(Snapshot snapshot) {
+    return snapshot.get95thPercentile();
+  }
+
+  @Override
+  protected double get98thPercentile(Snapshot snapshot) {
+    return snapshot.get98thPercentile();
+  }
+
+  @Override
+  protected double get99thPercentile(Snapshot snapshot) {
+    return snapshot.get99thPercentile();
+  }
+
+  @Override
+  protected double get999thPercentile(Snapshot snapshot) {
+    return snapshot.get999thPercentile();
   }
 
   public static Builder builder() {
diff --git a/prometheus-metrics-instrumentation-dropwizard/src/test/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExportsTest.java b/prometheus-metrics-instrumentation-dropwizard/src/test/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExportsTest.java
index ba5407942..c4c0b6241 100644
--- a/prometheus-metrics-instrumentation-dropwizard/src/test/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExportsTest.java
+++ b/prometheus-metrics-instrumentation-dropwizard/src/test/java/io/prometheus/metrics/instrumentation/dropwizard/DropwizardExportsTest.java
@@ -23,7 +23,7 @@ class DropwizardExportsTest {
   private MetricRegistry metricRegistry;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     metricRegistry = new MetricRegistry();
     DropwizardExports.builder()
         .dropwizardRegistry(metricRegistry)
@@ -32,21 +32,21 @@ public void setUp() {
   }
 
   @Test
-  public void testBuilderThrowsErrorOnNullRegistry() {
+  void testBuilderThrowsErrorOnNullRegistry() {
     assertThatThrownBy(
             () -> DropwizardExports.builder().dropwizardRegistry(null).register(registry))
         .isInstanceOf(IllegalArgumentException.class);
   }
 
   @Test
-  public void testBuilderCreatesOkay() {
+  void testBuilderCreatesOkay() {
     assertThatCode(
             () -> DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(registry))
         .doesNotThrowAnyException();
   }
 
   @Test
-  public void testCounter() {
+  void testCounter() {
     metricRegistry.counter("foo.bar").inc(1);
     String expected =
 """
@@ -60,7 +60,7 @@ public void testCounter() {
   }
 
   @Test
-  public void testGauge() {
+  void testGauge() {
     // don't convert to lambda, as we need to test the type
     Gauge<Integer> integerGauge =
         new Gauge<Integer>() {
@@ -128,7 +128,7 @@ public Boolean getValue() {
   }
 
   @Test
-  public void testInvalidGaugeType() {
+  void testInvalidGaugeType() {
     Gauge<String> invalidGauge = () -> "foobar";
 
     metricRegistry.register("invalid_gauge", invalidGauge);
@@ -138,7 +138,7 @@ public void testInvalidGaugeType() {
   }
 
   @Test
-  public void testGaugeReturningNullValue() {
+  void testGaugeReturningNullValue() {
     Gauge<String> invalidGauge = () -> null;
     metricRegistry.register("invalid_gauge", invalidGauge);
     String expected = "# EOF\n";
@@ -146,7 +146,7 @@ public void testGaugeReturningNullValue() {
   }
 
   @Test
-  public void testHistogram() {
+  void testHistogram() {
     // just test the standard mapper
     final MetricRegistry metricRegistry = new MetricRegistry();
     PrometheusRegistry pmRegistry = new PrometheusRegistry();
@@ -199,7 +199,7 @@ public void testHistogram() {
   }
 
   @Test
-  public void testMeter() {
+  void testMeter() {
     Meter meter = metricRegistry.meter("meter");
     meter.mark();
     meter.mark();
@@ -215,7 +215,7 @@ public void testMeter() {
   }
 
   @Test
-  public void testTimer() throws InterruptedException {
+  void testTimer() throws InterruptedException {
     final MetricRegistry metricRegistry = new MetricRegistry();
     DropwizardExports exports = new DropwizardExports(metricRegistry);
     Timer t = metricRegistry.timer("timer");
@@ -239,7 +239,7 @@ public void testTimer() throws InterruptedException {
   }
 
   @Test
-  public void testThatMetricHelpUsesOriginalDropwizardName() {
+  void testThatMetricHelpUsesOriginalDropwizardName() {
     metricRegistry.timer("my.application.namedTimer1");
     metricRegistry.counter("my.application.namedCounter1");
     metricRegistry.meter("my.application.namedMeter1");
diff --git a/prometheus-metrics-instrumentation-dropwizard5/pom.xml b/prometheus-metrics-instrumentation-dropwizard5/pom.xml
index 692e321bd..6e1d418dd 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/pom.xml
+++ b/prometheus-metrics-instrumentation-dropwizard5/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-dropwizard5</artifactId>
@@ -19,10 +18,16 @@
 
   <properties>
     <automatic.module.name>io.prometheus.metrics.instrumentation.dropwizard5</automatic.module.name>
-    <jacoco.line-coverage>0.50</jacoco.line-coverage>
+    <jacoco.line-coverage>0.60</jacoco.line-coverage>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
@@ -31,7 +36,7 @@
     <dependency>
       <groupId>io.dropwizard.metrics5</groupId>
       <artifactId>metrics-core</artifactId>
-      <version>5.0.5</version>
+      <version>5.0.7</version>
       <scope>provided</scope>
     </dependency>
     <!-- Test Dependencies -->
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java
index c68d26f49..dec51dc92 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExports.java
@@ -10,44 +10,39 @@
 import io.dropwizard.metrics5.MetricRegistry;
 import io.dropwizard.metrics5.Snapshot;
 import io.dropwizard.metrics5.Timer;
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.instrumentation.dropwizard5.internal.AbstractDropwizardExports;
 import io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper;
-import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
-import io.prometheus.metrics.model.snapshots.CounterSnapshot;
-import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
-import io.prometheus.metrics.model.snapshots.MetricMetadata;
-import io.prometheus.metrics.model.snapshots.MetricSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
-import io.prometheus.metrics.model.snapshots.PrometheusNaming;
-import io.prometheus.metrics.model.snapshots.Quantiles;
-import io.prometheus.metrics.model.snapshots.SummarySnapshot;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.function.BiFunction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
-/** Collect Dropwizard metrics from a MetricRegistry. */
-public class DropwizardExports implements MultiCollector {
-  private static final Logger logger = Logger.getLogger(DropwizardExports.class.getName());
-  private final MetricRegistry registry;
-  private final MetricFilter metricFilter;
-  @Nullable private final CustomLabelMapper labelMapper;
-  private final InvalidMetricHandler invalidMetricHandler;
+/**
+ * Collect Dropwizard 5.x metrics from a MetricRegistry.
+ *
+ * <p>This is a thin wrapper around {@link AbstractDropwizardExports} that handles the Dropwizard
+ * 5.x specific API where metric names are {@link MetricName} objects.
+ */
+@StableApi
+public class DropwizardExports
+    extends AbstractDropwizardExports<
+        MetricRegistry,
+        MetricFilter,
+        Counter,
+        Gauge<?>,
+        Histogram,
+        Timer,
+        Meter,
+        Metric,
+        Snapshot> {
 
   /**
-   * Creates a new DropwizardExports and {@link MetricFilter#ALL}.
+   * Creates a new DropwizardExports with {@link MetricFilter#ALL}.
    *
    * @param registry a metric registry to export in prometheus.
    */
   public DropwizardExports(MetricRegistry registry) {
-    super();
-    this.registry = registry;
-    this.metricFilter = MetricFilter.ALL;
-    this.labelMapper = null;
-    this.invalidMetricHandler = InvalidMetricHandler.ALWAYS_THROW;
+    this(registry, MetricFilter.ALL, null, InvalidMetricHandler.ALWAYS_THROW);
   }
 
   /**
@@ -57,10 +52,7 @@ public DropwizardExports(MetricRegistry registry) {
    * @param metricFilter a custom metric filter.
    */
   public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) {
-    this.registry = registry;
-    this.metricFilter = metricFilter;
-    this.labelMapper = null;
-    this.invalidMetricHandler = InvalidMetricHandler.ALWAYS_THROW;
+    this(registry, metricFilter, null, InvalidMetricHandler.ALWAYS_THROW);
   }
 
   /**
@@ -70,176 +62,121 @@ public DropwizardExports(MetricRegistry registry, MetricFilter metricFilter) {
    */
   public DropwizardExports(
       MetricRegistry registry, MetricFilter metricFilter, @Nullable CustomLabelMapper labelMapper) {
-    this.registry = registry;
-    this.metricFilter = metricFilter;
-    this.labelMapper = labelMapper;
-    this.invalidMetricHandler = InvalidMetricHandler.ALWAYS_THROW;
+    this(registry, metricFilter, labelMapper, InvalidMetricHandler.ALWAYS_THROW);
   }
 
   /**
    * @param registry a metric registry to export in prometheus.
    * @param metricFilter a custom metric filter.
    * @param labelMapper a labelMapper to use to map labels.
+   * @param invalidMetricHandler handler for invalid metrics.
    */
   private DropwizardExports(
       MetricRegistry registry,
       MetricFilter metricFilter,
       @Nullable CustomLabelMapper labelMapper,
       InvalidMetricHandler invalidMetricHandler) {
-    this.registry = registry;
-    this.metricFilter = metricFilter;
-    this.labelMapper = labelMapper;
-    this.invalidMetricHandler = invalidMetricHandler;
+    super(registry, metricFilter, labelMapper, invalidMetricHandler);
   }
 
-  private static String getHelpMessage(String metricName, Metric metric) {
-    return String.format(
-        "Generated from Dropwizard metric import (metric=%s, type=%s)",
-        metricName, metric.getClass().getName());
+  @Override
+  protected MetricSnapshots collectMetricSnapshots() {
+    MetricSnapshots.Builder metricSnapshots = MetricSnapshots.builder();
+    collectMetricKind(
+        metricSnapshots,
+        registry.getGauges(metricFilter),
+        this::fromGauge,
+        this::extractMetricName);
+    collectMetricKind(
+        metricSnapshots,
+        registry.getCounters(metricFilter),
+        this::fromCounter,
+        this::extractMetricName);
+    collectMetricKind(
+        metricSnapshots,
+        registry.getHistograms(metricFilter),
+        this::fromHistogram,
+        this::extractMetricName);
+    collectMetricKind(
+        metricSnapshots,
+        registry.getTimers(metricFilter),
+        this::fromTimer,
+        this::extractMetricName);
+    collectMetricKind(
+        metricSnapshots,
+        registry.getMeters(metricFilter),
+        this::fromMeter,
+        this::extractMetricName);
+    return metricSnapshots.build();
   }
 
-  private MetricMetadata getMetricMetaData(String metricName, Metric metric) {
-    String name = labelMapper != null ? labelMapper.getName(metricName) : metricName;
-    return new MetricMetadata(
-        PrometheusNaming.sanitizeMetricName(name), getHelpMessage(metricName, metric));
+  private String extractMetricName(MetricName metricName) {
+    return metricName.getKey();
   }
 
-  /**
-   * Export counter as Prometheus <a
-   * href="https://prometheus.io/docs/concepts/metric_types/#gauge">Gauge</a>.
-   */
-  MetricSnapshot fromCounter(String dropwizardName, Counter counter) {
-    MetricMetadata metadata = getMetricMetaData(dropwizardName, counter);
-    CounterSnapshot.CounterDataPointSnapshot.Builder dataPointBuilder =
-        CounterSnapshot.CounterDataPointSnapshot.builder()
-            .value(Long.valueOf(counter.getCount()).doubleValue());
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new CounterSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected long getCounterCount(Counter counter) {
+    return counter.getCount();
   }
 
-  /** Export gauge as a prometheus gauge. */
-  @Nullable
-  MetricSnapshot fromGauge(String dropwizardName, Gauge<?> gauge) {
-    Object obj = gauge.getValue();
-    double value;
-    if (obj instanceof Number) {
-      value = ((Number) obj).doubleValue();
-    } else if (obj instanceof Boolean) {
-      value = ((Boolean) obj) ? 1 : 0;
-    } else {
-      logger.log(
-          Level.FINE,
-          String.format(
-              "Invalid type for Gauge %s: %s",
-              PrometheusNaming.sanitizeMetricName(dropwizardName),
-              obj == null ? "null" : obj.getClass().getName()));
-      return null;
-    }
-    MetricMetadata metadata = getMetricMetaData(dropwizardName, gauge);
-    GaugeSnapshot.GaugeDataPointSnapshot.Builder dataPointBuilder =
-        GaugeSnapshot.GaugeDataPointSnapshot.builder().value(value);
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new GaugeSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected Object getGaugeValue(Gauge<?> gauge) {
+    return gauge.getValue();
   }
 
-  /**
-   * Export a histogram snapshot as a prometheus SUMMARY.
-   *
-   * @param dropwizardName metric name.
-   * @param snapshot the histogram snapshot.
-   * @param count the total sample count for this snapshot.
-   * @param factor a factor to apply to histogram values.
-   */
-  MetricSnapshot fromSnapshotAndCount(
-      String dropwizardName, Snapshot snapshot, long count, double factor, String helpMessage) {
-    Quantiles quantiles =
-        Quantiles.builder()
-            .quantile(0.5, snapshot.getMedian() * factor)
-            .quantile(0.75, snapshot.get75thPercentile() * factor)
-            .quantile(0.95, snapshot.get95thPercentile() * factor)
-            .quantile(0.98, snapshot.get98thPercentile() * factor)
-            .quantile(0.99, snapshot.get99thPercentile() * factor)
-            .quantile(0.999, snapshot.get999thPercentile() * factor)
-            .build();
+  @Override
+  protected Snapshot getHistogramSnapshot(Histogram histogram) {
+    return histogram.getSnapshot();
+  }
 
-    String name = labelMapper != null ? labelMapper.getName(dropwizardName) : dropwizardName;
-    MetricMetadata metadata =
-        new MetricMetadata(PrometheusNaming.sanitizeMetricName(name), helpMessage);
-    SummarySnapshot.SummaryDataPointSnapshot.Builder dataPointBuilder =
-        SummarySnapshot.SummaryDataPointSnapshot.builder().quantiles(quantiles).count(count);
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new SummarySnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected long getHistogramCount(Histogram histogram) {
+    return histogram.getCount();
+  }
+
+  @Override
+  protected Snapshot getTimerSnapshot(Timer timer) {
+    return timer.getSnapshot();
   }
 
-  /** Convert histogram snapshot. */
-  MetricSnapshot fromHistogram(String dropwizardName, Histogram histogram) {
-    return fromSnapshotAndCount(
-        dropwizardName,
-        histogram.getSnapshot(),
-        histogram.getCount(),
-        1.0,
-        getHelpMessage(dropwizardName, histogram));
+  @Override
+  protected long getTimerCount(Timer timer) {
+    return timer.getCount();
   }
 
-  /** Export Dropwizard Timer as a histogram. Use TIME_UNIT as time unit. */
-  MetricSnapshot fromTimer(String dropwizardName, Timer timer) {
-    return fromSnapshotAndCount(
-        dropwizardName,
-        timer.getSnapshot(),
-        timer.getCount(),
-        1.0D / TimeUnit.SECONDS.toNanos(1L),
-        getHelpMessage(dropwizardName, timer));
+  @Override
+  protected long getMeterCount(Meter meter) {
+    return meter.getCount();
   }
 
-  /** Export a Meter as a prometheus COUNTER. */
-  MetricSnapshot fromMeter(String dropwizardName, Meter meter) {
-    MetricMetadata metadata = getMetricMetaData(dropwizardName + "_total", meter);
-    CounterSnapshot.CounterDataPointSnapshot.Builder dataPointBuilder =
-        CounterSnapshot.CounterDataPointSnapshot.builder().value(meter.getCount());
-    if (labelMapper != null) {
-      dataPointBuilder.labels(
-          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
-    }
-    return new CounterSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  @Override
+  protected double getMedian(Snapshot snapshot) {
+    return snapshot.getMedian();
   }
 
   @Override
-  public MetricSnapshots collect() {
-    MetricSnapshots.Builder metricSnapshots = MetricSnapshots.builder();
-    collectMetricKind(metricSnapshots, registry.getGauges(metricFilter), this::fromGauge);
-    collectMetricKind(metricSnapshots, registry.getCounters(metricFilter), this::fromCounter);
-    collectMetricKind(metricSnapshots, registry.getHistograms(metricFilter), this::fromHistogram);
-    collectMetricKind(metricSnapshots, registry.getTimers(metricFilter), this::fromTimer);
-    collectMetricKind(metricSnapshots, registry.getMeters(metricFilter), this::fromMeter);
-    return metricSnapshots.build();
+  protected double get75thPercentile(Snapshot snapshot) {
+    return snapshot.get75thPercentile();
   }
 
-  private <T> void collectMetricKind(
-      MetricSnapshots.Builder builder,
-      Map<MetricName, T> metric,
-      BiFunction<String, T, MetricSnapshot> toSnapshot) {
-    for (Map.Entry<MetricName, T> entry : metric.entrySet()) {
-      String metricName = entry.getKey().getKey();
-      try {
-        MetricSnapshot snapshot = toSnapshot.apply(metricName, entry.getValue());
-        if (snapshot != null) {
-          builder.metricSnapshot(snapshot);
-        }
-      } catch (Exception e) {
-        if (!invalidMetricHandler.suppressException(metricName, e)) {
-          throw e;
-        }
-      }
-    }
+  @Override
+  protected double get95thPercentile(Snapshot snapshot) {
+    return snapshot.get95thPercentile();
+  }
+
+  @Override
+  protected double get98thPercentile(Snapshot snapshot) {
+    return snapshot.get98thPercentile();
+  }
+
+  @Override
+  protected double get99thPercentile(Snapshot snapshot) {
+    return snapshot.get99thPercentile();
+  }
+
+  @Override
+  protected double get999thPercentile(Snapshot snapshot) {
+    return snapshot.get999thPercentile();
   }
 
   public static Builder builder() {
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/InvalidMetricHandler.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/InvalidMetricHandler.java
index bac1aa0af..cb7d965ff 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/InvalidMetricHandler.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/InvalidMetricHandler.java
@@ -1,6 +1,9 @@
 package io.prometheus.metrics.instrumentation.dropwizard5;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 @FunctionalInterface
+@StableApi
 public interface InvalidMetricHandler {
   InvalidMetricHandler ALWAYS_THROW = (metricName, exc) -> false;
 
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/internal/AbstractDropwizardExports.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/internal/AbstractDropwizardExports.java
new file mode 100644
index 000000000..df9ea8ffa
--- /dev/null
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/internal/AbstractDropwizardExports.java
@@ -0,0 +1,236 @@
+package io.prometheus.metrics.instrumentation.dropwizard5.internal;
+
+import io.prometheus.metrics.instrumentation.dropwizard5.InvalidMetricHandler;
+import io.prometheus.metrics.instrumentation.dropwizard5.labels.CustomLabelMapper;
+import io.prometheus.metrics.model.registry.MultiCollector;
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.PrometheusNaming;
+import io.prometheus.metrics.model.snapshots.Quantiles;
+import io.prometheus.metrics.model.snapshots.SummarySnapshot;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BiFunction;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.Nullable;
+
+/**
+ * Abstract base class for Dropwizard metrics exporters. Contains all the common logic for
+ * converting Dropwizard metrics to Prometheus metrics. Subclasses only need to implement {@link
+ * #collectMetricSnapshots()} to handle version-specific registry APIs.
+ *
+ * @param <R> The Dropwizard MetricRegistry type
+ * @param <F> The Dropwizard MetricFilter type
+ * @param <C> The Dropwizard Counter type
+ * @param <G> The Dropwizard Gauge type
+ * @param <H> The Dropwizard Histogram type
+ * @param <T> The Dropwizard Timer type
+ * @param <M> The Dropwizard Meter type
+ * @param <B> The Dropwizard Metric base type
+ * @param <S> The Dropwizard Snapshot type
+ */
+public abstract class AbstractDropwizardExports<R, F, C, G, H, T, M, B, S>
+    implements MultiCollector {
+
+  private static final Logger logger = Logger.getLogger(AbstractDropwizardExports.class.getName());
+
+  protected final R registry;
+  protected final F metricFilter;
+  @Nullable protected final CustomLabelMapper labelMapper;
+  protected final InvalidMetricHandler invalidMetricHandler;
+
+  protected AbstractDropwizardExports(
+      R registry,
+      F metricFilter,
+      @Nullable CustomLabelMapper labelMapper,
+      InvalidMetricHandler invalidMetricHandler) {
+    this.registry = registry;
+    this.metricFilter = metricFilter;
+    this.labelMapper = labelMapper;
+    this.invalidMetricHandler = invalidMetricHandler;
+  }
+
+  protected static String getHelpMessage(String metricName, Object metric) {
+    return String.format(
+        "Generated from Dropwizard metric import (metric=%s, type=%s)",
+        metricName, metric.getClass().getName());
+  }
+
+  protected MetricMetadata getMetricMetaData(String metricName, B metric) {
+    String name = labelMapper != null ? labelMapper.getName(metricName) : metricName;
+    return new MetricMetadata(
+        PrometheusNaming.sanitizeMetricName(name), getHelpMessage(metricName, metric));
+  }
+
+  /**
+   * Export counter as Prometheus <a
+   * href="https://prometheus.io/docs/concepts/metric_types/#gauge">Gauge</a>.
+   */
+  @SuppressWarnings("unchecked")
+  protected MetricSnapshot fromCounter(String dropwizardName, C counter) {
+    long count = getCounterCount(counter);
+    MetricMetadata metadata = getMetricMetaData(dropwizardName, (B) counter);
+    CounterSnapshot.CounterDataPointSnapshot.Builder dataPointBuilder =
+        CounterSnapshot.CounterDataPointSnapshot.builder().value(Long.valueOf(count).doubleValue());
+    if (labelMapper != null) {
+      dataPointBuilder.labels(
+          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
+    }
+    return new CounterSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  }
+
+  /** Export gauge as a prometheus gauge. */
+  @SuppressWarnings("unchecked")
+  @Nullable
+  protected MetricSnapshot fromGauge(String dropwizardName, G gauge) {
+    Object obj = getGaugeValue(gauge);
+    double value;
+    if (obj instanceof Number) {
+      value = ((Number) obj).doubleValue();
+    } else if (obj instanceof Boolean) {
+      value = ((Boolean) obj) ? 1 : 0;
+    } else {
+      logger.log(
+          Level.FINE,
+          String.format(
+              "Invalid type for Gauge %s: %s",
+              PrometheusNaming.sanitizeMetricName(dropwizardName),
+              obj == null ? "null" : obj.getClass().getName()));
+      return null;
+    }
+    MetricMetadata metadata = getMetricMetaData(dropwizardName, (B) gauge);
+    GaugeSnapshot.GaugeDataPointSnapshot.Builder dataPointBuilder =
+        GaugeSnapshot.GaugeDataPointSnapshot.builder().value(value);
+    if (labelMapper != null) {
+      dataPointBuilder.labels(
+          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
+    }
+    return new GaugeSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  }
+
+  /**
+   * Export a histogram snapshot as a prometheus SUMMARY.
+   *
+   * @param dropwizardName metric name.
+   * @param snapshot the histogram snapshot.
+   * @param count the total sample count for this snapshot.
+   * @param factor a factor to apply to histogram values.
+   */
+  protected MetricSnapshot fromSnapshotAndCount(
+      String dropwizardName, S snapshot, long count, double factor, String helpMessage) {
+    Quantiles quantiles =
+        Quantiles.builder()
+            .quantile(0.5, getMedian(snapshot) * factor)
+            .quantile(0.75, get75thPercentile(snapshot) * factor)
+            .quantile(0.95, get95thPercentile(snapshot) * factor)
+            .quantile(0.98, get98thPercentile(snapshot) * factor)
+            .quantile(0.99, get99thPercentile(snapshot) * factor)
+            .quantile(0.999, get999thPercentile(snapshot) * factor)
+            .build();
+
+    String name = labelMapper != null ? labelMapper.getName(dropwizardName) : dropwizardName;
+    MetricMetadata metadata =
+        new MetricMetadata(PrometheusNaming.sanitizeMetricName(name), helpMessage);
+    SummarySnapshot.SummaryDataPointSnapshot.Builder dataPointBuilder =
+        SummarySnapshot.SummaryDataPointSnapshot.builder().quantiles(quantiles).count(count);
+    if (labelMapper != null) {
+      dataPointBuilder.labels(
+          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
+    }
+    return new SummarySnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  }
+
+  /** Convert histogram snapshot. */
+  protected MetricSnapshot fromHistogram(String dropwizardName, H histogram) {
+    S snapshot = getHistogramSnapshot(histogram);
+    long count = getHistogramCount(histogram);
+    return fromSnapshotAndCount(
+        dropwizardName, snapshot, count, 1.0, getHelpMessage(dropwizardName, histogram));
+  }
+
+  /** Export Dropwizard Timer as a histogram. Use TIME_UNIT as time unit. */
+  protected MetricSnapshot fromTimer(String dropwizardName, T timer) {
+    S snapshot = getTimerSnapshot(timer);
+    long count = getTimerCount(timer);
+    return fromSnapshotAndCount(
+        dropwizardName,
+        snapshot,
+        count,
+        1.0D / TimeUnit.SECONDS.toNanos(1L),
+        getHelpMessage(dropwizardName, timer));
+  }
+
+  /** Export a Meter as a prometheus COUNTER. */
+  @SuppressWarnings("unchecked")
+  protected MetricSnapshot fromMeter(String dropwizardName, M meter) {
+    MetricMetadata metadata = getMetricMetaData(dropwizardName + "_total", (B) meter);
+    CounterSnapshot.CounterDataPointSnapshot.Builder dataPointBuilder =
+        CounterSnapshot.CounterDataPointSnapshot.builder().value(getMeterCount(meter));
+    if (labelMapper != null) {
+      dataPointBuilder.labels(
+          labelMapper.getLabels(dropwizardName, Collections.emptyList(), Collections.emptyList()));
+    }
+    return new CounterSnapshot(metadata, Collections.singletonList(dataPointBuilder.build()));
+  }
+
+  @Override
+  public MetricSnapshots collect() {
+    return collectMetricSnapshots();
+  }
+
+  protected <K, V> void collectMetricKind(
+      MetricSnapshots.Builder builder,
+      Map<K, V> metrics,
+      BiFunction<String, V, MetricSnapshot> toSnapshot,
+      java.util.function.Function<K, String> keyExtractor) {
+    for (Map.Entry<K, V> entry : metrics.entrySet()) {
+      String metricName = keyExtractor.apply(entry.getKey());
+      try {
+        MetricSnapshot snapshot = toSnapshot.apply(metricName, entry.getValue());
+        if (snapshot != null) {
+          builder.metricSnapshot(snapshot);
+        }
+      } catch (RuntimeException e) {
+        if (!invalidMetricHandler.suppressException(metricName, e)) {
+          throw e;
+        }
+      }
+    }
+  }
+
+  // Abstract methods to be implemented by version-specific subclasses
+
+  /** Collect all metric snapshots from the registry. */
+  protected abstract MetricSnapshots collectMetricSnapshots();
+
+  protected abstract long getCounterCount(C counter);
+
+  protected abstract Object getGaugeValue(G gauge);
+
+  protected abstract S getHistogramSnapshot(H histogram);
+
+  protected abstract long getHistogramCount(H histogram);
+
+  protected abstract S getTimerSnapshot(T timer);
+
+  protected abstract long getTimerCount(T timer);
+
+  protected abstract long getMeterCount(M meter);
+
+  protected abstract double getMedian(S snapshot);
+
+  protected abstract double get75thPercentile(S snapshot);
+
+  protected abstract double get95thPercentile(S snapshot);
+
+  protected abstract double get98thPercentile(S snapshot);
+
+  protected abstract double get99thPercentile(S snapshot);
+
+  protected abstract double get999thPercentile(S snapshot);
+}
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapper.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapper.java
index f2174970c..61fb5de5a 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapper.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapper.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.instrumentation.dropwizard5.labels;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.snapshots.Labels;
 import java.util.ArrayList;
 import java.util.List;
@@ -10,6 +11,7 @@
  * labels and names. Prometheus metric name and labels are extracted from the Dropwizard name based
  * on the provided list of {@link MapperConfig}s. The FIRST matching config will be used.
  */
+@StableApi
 public class CustomLabelMapper {
   private final List<CompiledMapperConfig> compiledMapperConfigs;
 
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePattern.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePattern.java
index c13ffd91c..7ec0445d0 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePattern.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePattern.java
@@ -9,13 +9,16 @@
 
 /**
  * GraphiteNamePattern is initialised with a simplified glob pattern that only allows '*' as special
- * character. Examples of valid patterns:
+ * character. Accepts a broad range of metric name patterns including single-level names, names with
+ * underscores, hyphens, and colons. Examples of valid patterns:
  *
  * <ul>
  *   <li>org.test.controller.gather.status.400
  *   <li>org.test.controller.gather.status.*
  *   <li>org.test.controller.*.status.*
  *   <li>*.test.controller.*.status.*
+ *   <li>app_metric_some_count
+ *   <li>io.dropwizard.jetty.MutableServletContextHandler.*-requests
  * </ul>
  *
  * <p>It contains logic to match a metric name and to extract named parameters from it.
@@ -32,6 +35,10 @@ class GraphiteNamePattern {
    * @param pattern The glob style pattern to be used.
    */
   GraphiteNamePattern(String pattern) throws IllegalArgumentException {
+    if (pattern.contains("**")) {
+      throw new IllegalArgumentException(
+          String.format("Provided pattern [%s] must not contain '**' (double-star glob)", pattern));
+    }
     if (!VALIDATION_PATTERN.matcher(pattern).matches()) {
       throw new IllegalArgumentException(
           String.format("Provided pattern [%s] does not matches [%s]", pattern, METRIC_GLOB_REGEX));
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfig.java b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfig.java
index 13d890861..46d4d36e4 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfig.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/main/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfig.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.instrumentation.dropwizard5.labels;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Pattern;
@@ -15,12 +16,16 @@
  * <p>Dropwizard metrics that match the "match" pattern will be further processed to have a new name
  * and new labels based on this config.
  */
+@StableApi
 public final class MapperConfig {
-  // each part of the metric name between dots
-  private static final String METRIC_PART_REGEX = "[a-zA-Z_0-9](-?[a-zA-Z0-9_])+";
-  // Simplified GLOB: we can have "*." at the beginning and "*" only at the end
+  // Each part of the metric name between dots. Accepts letters, digits, underscores, hyphens,
+  // colons, and glob wildcards (*) to support a broad range of metric naming conventions.
+  private static final String METRIC_PART_REGEX = "[a-zA-Z_0-9*][a-zA-Z0-9_:*-]*";
+  // Simplified GLOB: accepts single-level names, dot-separated names, and glob patterns with '*'.
+  // The pattern requires at least one non-empty segment and does not allow empty segments (double
+  // dots) or empty/whitespace-only strings. The '**' glob is rejected separately in validateMatch.
   static final String METRIC_GLOB_REGEX =
-      "^(\\*\\.|" + METRIC_PART_REGEX + "\\.)+(\\*|" + METRIC_PART_REGEX + ")$";
+      "^(" + METRIC_PART_REGEX + ")(\\." + METRIC_PART_REGEX + ")*$";
   // Labels validation.
   private static final String LABEL_REGEX = "^[a-zA-Z_][a-zA-Z0-9_]+$";
   private static final Pattern MATCH_EXPRESSION_PATTERN = Pattern.compile(METRIC_GLOB_REGEX);
@@ -109,6 +114,10 @@ public void setLabels(Map<String, String> labels) {
   }
 
   private void validateMatch(String match) {
+    if (match.contains("**")) {
+      throw new IllegalArgumentException(
+          String.format("Match expression [%s] must not contain '**' (double-star glob)", match));
+    }
     if (!MATCH_EXPRESSION_PATTERN.matcher(match).matches()) {
       throw new IllegalArgumentException(
           String.format(
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java
index ff76438d1..7a7dcdf31 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java
@@ -24,13 +24,13 @@ class DropwizardExportsTest {
   private MetricRegistry metricRegistry;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     metricRegistry = new MetricRegistry();
     DropwizardExports.builder().dropwizardRegistry(metricRegistry).register(registry);
   }
 
   @Test
-  public void testCounter() {
+  void testCounter() {
     metricRegistry.counter("foo.bar").inc(1);
     String expected =
 """
@@ -44,7 +44,7 @@ public void testCounter() {
   }
 
   @Test
-  public void testGauge() {
+  void testGauge() {
     // don't convert to lambda, as we need to test the type
     Gauge<Integer> integerGauge =
         new Gauge<Integer>() {
@@ -112,7 +112,7 @@ public Boolean getValue() {
   }
 
   @Test
-  public void testInvalidGaugeType() {
+  void testInvalidGaugeType() {
     Gauge<String> invalidGauge = () -> "foobar";
 
     metricRegistry.register(MetricName.parse("invalid_gauge"), invalidGauge);
@@ -122,7 +122,7 @@ public void testInvalidGaugeType() {
   }
 
   @Test
-  public void testGaugeReturningNullValue() {
+  void testGaugeReturningNullValue() {
     Gauge<String> invalidGauge = () -> null;
     metricRegistry.register(MetricName.parse("invalid_gauge"), invalidGauge);
     String expected = "# EOF\n";
@@ -130,7 +130,7 @@ public void testGaugeReturningNullValue() {
   }
 
   @Test
-  public void testHistogram() {
+  void testHistogram() {
     // just test the standard mapper
     final MetricRegistry metricRegistry = new MetricRegistry();
     PrometheusRegistry pmRegistry = new PrometheusRegistry();
@@ -204,7 +204,7 @@ public void testHistogram() {
   }
 
   @Test
-  public void testMeter() {
+  void testMeter() {
     Meter meter = metricRegistry.meter("meter");
     meter.mark();
     meter.mark();
@@ -220,7 +220,7 @@ public void testMeter() {
   }
 
   @Test
-  public void testTimer() throws InterruptedException {
+  void testTimer() throws InterruptedException {
     final MetricRegistry metricRegistry = new MetricRegistry();
     DropwizardExports exports = new DropwizardExports(metricRegistry);
     Timer t = metricRegistry.timer("timer");
@@ -246,7 +246,7 @@ public void testTimer() throws InterruptedException {
   }
 
   @Test
-  public void testThatMetricHelpUsesOriginalDropwizardName() {
+  void testThatMetricHelpUsesOriginalDropwizardName() {
 
     metricRegistry.timer("my.application.namedTimer1");
     metricRegistry.counter("my.application.namedCounter1");
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapperTest.java b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapperTest.java
index 44c365898..8c61e1a01 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapperTest.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/CustomLabelMapperTest.java
@@ -20,18 +20,18 @@ class CustomLabelMapperTest {
   private MetricRegistry metricRegistry;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     metricRegistry = new MetricRegistry();
   }
 
   @Test
-  public void test_WHEN_EmptyConfig_THEN_Fail() {
+  void test_WHEN_EmptyConfig_THEN_Fail() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> new CustomLabelMapper(Collections.emptyList()));
   }
 
   @Test
-  public void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
+  void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
     final List<MapperConfig> mapperConfigs =
         Arrays.asList(
             new MapperConfig("client-nope.*.*.*"),
@@ -56,7 +56,7 @@ public void test_WHEN_NoMatches_THEN_ShouldReturnDefaultSample() {
   }
 
   @Test
-  public void test_WHEN_OneMatch_THEN_ShouldReturnConverted() {
+  void test_WHEN_OneMatch_THEN_ShouldReturnConverted() {
     final Map<String, String> labels = new HashMap<String, String>();
     labels.put("service", "${0}");
     final MapperConfig mapperConfig =
@@ -86,7 +86,7 @@ public void test_WHEN_OneMatch_THEN_ShouldReturnConverted() {
   }
 
   @Test
-  public void test_WHEN_MoreMatches_THEN_ShouldReturnFirstOne() {
+  void test_WHEN_MoreMatches_THEN_ShouldReturnFirstOne() {
     final Map<String, String> labels = new HashMap<>();
     labels.put("service", "${0}");
     final MapperConfig mapperConfig =
@@ -117,7 +117,7 @@ public void test_WHEN_MoreMatches_THEN_ShouldReturnFirstOne() {
   }
 
   @Test
-  public void test_WHEN_MoreMatchesReverseOrder_THEN_ShouldReturnFirstOne() {
+  void test_WHEN_MoreMatchesReverseOrder_THEN_ShouldReturnFirstOne() {
     final Map<String, String> labels = new LinkedHashMap<>();
     labels.put("service", "${0}");
     labels.put("status", "${1}");
@@ -154,7 +154,7 @@ public void test_WHEN_MoreMatchesReverseOrder_THEN_ShouldReturnFirstOne() {
   }
 
   @Test
-  public void test_WHEN_MoreToFormatInLabelsAndName_THEN_ShouldReturnCorrectSample() {
+  void test_WHEN_MoreToFormatInLabelsAndName_THEN_ShouldReturnCorrectSample() {
     final Map<String, String> labels = new LinkedHashMap<>();
     labels.put("service", "${0}_${1}");
     labels.put("status", "s_${1}");
@@ -187,7 +187,7 @@ public void test_WHEN_MoreToFormatInLabelsAndName_THEN_ShouldReturnCorrectSample
   }
 
   @Test
-  public void test_WHEN_AdditionalLabels_THEN_ShouldReturnCorrectSample() {
+  void test_WHEN_AdditionalLabels_THEN_ShouldReturnCorrectSample() {
     final Map<String, String> labels = new LinkedHashMap<>();
     labels.put("service", "${0}");
     labels.put("status", "s_${1}");
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePatternTest.java b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePatternTest.java
index ed27d7f22..aa3e20e6b 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePatternTest.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePatternTest.java
@@ -13,22 +13,16 @@
 class GraphiteNamePatternTest {
 
   @Test
-  public void createNew_WHEN_InvalidPattern_THEN_ShouldThrowException() {
+  void createNew_WHEN_InvalidPattern_THEN_ShouldThrowException() {
     List<String> invalidPatterns =
         Arrays.asList(
             "",
-            "a",
-            "1org",
             "1org.",
             "org.",
             "org.**",
-            "org.**",
-            "org.company-",
             "org.company-.",
-            "org.company-*",
             "org.company.**",
             "org.company.**-",
-            "org.com*pany.*",
             "org.test.contr.oller.gather.status..400",
             "org.test.controller.gather.status..400");
     for (String pattern : invalidPatterns) {
@@ -39,7 +33,7 @@ public void createNew_WHEN_InvalidPattern_THEN_ShouldThrowException() {
   }
 
   @Test
-  public void createNew_WHEN_ValidPattern_THEN_ShouldCreateThePatternSuccessfully() {
+  void createNew_WHEN_ValidPattern_THEN_ShouldCreateThePatternSuccessfully() {
     final List<String> validPatterns =
         Arrays.asList(
             "org.test.controller.gather.status.400",
@@ -47,14 +41,29 @@ public void createNew_WHEN_ValidPattern_THEN_ShouldCreateThePatternSuccessfully(
             "org.test.controller.*.status.*",
             "*.test.controller.*.status.*",
             "*.test.controller-1.*.status.*",
-            "*.amazing-test.controller-1.*.status.*");
+            "*.amazing-test.controller-1.*.status.*",
+            // Single-level names (previously rejected, fixes #461)
+            "a",
+            "1org",
+            "app_metric_some_count",
+            // Names with colons (fixes #645)
+            "my:metric:name",
+            "org.company:metric.*",
+            // Names with hyphens at boundaries
+            "org.company-",
+            "org.company-*",
+            // Embedded glob in segment (fixes #518)
+            "org.com*pany.*",
+            "io.dropwizard.jetty.MutableServletContextHandler.*-requests",
+            // Standalone glob
+            "*");
     for (String pattern : validPatterns) {
       new GraphiteNamePattern(pattern);
     }
   }
 
   @Test
-  public void createNew_WHEN_ValidPattern_THEN_ShouldInitInternalPatternSuccessfully() {
+  void createNew_WHEN_ValidPattern_THEN_ShouldInitInternalPatternSuccessfully() {
     final Map<String, String> validPatterns = new HashMap<String, String>();
     validPatterns.put(
         "org.test.controller.gather.status.400", "^\\Qorg.test.controller.gather.status.400\\E$");
@@ -74,7 +83,7 @@ public void createNew_WHEN_ValidPattern_THEN_ShouldInitInternalPatternSuccessful
   }
 
   @Test
-  public void match_WHEN_NotMatchingMetricNameProvided_THEN_ShouldNotMatch() {
+  void match_WHEN_NotMatchingMetricNameProvided_THEN_ShouldNotMatch() {
     final GraphiteNamePattern pattern = new GraphiteNamePattern("org.test.controller.*.status.*");
     final List<String> notMatchingMetricNamed =
         Arrays.asList("org.test.controller.status.400", "", null);
@@ -87,7 +96,7 @@ public void match_WHEN_NotMatchingMetricNameProvided_THEN_ShouldNotMatch() {
   }
 
   @Test
-  public void match_WHEN_MatchingMetricNameProvided_THEN_ShouldMatch() {
+  void match_WHEN_MatchingMetricNameProvided_THEN_ShouldMatch() {
     final GraphiteNamePattern pattern = new GraphiteNamePattern("org.test.controller.*.status.*");
     final List<String> matchingMetricNamed =
         Arrays.asList(
@@ -105,7 +114,7 @@ public void match_WHEN_MatchingMetricNameProvided_THEN_ShouldMatch() {
   }
 
   @Test
-  public void extractParameters() {
+  void extractParameters() {
     GraphiteNamePattern pattern;
     Map<String, String> expected = new HashMap<String, String>();
     expected.put("${0}", "gather");
@@ -124,7 +133,7 @@ public void extractParameters() {
   }
 
   @Test
-  public void extractParameters_WHEN_emptyStringInDottedMetricsName_THEN_ShouldReturnEmptyString() {
+  void extractParameters_WHEN_emptyStringInDottedMetricsName_THEN_ShouldReturnEmptyString() {
     GraphiteNamePattern pattern;
     Map<String, String> expected = new HashMap<String, String>();
     expected.put("${0}", "");
@@ -135,7 +144,7 @@ public void extractParameters_WHEN_emptyStringInDottedMetricsName_THEN_ShouldRet
   }
 
   @Test
-  public void extractParameters_WHEN_moreDots_THEN_ShouldReturnNoMatches() {
+  void extractParameters_WHEN_moreDots_THEN_ShouldReturnNoMatches() {
     GraphiteNamePattern pattern;
     pattern = new GraphiteNamePattern("org.test.controller.*.status.*");
     Assertions.assertThat(pattern.extractParameters("org.test.controller...status.400"))
diff --git a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfigTest.java b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfigTest.java
index a17963e0d..dd36ae7db 100644
--- a/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfigTest.java
+++ b/prometheus-metrics-instrumentation-dropwizard5/src/test/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/MapperConfigTest.java
@@ -10,20 +10,20 @@
 
 class MapperConfigTest {
   @Test
-  public void setMatch_WHEN_ExpressionMatchesPattern_AllGood() {
+  void setMatch_WHEN_ExpressionMatchesPattern_AllGood() {
     final MapperConfig mapperConfig = new MapperConfig();
     mapperConfig.setMatch("com.company.meter.*");
     assertThat(mapperConfig.getMatch()).isEqualTo("com.company.meter.*");
   }
 
   @Test
-  public void setMatch_WHEN_ExpressionDoesnNotMatchPattern_ThrowException() {
+  void setMatch_WHEN_ExpressionDoesnNotMatchPattern_ThrowException() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> new MapperConfig().setMatch("com.company.meter.**.yay"));
   }
 
   @Test
-  public void setLabels_WHEN_ExpressionMatchesPattern_AllGood() {
+  void setLabels_WHEN_ExpressionMatchesPattern_AllGood() {
     final MapperConfig mapperConfig = new MapperConfig();
     final Map<String, String> labels = new HashMap<>();
     labels.put("valid", "${0}");
@@ -32,7 +32,7 @@ public void setLabels_WHEN_ExpressionMatchesPattern_AllGood() {
   }
 
   @Test
-  public void setLabels_WHEN_ExpressionDoesnNotMatchPattern_ThrowException() {
+  void setLabels_WHEN_ExpressionDoesnNotMatchPattern_ThrowException() {
     final MapperConfig mapperConfig = new MapperConfig();
     final Map<String, String> labels = new HashMap<>();
     labels.put("valid", "${0}");
@@ -42,13 +42,59 @@ public void setLabels_WHEN_ExpressionDoesnNotMatchPattern_ThrowException() {
   }
 
   @Test
-  public void toString_WHEN_EmptyConfig_AllGood() {
+  void setMatch_WHEN_SingleLevelName_AllGood() {
+    final MapperConfig mapperConfig = new MapperConfig();
+    mapperConfig.setMatch("app_metric_some_count");
+    assertThat(mapperConfig.getMatch()).isEqualTo("app_metric_some_count");
+  }
+
+  @Test
+  void setMatch_WHEN_NameWithColons_AllGood() {
+    final MapperConfig mapperConfig = new MapperConfig();
+    mapperConfig.setMatch("my:metric:name");
+    assertThat(mapperConfig.getMatch()).isEqualTo("my:metric:name");
+  }
+
+  @Test
+  void setMatch_WHEN_EmbeddedGlobInSegment_AllGood() {
+    final MapperConfig mapperConfig = new MapperConfig();
+    mapperConfig.setMatch("io.dropwizard.jetty.MutableServletContextHandler.*-requests");
+    assertThat(mapperConfig.getMatch())
+        .isEqualTo("io.dropwizard.jetty.MutableServletContextHandler.*-requests");
+  }
+
+  @Test
+  void setMatch_WHEN_DoubleStarGlob_ThrowException() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> new MapperConfig().setMatch("org.**"));
+  }
+
+  @Test
+  void setMatch_WHEN_EmptyString_ThrowException() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> new MapperConfig().setMatch(""));
+  }
+
+  @Test
+  void setMatch_WHEN_TrailingDot_ThrowException() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> new MapperConfig().setMatch("org.company."));
+  }
+
+  @Test
+  void setMatch_WHEN_DoubleDot_ThrowException() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> new MapperConfig().setMatch("org..company"));
+  }
+
+  @Test
+  void toString_WHEN_EmptyConfig_AllGood() {
     final MapperConfig mapperConfig = new MapperConfig();
     assertThat(mapperConfig).hasToString("MapperConfig{match=null, name=null, labels={}}");
   }
 
   @Test
-  public void toString_WHEN_FullyConfigured_AllGood() {
+  void toString_WHEN_FullyConfigured_AllGood() {
     final MapperConfig mapperConfig = new MapperConfig();
     mapperConfig.setMatch("com.company.meter.*.foo");
     mapperConfig.setName("foo");
diff --git a/prometheus-metrics-instrumentation-guava/pom.xml b/prometheus-metrics-instrumentation-guava/pom.xml
index b086151b6..fa2de2864 100644
--- a/prometheus-metrics-instrumentation-guava/pom.xml
+++ b/prometheus-metrics-instrumentation-guava/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-guava</artifactId>
@@ -30,6 +29,12 @@
   </developers>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
diff --git a/prometheus-metrics-instrumentation-guava/src/main/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollector.java b/prometheus-metrics-instrumentation-guava/src/main/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollector.java
index 42473c686..0b6ff3d78 100644
--- a/prometheus-metrics-instrumentation-guava/src/main/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollector.java
+++ b/prometheus-metrics-instrumentation-guava/src/main/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollector.java
@@ -3,6 +3,7 @@
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheStats;
 import com.google.common.cache.LoadingCache;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
@@ -15,6 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import javax.annotation.Nullable;
 
 /**
  * Collect metrics from Guava's com.google.common.cache.Cache.
@@ -51,6 +53,7 @@
  *     guava_cache_load_duration_seconds_sum{cache="mycache"} 0.0034
  * </pre>
  */
+@StableApi
 public class CacheMetricsCollector implements MultiCollector {
 
   private static final double NANOSECONDS_PER_SECOND = 1_000_000_000.0;
@@ -98,6 +101,7 @@ public void addCache(String cacheName, Cache<?, ?> cache) {
    *
    * @param cacheName cache to be removed
    */
+  @Nullable
   public Cache<?, ?> removeCache(String cacheName) {
     return children.remove(cacheName);
   }
@@ -216,7 +220,12 @@ public MetricSnapshots collect() {
     return metricSnapshotsBuilder.build();
   }
 
+  /**
+   * @deprecated Use {@link #getMetricFamilyDescriptors()} instead.
+   */
   @Override
+  @Deprecated
+  @SuppressWarnings("InlineMeSuggester")
   public List<String> getPrometheusNames() {
     return ALL_METRIC_NAMES;
   }
diff --git a/prometheus-metrics-instrumentation-guava/src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java b/prometheus-metrics-instrumentation-guava/src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java
index 31da91f20..d56e6c15c 100644
--- a/prometheus-metrics-instrumentation-guava/src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java
+++ b/prometheus-metrics-instrumentation-guava/src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java
@@ -20,10 +20,11 @@
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("deprecation")
 class CacheMetricsCollectorTest {
 
   @Test
-  public void cacheExposesMetricsForHitMissAndEviction() {
+  void cacheExposesMetricsForHitMissAndEviction() {
     final Cache<String, String> cache =
         CacheBuilder.newBuilder().maximumSize(2).recordStats().build();
 
@@ -73,7 +74,7 @@ public void cacheExposesMetricsForHitMissAndEviction() {
 
   @SuppressWarnings("unchecked")
   @Test
-  public void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception {
+  void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception {
     final CacheLoader<String, String> loader = mock(CacheLoader.class);
     when(loader.load(anyString()))
         .thenReturn("First User")
@@ -112,7 +113,7 @@ public void loadingCacheExposesMetricsForLoadsAndExceptions() throws Exception {
   }
 
   @Test
-  public void getPrometheusNamesHasSameSizeAsMetricSizeWhenScraping() {
+  void getPrometheusNamesHasSameSizeAsMetricSizeWhenScraping() {
     final CacheMetricsCollector collector = new CacheMetricsCollector();
 
     final PrometheusRegistry registry = new PrometheusRegistry();
@@ -125,7 +126,7 @@ public void getPrometheusNamesHasSameSizeAsMetricSizeWhenScraping() {
   }
 
   @Test
-  public void collectedMetricNamesAreKnownPrometheusNames() {
+  void collectedMetricNamesAreKnownPrometheusNames() {
     final CacheMetricsCollector collector = new CacheMetricsCollector();
 
     final PrometheusRegistry registry = new PrometheusRegistry();
diff --git a/prometheus-metrics-instrumentation-jvm/pom.xml b/prometheus-metrics-instrumentation-jvm/pom.xml
index e7b379207..c9916b874 100644
--- a/prometheus-metrics-instrumentation-jvm/pom.xml
+++ b/prometheus-metrics-instrumentation-jvm/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
@@ -19,10 +18,16 @@
 
   <properties>
     <automatic.module.name>io.prometheus.metrics.instrumentation.jvm</automatic.module.name>
-    <jacoco.line-coverage>0.55</jacoco.line-coverage>
+    <jacoco.line-coverage>0.60</jacoco.line-coverage>
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-core</artifactId>
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetrics.java
index 7f45c8303..a31d46ba4 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetrics.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.GaugeWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.lang.management.BufferPoolMXBean;
 import java.lang.management.ManagementFactory;
@@ -40,6 +42,7 @@
  * jvm_buffer_pool_used_bytes{pool="mapped"} 0.0
  * </pre>
  */
+@StableApi
 public class JvmBufferPoolMetrics {
 
   private static final String JVM_BUFFER_POOL_USED_BYTES = "jvm_buffer_pool_used_bytes";
@@ -48,11 +51,13 @@ public class JvmBufferPoolMetrics {
 
   private final PrometheusProperties config;
   private final List<BufferPoolMXBean> bufferPoolBeans;
+  private final Labels constLabels;
 
   private JvmBufferPoolMetrics(
-      List<BufferPoolMXBean> bufferPoolBeans, PrometheusProperties config) {
+      List<BufferPoolMXBean> bufferPoolBeans, PrometheusProperties config, Labels constLabels) {
     this.config = config;
     this.bufferPoolBeans = bufferPoolBeans;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -68,6 +73,7 @@ private void register(PrometheusRegistry registry) {
                 callback.call(pool.getMemoryUsed(), pool.getName());
               }
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -81,6 +87,7 @@ private void register(PrometheusRegistry registry) {
                 callback.call(pool.getTotalCapacity(), pool.getName());
               }
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -93,6 +100,7 @@ private void register(PrometheusRegistry registry) {
                 callback.call(pool.getCount(), pool.getName());
               }
             })
+        .constLabels(constLabels)
         .register(registry);
   }
 
@@ -108,11 +116,17 @@ public static class Builder {
 
     private final PrometheusProperties config;
     @Nullable private List<BufferPoolMXBean> bufferPoolBeans;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder bufferPoolBeans(List<BufferPoolMXBean> bufferPoolBeans) {
       this.bufferPoolBeans = bufferPoolBeans;
@@ -128,7 +142,7 @@ public void register(PrometheusRegistry registry) {
       if (bufferPoolBeans == null) {
         bufferPoolBeans = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
       }
-      new JvmBufferPoolMetrics(bufferPoolBeans, config).register(registry);
+      new JvmBufferPoolMetrics(bufferPoolBeans, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetrics.java
index bc0465a87..28b10cfb7 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetrics.java
@@ -1,9 +1,11 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.CounterWithCallback;
 import io.prometheus.metrics.core.metrics.GaugeWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import java.lang.management.ClassLoadingMXBean;
 import java.lang.management.ManagementFactory;
 import javax.annotation.Nullable;
@@ -36,6 +38,7 @@
  * jvm_classes_unloaded_total 0.0
  * </pre>
  */
+@StableApi
 public class JvmClassLoadingMetrics {
 
   private static final String JVM_CLASSES_CURRENTLY_LOADED = "jvm_classes_currently_loaded";
@@ -44,10 +47,13 @@ public class JvmClassLoadingMetrics {
 
   private final PrometheusProperties config;
   private final ClassLoadingMXBean classLoadingBean;
+  private final Labels constLabels;
 
-  private JvmClassLoadingMetrics(ClassLoadingMXBean classLoadingBean, PrometheusProperties config) {
+  private JvmClassLoadingMetrics(
+      ClassLoadingMXBean classLoadingBean, PrometheusProperties config, Labels constLabels) {
     this.classLoadingBean = classLoadingBean;
     this.config = config;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -56,6 +62,7 @@ private void register(PrometheusRegistry registry) {
         .name(JVM_CLASSES_CURRENTLY_LOADED)
         .help("The number of classes that are currently loaded in the JVM")
         .callback(callback -> callback.call(classLoadingBean.getLoadedClassCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     CounterWithCallback.builder(config)
@@ -63,6 +70,7 @@ private void register(PrometheusRegistry registry) {
         .help(
             "The total number of classes that have been loaded since the JVM has started execution")
         .callback(callback -> callback.call(classLoadingBean.getTotalLoadedClassCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     CounterWithCallback.builder(config)
@@ -71,6 +79,7 @@ private void register(PrometheusRegistry registry) {
             "The total number of classes that have been unloaded since the JVM has "
                 + "started execution")
         .callback(callback -> callback.call(classLoadingBean.getUnloadedClassCount()))
+        .constLabels(constLabels)
         .register(registry);
   }
 
@@ -86,11 +95,17 @@ public static class Builder {
 
     private final PrometheusProperties config;
     @Nullable private ClassLoadingMXBean classLoadingBean;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder classLoadingBean(ClassLoadingMXBean classLoadingBean) {
       this.classLoadingBean = classLoadingBean;
@@ -106,7 +121,7 @@ public void register(PrometheusRegistry registry) {
           this.classLoadingBean != null
               ? this.classLoadingBean
               : ManagementFactory.getClassLoadingMXBean();
-      new JvmClassLoadingMetrics(classLoadingBean, config).register(registry);
+      new JvmClassLoadingMetrics(classLoadingBean, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetrics.java
index dfde6c539..86b5cc88d 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetrics.java
@@ -2,9 +2,11 @@
 
 import static io.prometheus.metrics.model.snapshots.Unit.millisToSeconds;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.CounterWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.lang.management.CompilationMXBean;
 import java.lang.management.ManagementFactory;
@@ -32,6 +34,7 @@
  * jvm_compilation_time_seconds_total 0.152
  * </pre>
  */
+@StableApi
 public class JvmCompilationMetrics {
 
   private static final String JVM_COMPILATION_TIME_SECONDS_TOTAL =
@@ -39,10 +42,13 @@ public class JvmCompilationMetrics {
 
   private final PrometheusProperties config;
   private final CompilationMXBean compilationBean;
+  private final Labels constLabels;
 
-  private JvmCompilationMetrics(CompilationMXBean compilationBean, PrometheusProperties config) {
+  private JvmCompilationMetrics(
+      CompilationMXBean compilationBean, PrometheusProperties config, Labels constLabels) {
     this.compilationBean = compilationBean;
     this.config = config;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -57,6 +63,7 @@ private void register(PrometheusRegistry registry) {
         .unit(Unit.SECONDS)
         .callback(
             callback -> callback.call(millisToSeconds(compilationBean.getTotalCompilationTime())))
+        .constLabels(constLabels)
         .register(registry);
   }
 
@@ -72,11 +79,17 @@ public static class Builder {
 
     private final PrometheusProperties config;
     @Nullable private CompilationMXBean compilationBean;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder compilationBean(CompilationMXBean compilationBean) {
       this.compilationBean = compilationBean;
@@ -92,7 +105,7 @@ public void register(PrometheusRegistry registry) {
           this.compilationBean != null
               ? this.compilationBean
               : ManagementFactory.getCompilationMXBean();
-      new JvmCompilationMetrics(compilationBean, config).register(registry);
+      new JvmCompilationMetrics(compilationBean, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.java
index 262e2df5f..aec943706 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.SummaryWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Quantiles;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.lang.management.GarbageCollectorMXBean;
@@ -36,17 +38,22 @@
  * jvm_gc_collection_seconds_sum{gc="PS Scavenge"} 0.0
  * </pre>
  */
+@StableApi
 public class JvmGarbageCollectorMetrics {
 
   private static final String JVM_GC_COLLECTION_SECONDS = "jvm_gc_collection_seconds";
 
   private final PrometheusProperties config;
   private final List<GarbageCollectorMXBean> garbageCollectorBeans;
+  private final Labels constLabels;
 
   private JvmGarbageCollectorMetrics(
-      List<GarbageCollectorMXBean> garbageCollectorBeans, PrometheusProperties config) {
+      List<GarbageCollectorMXBean> garbageCollectorBeans,
+      PrometheusProperties config,
+      Labels constLabels) {
     this.config = config;
     this.garbageCollectorBeans = garbageCollectorBeans;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -66,6 +73,7 @@ private void register(PrometheusRegistry registry) {
                     gc.getName());
               }
             })
+        .constLabels(constLabels)
         .register(registry);
   }
 
@@ -81,11 +89,17 @@ public static class Builder {
 
     private final PrometheusProperties config;
     @Nullable private List<GarbageCollectorMXBean> garbageCollectorBeans;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder garbageCollectorBeans(List<GarbageCollectorMXBean> garbageCollectorBeans) {
       this.garbageCollectorBeans = garbageCollectorBeans;
@@ -101,7 +115,7 @@ public void register(PrometheusRegistry registry) {
       if (garbageCollectorBeans == null) {
         garbageCollectorBeans = ManagementFactory.getGarbageCollectorMXBeans();
       }
-      new JvmGarbageCollectorMetrics(garbageCollectorBeans, config).register(registry);
+      new JvmGarbageCollectorMetrics(garbageCollectorBeans, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetrics.java
index cecfe3c8a..2fb377882 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetrics.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.GaugeWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
@@ -103,6 +105,7 @@
  * jvm_memory_used_bytes{area="nonheap"} 1.1490688E7
  * </pre>
  */
+@StableApi
 public class JvmMemoryMetrics {
 
   private static final String JVM_MEMORY_OBJECTS_PENDING_FINALIZATION =
@@ -127,12 +130,17 @@ public class JvmMemoryMetrics {
   private final PrometheusProperties config;
   private final MemoryMXBean memoryBean;
   private final List<MemoryPoolMXBean> poolBeans;
+  private final Labels constLabels;
 
   private JvmMemoryMetrics(
-      List<MemoryPoolMXBean> poolBeans, MemoryMXBean memoryBean, PrometheusProperties config) {
+      List<MemoryPoolMXBean> poolBeans,
+      MemoryMXBean memoryBean,
+      PrometheusProperties config,
+      Labels constLabels) {
     this.config = config;
     this.poolBeans = poolBeans;
     this.memoryBean = memoryBean;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -141,6 +149,7 @@ private void register(PrometheusRegistry registry) {
         .name(JVM_MEMORY_OBJECTS_PENDING_FINALIZATION)
         .help("The number of objects waiting in the finalizer queue.")
         .callback(callback -> callback.call(memoryBean.getObjectPendingFinalizationCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -153,6 +162,7 @@ private void register(PrometheusRegistry registry) {
               callback.call(memoryBean.getHeapMemoryUsage().getUsed(), "heap");
               callback.call(memoryBean.getNonHeapMemoryUsage().getUsed(), "nonheap");
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -165,6 +175,7 @@ private void register(PrometheusRegistry registry) {
               callback.call(memoryBean.getHeapMemoryUsage().getCommitted(), "heap");
               callback.call(memoryBean.getNonHeapMemoryUsage().getCommitted(), "nonheap");
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -177,6 +188,7 @@ private void register(PrometheusRegistry registry) {
               callback.call(memoryBean.getHeapMemoryUsage().getMax(), "heap");
               callback.call(memoryBean.getNonHeapMemoryUsage().getMax(), "nonheap");
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -189,6 +201,7 @@ private void register(PrometheusRegistry registry) {
               callback.call(memoryBean.getHeapMemoryUsage().getInit(), "heap");
               callback.call(memoryBean.getNonHeapMemoryUsage().getInit(), "nonheap");
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -197,6 +210,7 @@ private void register(PrometheusRegistry registry) {
         .unit(Unit.BYTES)
         .labelNames("pool")
         .callback(makeCallback(poolBeans, MemoryPoolMXBean::getUsage, MemoryUsage::getUsed))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -205,6 +219,7 @@ private void register(PrometheusRegistry registry) {
         .unit(Unit.BYTES)
         .labelNames("pool")
         .callback(makeCallback(poolBeans, MemoryPoolMXBean::getUsage, MemoryUsage::getCommitted))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -213,6 +228,7 @@ private void register(PrometheusRegistry registry) {
         .unit(Unit.BYTES)
         .labelNames("pool")
         .callback(makeCallback(poolBeans, MemoryPoolMXBean::getUsage, MemoryUsage::getMax))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -221,6 +237,7 @@ private void register(PrometheusRegistry registry) {
         .unit(Unit.BYTES)
         .labelNames("pool")
         .callback(makeCallback(poolBeans, MemoryPoolMXBean::getUsage, MemoryUsage::getInit))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -230,6 +247,7 @@ private void register(PrometheusRegistry registry) {
         .labelNames("pool")
         .callback(
             makeCallback(poolBeans, MemoryPoolMXBean::getCollectionUsage, MemoryUsage::getUsed))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -240,6 +258,7 @@ private void register(PrometheusRegistry registry) {
         .callback(
             makeCallback(
                 poolBeans, MemoryPoolMXBean::getCollectionUsage, MemoryUsage::getCommitted))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -249,6 +268,7 @@ private void register(PrometheusRegistry registry) {
         .labelNames("pool")
         .callback(
             makeCallback(poolBeans, MemoryPoolMXBean::getCollectionUsage, MemoryUsage::getMax))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -258,6 +278,7 @@ private void register(PrometheusRegistry registry) {
         .labelNames("pool")
         .callback(
             makeCallback(poolBeans, MemoryPoolMXBean::getCollectionUsage, MemoryUsage::getInit))
+        .constLabels(constLabels)
         .register(registry);
   }
 
@@ -288,11 +309,17 @@ public static class Builder {
     private final PrometheusProperties config;
     @Nullable private MemoryMXBean memoryBean;
     @Nullable private List<MemoryPoolMXBean> poolBeans;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder withMemoryBean(MemoryMXBean memoryBean) {
       this.memoryBean = memoryBean;
@@ -314,7 +341,7 @@ public void register(PrometheusRegistry registry) {
           this.memoryBean != null ? this.memoryBean : ManagementFactory.getMemoryMXBean();
       List<MemoryPoolMXBean> poolBeans =
           this.poolBeans != null ? this.poolBeans : ManagementFactory.getMemoryPoolMXBeans();
-      new JvmMemoryMetrics(poolBeans, bean, config).register(registry);
+      new JvmMemoryMetrics(poolBeans, bean, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetrics.java
index 160469b8b..a8f520584 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetrics.java
@@ -2,9 +2,11 @@
 
 import com.sun.management.GarbageCollectionNotificationInfo;
 import com.sun.management.GcInfo;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.Counter;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryUsage;
@@ -46,15 +48,19 @@
  * jvm_memory_pool_allocated_bytes_total{pool="PS Survivor Space"} 4115280.0
  * </pre>
  */
+@StableApi
 public class JvmMemoryPoolAllocationMetrics {
 
   private static final String JVM_MEMORY_POOL_ALLOCATED_BYTES_TOTAL =
       "jvm_memory_pool_allocated_bytes_total";
 
   private final List<GarbageCollectorMXBean> garbageCollectorBeans;
+  private final Labels constLabels;
 
-  private JvmMemoryPoolAllocationMetrics(List<GarbageCollectorMXBean> garbageCollectorBeans) {
+  private JvmMemoryPoolAllocationMetrics(
+      List<GarbageCollectorMXBean> garbageCollectorBeans, Labels constLabels) {
     this.garbageCollectorBeans = garbageCollectorBeans;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -65,6 +71,7 @@ private void register(PrometheusRegistry registry) {
                 "Total bytes allocated in a given JVM memory pool. Only updated after GC, "
                     + "not continuously.")
             .labelNames("pool")
+            .constLabels(constLabels)
             .register(registry);
 
     AllocationCountingNotificationListener listener =
@@ -152,9 +159,15 @@ public static Builder builder(PrometheusProperties config) {
 
   public static class Builder {
     @Nullable private List<GarbageCollectorMXBean> garbageCollectorBeans;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder() {}
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder withGarbageCollectorBeans(List<GarbageCollectorMXBean> garbageCollectorBeans) {
       this.garbageCollectorBeans = garbageCollectorBeans;
@@ -170,7 +183,7 @@ public void register(PrometheusRegistry registry) {
       if (garbageCollectorBeans == null) {
         garbageCollectorBeans = ManagementFactory.getGarbageCollectorMXBeans();
       }
-      new JvmMemoryPoolAllocationMetrics(garbageCollectorBeans).register(registry);
+      new JvmMemoryPoolAllocationMetrics(garbageCollectorBeans, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMetrics.java
index 0f5a56eee..d7ab40d13 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmMetrics.java
@@ -1,7 +1,9 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -12,6 +14,7 @@
  * JvmMetrics.builder().register();
  * }</pre>
  */
+@StableApi
 public class JvmMetrics {
 
   private static final Set<PrometheusRegistry> REGISTERED = ConcurrentHashMap.newKeySet();
@@ -32,11 +35,18 @@ public static Builder builder(PrometheusProperties config) {
   public static class Builder {
 
     private final PrometheusProperties config;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    /** Set constant labels that will be applied to all JVM metrics registered by this builder. */
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /**
      * Register all JVM metrics with the default registry.
      *
@@ -55,16 +65,16 @@ public void register() {
      */
     public void register(PrometheusRegistry registry) {
       if (REGISTERED.add(registry)) {
-        JvmThreadsMetrics.builder(config).register(registry);
-        JvmBufferPoolMetrics.builder(config).register(registry);
-        JvmClassLoadingMetrics.builder(config).register(registry);
-        JvmCompilationMetrics.builder(config).register(registry);
-        JvmGarbageCollectorMetrics.builder(config).register(registry);
-        JvmMemoryPoolAllocationMetrics.builder(config).register(registry);
-        JvmMemoryMetrics.builder(config).register(registry);
-        JvmNativeMemoryMetrics.builder(config).register(registry);
-        JvmRuntimeInfoMetric.builder(config).register(registry);
-        ProcessMetrics.builder(config).register(registry);
+        JvmThreadsMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmBufferPoolMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmClassLoadingMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmCompilationMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmGarbageCollectorMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmMemoryPoolAllocationMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmMemoryMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmNativeMemoryMetrics.builder(config).constLabels(constLabels).register(registry);
+        JvmRuntimeInfoMetric.builder(config).constLabels(constLabels).register(registry);
+        ProcessMetrics.builder(config).constLabels(constLabels).register(registry);
       }
     }
   }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetrics.java
index 53225edca..d08e3fb11 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetrics.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.GaugeWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.lang.management.ManagementFactory;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -84,6 +86,7 @@
  * jvm_native_memory_reserved_bytes{pool="Unknown"} 32768.0
  * </pre>
  */
+@StableApi
 public class JvmNativeMemoryMetrics {
   private static final String JVM_NATIVE_MEMORY_RESERVED_BYTES = "jvm_native_memory_reserved_bytes";
   private static final String JVM_NATIVE_MEMORY_COMMITTED_BYTES =
@@ -97,10 +100,13 @@ public class JvmNativeMemoryMetrics {
 
   private final PrometheusProperties config;
   private final PlatformMBeanServerAdapter adapter;
+  private final Labels constLabels;
 
-  private JvmNativeMemoryMetrics(PrometheusProperties config, PlatformMBeanServerAdapter adapter) {
+  private JvmNativeMemoryMetrics(
+      PrometheusProperties config, PlatformMBeanServerAdapter adapter, Labels constLabels) {
     this.config = config;
     this.adapter = adapter;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -115,6 +121,7 @@ private void register(PrometheusRegistry registry) {
           .unit(Unit.BYTES)
           .labelNames("pool")
           .callback(makeCallback(true))
+          .constLabels(constLabels)
           .register(registry);
 
       GaugeWithCallback.builder(config)
@@ -125,6 +132,7 @@ private void register(PrometheusRegistry registry) {
           .unit(Unit.BYTES)
           .labelNames("pool")
           .callback(makeCallback(false))
+          .constLabels(constLabels)
           .register(registry);
     }
   }
@@ -157,8 +165,8 @@ private String vmNativeMemorySummaryInBytesOrEmpty() {
       } else {
         return summary;
       }
-    } catch (Exception ex) {
-      // ignore errors
+    } catch (RuntimeException ex) {
+      // ignore errors (native memory tracking not enabled or other runtime failures)
       isEnabled.set(false);
       return "";
     }
@@ -200,6 +208,7 @@ public static class Builder {
 
     private final PrometheusProperties config;
     private final PlatformMBeanServerAdapter adapter;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this(config, new DefaultPlatformMBeanServerAdapter());
@@ -211,12 +220,17 @@ private Builder(PrometheusProperties config) {
       this.adapter = adapter;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     public void register() {
       register(PrometheusRegistry.defaultRegistry);
     }
 
     public void register(PrometheusRegistry registry) {
-      new JvmNativeMemoryMetrics(config, adapter).register(registry);
+      new JvmNativeMemoryMetrics(config, adapter, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetric.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetric.java
index 5ebd61c21..095b643b0 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetric.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetric.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.Info;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import javax.annotation.Nullable;
 
 /**
@@ -25,6 +27,7 @@
  * jvm_runtime_info{runtime="OpenJDK Runtime Environment",vendor="Oracle Corporation",version="1.8.0_382-b05"} 1
  * </pre>
  */
+@StableApi
 public class JvmRuntimeInfoMetric {
 
   private static final String JVM_RUNTIME_INFO = "jvm_runtime_info";
@@ -33,13 +36,19 @@ public class JvmRuntimeInfoMetric {
   private final String version;
   private final String vendor;
   private final String runtime;
+  private final Labels constLabels;
 
   private JvmRuntimeInfoMetric(
-      String version, String vendor, String runtime, PrometheusProperties config) {
+      String version,
+      String vendor,
+      String runtime,
+      PrometheusProperties config,
+      Labels constLabels) {
     this.config = config;
     this.version = version;
     this.vendor = vendor;
     this.runtime = runtime;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -49,6 +58,7 @@ private void register(PrometheusRegistry registry) {
             .name(JVM_RUNTIME_INFO)
             .help("JVM runtime info")
             .labelNames("version", "vendor", "runtime")
+            .constLabels(constLabels)
             .register(registry);
 
     jvmInfo.setLabelValues(version, vendor, runtime);
@@ -68,11 +78,17 @@ public static class Builder {
     @Nullable private String version;
     @Nullable private String vendor;
     @Nullable private String runtime;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder version(String version) {
       this.version = version;
@@ -104,7 +120,7 @@ public void register(PrometheusRegistry registry) {
           this.vendor != null ? this.vendor : System.getProperty("java.vm.vendor", "unknown");
       String runtime =
           this.runtime != null ? this.runtime : System.getProperty("java.runtime.name", "unknown");
-      new JvmRuntimeInfoMetric(version, vendor, runtime, config).register(registry);
+      new JvmRuntimeInfoMetric(version, vendor, runtime, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetrics.java
index d3c69795e..af41887bf 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetrics.java
@@ -2,10 +2,12 @@
 
 import static java.util.Objects.requireNonNull;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.CounterWithCallback;
 import io.prometheus.metrics.core.metrics.GaugeWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
@@ -60,6 +62,7 @@
  * jvm_threads_state{state="WAITING"} 3.0
  * </pre>
  */
+@StableApi
 public class JvmThreadsMetrics {
 
   private static final String UNKNOWN = "UNKNOWN";
@@ -74,12 +77,17 @@ public class JvmThreadsMetrics {
   private final PrometheusProperties config;
   private final ThreadMXBean threadBean;
   private final boolean isNativeImage;
+  private final Labels constLabels;
 
   private JvmThreadsMetrics(
-      boolean isNativeImage, ThreadMXBean threadBean, PrometheusProperties config) {
+      boolean isNativeImage,
+      ThreadMXBean threadBean,
+      PrometheusProperties config,
+      Labels constLabels) {
     this.config = config;
     this.threadBean = threadBean;
     this.isNativeImage = isNativeImage;
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -88,24 +96,28 @@ private void register(PrometheusRegistry registry) {
         .name(JVM_THREADS_CURRENT)
         .help("Current thread count of a JVM")
         .callback(callback -> callback.call(threadBean.getThreadCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
         .name(JVM_THREADS_DAEMON)
         .help("Daemon thread count of a JVM")
         .callback(callback -> callback.call(threadBean.getDaemonThreadCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
         .name(JVM_THREADS_PEAK)
         .help("Peak thread count of a JVM")
         .callback(callback -> callback.call(threadBean.getPeakThreadCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     CounterWithCallback.builder(config)
         .name(JVM_THREADS_STARTED_TOTAL)
         .help("Started thread count of a JVM")
         .callback(callback -> callback.call(threadBean.getTotalStartedThreadCount()))
+        .constLabels(constLabels)
         .register(registry);
 
     if (!isNativeImage) {
@@ -116,6 +128,7 @@ private void register(PrometheusRegistry registry) {
                   + "ownable synchronizers")
           .callback(
               callback -> callback.call(nullSafeArrayLength(threadBean.findDeadlockedThreads())))
+          .constLabels(constLabels)
           .register(registry);
 
       GaugeWithCallback.builder(config)
@@ -124,6 +137,7 @@ private void register(PrometheusRegistry registry) {
           .callback(
               callback ->
                   callback.call(nullSafeArrayLength(threadBean.findMonitorDeadlockedThreads())))
+          .constLabels(constLabels)
           .register(registry);
 
       GaugeWithCallback.builder(config)
@@ -137,6 +151,7 @@ private void register(PrometheusRegistry registry) {
                   callback.call(entry.getValue(), entry.getKey());
                 }
               })
+          .constLabels(constLabels)
           .register(registry);
     }
   }
@@ -196,11 +211,17 @@ public static class Builder {
     private final PrometheusProperties config;
     @Nullable private Boolean isNativeImage;
     @Nullable private ThreadMXBean threadBean;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     /** Package private. For testing only. */
     Builder threadBean(ThreadMXBean threadBean) {
       this.threadBean = threadBean;
@@ -222,7 +243,7 @@ public void register(PrometheusRegistry registry) {
           this.threadBean != null ? this.threadBean : ManagementFactory.getThreadMXBean();
       boolean isNativeImage =
           this.isNativeImage != null ? this.isNativeImage : NativeImageChecker.isGraalVmNativeImage;
-      new JvmThreadsMetrics(isNativeImage, threadBean, config).register(registry);
+      new JvmThreadsMetrics(isNativeImage, threadBean, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetrics.java b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetrics.java
index e3363c868..6132ad08e 100644
--- a/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetrics.java
+++ b/prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetrics.java
@@ -1,9 +1,11 @@
 package io.prometheus.metrics.instrumentation.jvm;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.core.metrics.CounterWithCallback;
 import io.prometheus.metrics.core.metrics.GaugeWithCallback;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.Labels;
 import io.prometheus.metrics.model.snapshots.Unit;
 import java.io.BufferedReader;
 import java.io.File;
@@ -66,6 +68,7 @@
  * process_virtual_memory_bytes 1.2683624448E10
  * </pre>
  */
+@StableApi
 public class ProcessMetrics {
 
   private static final String PROCESS_CPU_SECONDS_TOTAL = "process_cpu_seconds_total";
@@ -82,17 +85,20 @@ public class ProcessMetrics {
   private final RuntimeMXBean runtimeBean;
   private final Grepper grepper;
   private final boolean linux;
+  private final Labels constLabels;
 
   private ProcessMetrics(
       OperatingSystemMXBean osBean,
       RuntimeMXBean runtimeBean,
       Grepper grepper,
-      PrometheusProperties config) {
+      PrometheusProperties config,
+      Labels constLabels) {
     this.osBean = osBean;
     this.runtimeBean = runtimeBean;
     this.grepper = grepper;
     this.config = config;
     this.linux = PROC_SELF_STATUS.canRead();
+    this.constLabels = constLabels;
   }
 
   private void register(PrometheusRegistry registry) {
@@ -118,6 +124,7 @@ private void register(PrometheusRegistry registry) {
                 // Ignored
               }
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -125,6 +132,7 @@ private void register(PrometheusRegistry registry) {
         .help("Start time of the process since unix epoch in seconds.")
         .unit(Unit.SECONDS)
         .callback(callback -> callback.call(Unit.millisToSeconds(runtimeBean.getStartTime())))
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -141,6 +149,7 @@ private void register(PrometheusRegistry registry) {
                 // Ignored
               }
             })
+        .constLabels(constLabels)
         .register(registry);
 
     GaugeWithCallback.builder(config)
@@ -157,6 +166,7 @@ private void register(PrometheusRegistry registry) {
                 // Ignored
               }
             })
+        .constLabels(constLabels)
         .register(registry);
 
     if (linux) {
@@ -174,6 +184,7 @@ private void register(PrometheusRegistry registry) {
                   // Ignored
                 }
               })
+          .constLabels(constLabels)
           .register(registry);
 
       GaugeWithCallback.builder(config)
@@ -189,6 +200,7 @@ private void register(PrometheusRegistry registry) {
                   // Ignored
                 }
               })
+          .constLabels(constLabels)
           .register(registry);
     }
   }
@@ -275,6 +287,7 @@ public static class Builder {
     @Nullable private OperatingSystemMXBean osBean;
     @Nullable private RuntimeMXBean runtimeBean;
     @Nullable private Grepper grepper;
+    private Labels constLabels = Labels.EMPTY;
 
     private Builder(PrometheusProperties config) {
       this.config = config;
@@ -298,6 +311,11 @@ Builder grepper(Grepper grepper) {
       return this;
     }
 
+    public Builder constLabels(Labels constLabels) {
+      this.constLabels = constLabels;
+      return this;
+    }
+
     public void register() {
       register(PrometheusRegistry.defaultRegistry);
     }
@@ -308,7 +326,7 @@ public void register(PrometheusRegistry registry) {
       RuntimeMXBean bean =
           this.runtimeBean != null ? this.runtimeBean : ManagementFactory.getRuntimeMXBean();
       Grepper grepper = this.grepper != null ? this.grepper : new FileGrepper();
-      new ProcessMetrics(osBean, bean, grepper, config).register(registry);
+      new ProcessMetrics(osBean, bean, grepper, config, constLabels).register(registry);
     }
   }
 }
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetricsTest.java
index e3bf55fb4..5b320c678 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmBufferPoolMetricsTest.java
@@ -22,7 +22,7 @@ class JvmBufferPoolMetricsTest {
   private final BufferPoolMXBean mappedBuffer = Mockito.mock(BufferPoolMXBean.class);
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     when(directBuffer.getName()).thenReturn("direct");
     when(directBuffer.getCount()).thenReturn(2L);
     when(directBuffer.getMemoryUsed()).thenReturn(1234L);
@@ -34,7 +34,7 @@ public void setUp() {
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmBufferPoolMetrics.builder()
         .bufferPoolBeans(Arrays.asList(mappedBuffer, directBuffer))
@@ -64,7 +64,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder().nameMustNotBeEqualTo("jvm_buffer_pool_used_bytes").build();
 
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetricsTest.java
index ac13ab382..7fe86c753 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmClassLoadingMetricsTest.java
@@ -20,14 +20,14 @@ class JvmClassLoadingMetricsTest {
   private final ClassLoadingMXBean mockClassLoadingBean = Mockito.mock(ClassLoadingMXBean.class);
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     when(mockClassLoadingBean.getLoadedClassCount()).thenReturn(1000);
     when(mockClassLoadingBean.getTotalLoadedClassCount()).thenReturn(2000L);
     when(mockClassLoadingBean.getUnloadedClassCount()).thenReturn(500L);
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmClassLoadingMetrics.builder().classLoadingBean(mockClassLoadingBean).register(registry);
     MetricSnapshots snapshots = registry.scrape();
@@ -50,7 +50,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder().nameMustNotBeEqualTo("jvm_classes_currently_loaded").build();
 
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetricsTest.java
index 73d1a39df..e961d9394 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmCompilationMetricsTest.java
@@ -20,13 +20,13 @@ class JvmCompilationMetricsTest {
   private final CompilationMXBean mockCompilationBean = Mockito.mock(CompilationMXBean.class);
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     when(mockCompilationBean.getTotalCompilationTime()).thenReturn(10000L);
     when(mockCompilationBean.isCompilationTimeMonitoringSupported()).thenReturn(true);
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmCompilationMetrics.builder().compilationBean(mockCompilationBean).register(registry);
     MetricSnapshots snapshots = registry.scrape();
@@ -44,7 +44,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder()
             .nameMustNotBeEqualTo("jvm_compilation_time_seconds_total")
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetricsTest.java
index 177f29d2e..0f928ef34 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetricsTest.java
@@ -23,7 +23,7 @@ class JvmGarbageCollectorMetricsTest {
   private final GarbageCollectorMXBean mockGcBean2 = Mockito.mock(GarbageCollectorMXBean.class);
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     when(mockGcBean1.getName()).thenReturn("MyGC1");
     when(mockGcBean1.getCollectionCount()).thenReturn(100L);
     when(mockGcBean1.getCollectionTime()).thenReturn(TimeUnit.SECONDS.toMillis(10));
@@ -33,7 +33,7 @@ public void setUp() {
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmGarbageCollectorMetrics.builder()
         .garbageCollectorBeans(Arrays.asList(mockGcBean1, mockGcBean2))
@@ -56,7 +56,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder().nameMustNotBeEqualTo("jvm_gc_collection_seconds").build();
 
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetricsTest.java
index a79ec3b3b..b1916c064 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryMetricsTest.java
@@ -32,7 +32,7 @@ class JvmMemoryMetricsTest {
 
   @SuppressWarnings("deprecation")
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     when(mockMemoryBean.getHeapMemoryUsage()).thenReturn(memoryUsageHeap);
     when(mockMemoryBean.getNonHeapMemoryUsage()).thenReturn(memoryUsageNonHeap);
 
@@ -80,7 +80,7 @@ public void setUp() {
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmMemoryMetrics.builder()
         .withMemoryBean(mockMemoryBean)
@@ -160,7 +160,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder().nameMustNotBeEqualTo("jvm_memory_pool_used_bytes").build();
 
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetricsTest.java
index 67dd6f2e6..2f681ce89 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetricsTest.java
@@ -14,7 +14,7 @@
 class JvmMemoryPoolAllocationMetricsTest {
 
   @Test
-  public void testListenerLogic() {
+  void testListenerLogic() {
     PrometheusRegistry registry = new PrometheusRegistry();
     Counter counter = Counter.builder().name("test").labelNames("pool").register(registry);
     AllocationCountingNotificationListener listener =
@@ -47,6 +47,10 @@ public void testListenerLogic() {
     // Decrease to 17, then increase by 3
     listener.handleMemoryPool("TestPool", 17, 20);
     assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(153);
+
+    // Edge case: before < last (tests diff1 < 0 branch)
+    listener.handleMemoryPool("TestPool", 10, 15);
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(158);
   }
 
   private double getCountByPool(String metricName, String poolName, MetricSnapshots snapshots) {
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMetricsTest.java
index 2bb908a37..c0553703d 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmMetricsTest.java
@@ -4,6 +4,10 @@
 
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.Labels;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.lang.management.ManagementFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -16,7 +20,7 @@ void setUp() {
   }
 
   @Test
-  public void testRegisterIdempotent() {
+  void testRegisterIdempotent() {
     PrometheusRegistry registry = new PrometheusRegistry();
     assertThat(registry.scrape().size()).isZero();
     JvmMetrics.builder().register(registry);
@@ -32,6 +36,25 @@ void pool() {
         .register();
   }
 
+  @Test
+  void testConstLabelsApplied() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+    Labels labels = Labels.of("env", "dev");
+    JvmMetrics.builder().constLabels(labels).register(registry);
+    MetricSnapshots snapshots = registry.scrape();
+    boolean found = false;
+    for (MetricSnapshot snapshot : snapshots) {
+      for (DataPointSnapshot dp : snapshot.getDataPoints()) {
+        if ("dev".equals(dp.getLabels().get("env"))) {
+          found = true;
+          break;
+        }
+      }
+      if (found) break;
+    }
+    assertThat(found).isTrue();
+  }
+
   @Test
   void testJvmMetrics() {
     JvmMetrics.builder(PrometheusProperties.get()).register();
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetricsTest.java
index bbf42ecc7..e2f2dcdca 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmNativeMemoryMetricsTest.java
@@ -14,7 +14,7 @@
 class JvmNativeMemoryMetricsTest {
 
   @Test
-  public void testNativeMemoryTrackingFail() throws IOException {
+  void testNativeMemoryTrackingFail() throws IOException {
     JvmNativeMemoryMetrics.isEnabled.set(true);
 
     JvmNativeMemoryMetrics.PlatformMBeanServerAdapter adapter =
@@ -39,7 +39,7 @@ void nativeMemoryTrackingNotEnabled() {
   }
 
   @Test
-  public void testNativeMemoryTrackingEmpty() throws IOException {
+  void testNativeMemoryTrackingEmpty() throws IOException {
     JvmNativeMemoryMetrics.isEnabled.set(true);
 
     JvmNativeMemoryMetrics.PlatformMBeanServerAdapter adapter =
@@ -56,7 +56,7 @@ public void testNativeMemoryTrackingEmpty() throws IOException {
   }
 
   @Test
-  public void testNativeMemoryTrackingDisabled() throws IOException {
+  void testNativeMemoryTrackingDisabled() throws IOException {
     JvmNativeMemoryMetrics.isEnabled.set(true);
 
     JvmNativeMemoryMetrics.PlatformMBeanServerAdapter adapter =
@@ -74,7 +74,7 @@ public void testNativeMemoryTrackingDisabled() throws IOException {
   }
 
   @Test
-  public void testNativeMemoryTrackingEnabled() throws IOException {
+  void testNativeMemoryTrackingEnabled() throws IOException {
     JvmNativeMemoryMetrics.isEnabled.set(true);
 
     JvmNativeMemoryMetrics.PlatformMBeanServerAdapter adapter =
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetricTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetricTest.java
index a477065c9..2c6a2773f 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetricTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmRuntimeInfoMetricTest.java
@@ -11,7 +11,7 @@
 class JvmRuntimeInfoMetricTest {
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmRuntimeInfoMetric.builder()
         .version("1.8.0_382-b05")
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java
index cd651cc7f..2d36373d5 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java
@@ -30,7 +30,7 @@ class JvmThreadsMetricsTest {
   private final ThreadInfo mockThreadInfoRunnable2 = Mockito.mock(ThreadInfo.class);
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     when(mockThreadsBean.getThreadCount()).thenReturn(300);
     when(mockThreadsBean.getDaemonThreadCount()).thenReturn(200);
     when(mockThreadsBean.getPeakThreadCount()).thenReturn(301);
@@ -49,7 +49,7 @@ public void setUp() {
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     JvmThreadsMetrics.builder().threadBean(mockThreadsBean).isNativeImage(false).register(registry);
     MetricSnapshots snapshots = registry.scrape();
@@ -90,7 +90,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder().nameMustNotBeEqualTo("jvm_threads_deadlocked").build();
 
@@ -103,7 +103,7 @@ public void testIgnoredMetricNotScraped() {
   }
 
   @Test
-  public void testInvalidThreadIds() {
+  void testInvalidThreadIds() {
     try {
       String javaVersion = System.getProperty("java.version"); // Example: "21.0.2"
       String majorJavaVersion = javaVersion.replaceAll("\\..*", ""); // Example: "21"
@@ -118,11 +118,8 @@ public void testInvalidThreadIds() {
     // Number of threads to create with invalid thread ids
     int numberOfInvalidThreadIds = 2;
 
-    Map<String, Double> expected = getCountByState(registry.scrape());
-    expected.compute(
-        "UNKNOWN",
-        (key, oldValue) ->
-            oldValue == null ? numberOfInvalidThreadIds : oldValue + numberOfInvalidThreadIds);
+    Map<String, Double> before = getCountByState(registry.scrape());
+    double unknownBefore = before.getOrDefault("UNKNOWN", 0.0);
 
     final CountDownLatch countDownLatch = new CountDownLatch(numberOfInvalidThreadIds);
 
@@ -132,12 +129,12 @@ public void testInvalidThreadIds() {
         new ThreadWithInvalidId(-i, new TestRunnable(countDownLatch)).start();
       }
 
-      Map<String, Double> actual = getCountByState(registry.scrape());
+      Map<String, Double> after = getCountByState(registry.scrape());
+      double unknownAfter = after.getOrDefault("UNKNOWN", 0.0);
 
-      assertThat(actual).hasSameSizeAs(expected);
-      for (String threadState : expected.keySet()) {
-        assertThat(actual.get(threadState)).isEqualTo(expected.get(threadState));
-      }
+      // The UNKNOWN count should increase by exactly the number of invalid thread ids.
+      // Other states may change due to background threads, so we only assert on UNKNOWN.
+      assertThat(unknownAfter - unknownBefore).isEqualTo((double) numberOfInvalidThreadIds);
     } finally {
       for (int i = 0; i < numberOfInvalidThreadIds; i++) {
         countDownLatch.countDown();
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetricsTest.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetricsTest.java
index f5804ad7f..9c2efd301 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetricsTest.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/ProcessMetricsTest.java
@@ -30,7 +30,7 @@ class ProcessMetricsTest {
   private final RuntimeMXBean runtimeBean = Mockito.mock(RuntimeMXBean.class);
 
   @BeforeEach
-  public void setUp() throws IOException {
+  void setUp() throws IOException {
     when(sunOsBean.getProcessCpuTime()).thenReturn(TimeUnit.MILLISECONDS.toNanos(72));
     when(sunOsBean.getOpenFileDescriptorCount()).thenReturn(127L);
     when(sunOsBean.getMaxFileDescriptorCount()).thenReturn(244L);
@@ -42,7 +42,7 @@ public void setUp() throws IOException {
   }
 
   @Test
-  public void testGoodCase() throws IOException {
+  void testGoodCase() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     ProcessMetrics.builder()
         .osBean(sunOsBean)
@@ -97,7 +97,7 @@ public void testGoodCase() throws IOException {
   }
 
   @Test
-  public void testMinimal() throws IOException {
+  void testMinimal() throws IOException {
     PrometheusRegistry registry = new PrometheusRegistry();
     ProcessMetrics.builder()
         .osBean(javaOsBean)
@@ -119,7 +119,7 @@ public void testMinimal() throws IOException {
   }
 
   @Test
-  public void testIgnoredMetricNotScraped() {
+  void testIgnoredMetricNotScraped() {
     MetricNameFilter filter =
         MetricNameFilter.builder().nameMustNotBeEqualTo("process_max_fds").build();
 
diff --git a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/TestUtil.java b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/TestUtil.java
index 64e15590c..8cdd6b1ae 100644
--- a/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/TestUtil.java
+++ b/prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/TestUtil.java
@@ -7,7 +7,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-class TestUtil {
+public class TestUtil {
 
   static String convertToOpenMetricsFormat(MetricSnapshots snapshots) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/prometheus-metrics-model/pom.xml b/prometheus-metrics-model/pom.xml
index 1919ee95c..7d377c043 100644
--- a/prometheus-metrics-model/pom.xml
+++ b/prometheus-metrics-model/pom.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-model</artifactId>
@@ -23,6 +22,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-config</artifactId>
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/Collector.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/Collector.java
index b7154ae70..0f2ccd516 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/Collector.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/Collector.java
@@ -1,6 +1,11 @@
 package io.prometheus.metrics.model.registry;
 
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import java.util.Collections;
+import java.util.Set;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
@@ -9,6 +14,7 @@
  * href="https://prometheus.io/docs/instrumenting/writing_clientlibs/">https://prometheus.io/docs/instrumenting/writing_clientlibs/</a>.
  */
 @FunctionalInterface
+@StableApi
 public interface Collector {
 
   /** Called when the Prometheus server scrapes metrics. */
@@ -32,7 +38,8 @@ default MetricSnapshot collect(PrometheusScrapeRequest scrapeRequest) {
   @Nullable
   default MetricSnapshot collect(Predicate<String> includedNames) {
     MetricSnapshot result = collect();
-    if (includedNames.test(result.getMetadata().getPrometheusName())) {
+    if (includedNames.test(result.getMetadata().getPrometheusName())
+        || includedNames.test(result.getMetadata().getExpositionBasePrometheusName())) {
       return result;
     } else {
       return null;
@@ -49,13 +56,41 @@ default MetricSnapshot collect(Predicate<String> includedNames) {
   default MetricSnapshot collect(
       Predicate<String> includedNames, PrometheusScrapeRequest scrapeRequest) {
     MetricSnapshot result = collect(scrapeRequest);
-    if (includedNames.test(result.getMetadata().getPrometheusName())) {
+    if (includedNames.test(result.getMetadata().getPrometheusName())
+        || includedNames.test(result.getMetadata().getExpositionBasePrometheusName())) {
       return result;
     } else {
       return null;
     }
   }
 
+  /**
+   * Returns a registration-time descriptor for this metric family.
+   *
+   * <p>The registry uses this descriptor for duplicate-name, type, label-schema, help, and unit
+   * validation at registration time. Returning {@code null} means registration-time validation is
+   * skipped for this collector.
+   *
+   * <p>The default implementation adapts the deprecated fragmented metadata methods. New collectors
+   * with fixed registration-time metadata should override this method directly.
+   */
+  @Nullable
+  @SuppressWarnings("deprecation")
+  default MetricFamilyDescriptor getMetricFamilyDescriptor() {
+    String prometheusName = getPrometheusName();
+    MetricType metricType = getMetricType();
+    if (prometheusName == null || metricType == null) {
+      return null;
+    }
+    MetricMetadata metadata = getMetadata();
+    if (metadata == null) {
+      metadata = new MetricMetadata(prometheusName);
+    }
+    Set<String> labelNames = getLabelNames();
+    return MetricFamilyDescriptor.of(
+        metricType, metadata, labelNames == null ? Collections.emptySet() : labelNames);
+  }
+
   /**
    * This is called in two places:
    *
@@ -65,17 +100,81 @@ default MetricSnapshot collect(
    *       and the metric name is excluded.
    * </ol>
    *
-   * Returning {@code null} means checks are omitted (registration the metric always succeeds), and
-   * the collector is always scraped (the result is dropped after scraping if a name filter is
+   * <p>Returning {@code null} means checks are omitted (registration the metric always succeeds),
+   * and the collector is always scraped (the result is dropped after scraping if a name filter is
    * present and the metric name is excluded).
    *
    * <p>If your metric has a name that does not change at runtime it is a good idea to overwrite
    * this and return the name.
    *
    * <p>All metrics in {@code prometheus-metrics-core} override this.
+   *
+   * @deprecated Override {@link #getMetricFamilyDescriptor()} instead.
    */
+  @Deprecated
   @Nullable
   default String getPrometheusName() {
     return null;
   }
+
+  /**
+   * Returns the metric type for registration-time validation.
+   *
+   * <p>This is used to prevent different metric types (e.g., Counter and Gauge) from sharing the
+   * same name. Returning {@code null} means type validation is skipped for this collector.
+   *
+   * <p>Validation is performed only at registration time. If this method returns {@code null}, no
+   * type validation is performed for this collector, and duplicate or conflicting metrics may
+   * result in invalid exposition output.
+   *
+   * @return the metric type, or {@code null} to skip validation
+   * @deprecated Override {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Deprecated
+  @Nullable
+  default MetricType getMetricType() {
+    return null;
+  }
+
+  /**
+   * Returns the complete set of label names for this metric.
+   *
+   * <p>This includes both dynamic label names (specified in {@code labelNames()}) and constant
+   * label names (specified in {@code constLabels()}). Label names are normalized using Prometheus
+   * naming conventions.
+   *
+   * <p>This is used for registration-time validation to prevent duplicate label schemas for the
+   * same metric name. Two collectors with the same name and type can coexist if they have different
+   * label name sets.
+   *
+   * <p>Returning {@code null} is treated as an empty label set: the registry normalizes it to
+   * {@code Collections.emptySet()} and performs full label-schema validation and duplicate
+   * detection. Two collectors with the same name, type, and {@code null} (or empty) label names are
+   * considered duplicate and registration of the second will fail.
+   *
+   * @return the set of all label names, or {@code null} (treated as empty) for a metric with no
+   *     labels
+   * @deprecated Override {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Deprecated
+  @Nullable
+  default Set<String> getLabelNames() {
+    return null;
+  }
+
+  /**
+   * Returns the metric metadata (name, help, unit) for registration-time validation.
+   *
+   * <p>When non-null, the registry uses this to validate that metrics with the same name have
+   * consistent help and unit. Returning {@code null} means help/unit validation is skipped for this
+   * collector.
+   *
+   * @return the metric metadata, or {@code null} to skip help/unit validation
+   * @deprecated Override {@link #getMetricFamilyDescriptor()} instead.
+   */
+  @Deprecated
+  @Nullable
+  default MetricMetadata getMetadata() {
+    return null;
+  }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricNameFilter.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricNameFilter.java
index 609f7fd33..ded171500 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricNameFilter.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricNameFilter.java
@@ -2,13 +2,16 @@
 
 import static java.util.Collections.unmodifiableCollection;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
 /** Filter samples (i.e. time series) by name. */
+@StableApi
 public class MetricNameFilter implements Predicate<String> {
 
   /** For convenience, a filter that allows all names. */
@@ -24,10 +27,10 @@ private MetricNameFilter(
       Collection<String> nameIsNotEqualTo,
       Collection<String> nameStartsWith,
       Collection<String> nameDoesNotStartWith) {
-    this.nameIsEqualTo = unmodifiableCollection(new ArrayList<>(nameIsEqualTo));
-    this.nameIsNotEqualTo = unmodifiableCollection(new ArrayList<>(nameIsNotEqualTo));
-    this.nameStartsWith = unmodifiableCollection(new ArrayList<>(nameStartsWith));
-    this.nameDoesNotStartWith = unmodifiableCollection(new ArrayList<>(nameDoesNotStartWith));
+    this.nameIsEqualTo = unmodifiableCollection(new LinkedHashSet<>(nameIsEqualTo));
+    this.nameIsNotEqualTo = unmodifiableCollection(new LinkedHashSet<>(nameIsNotEqualTo));
+    this.nameStartsWith = unmodifiableCollection(new LinkedHashSet<>(nameStartsWith));
+    this.nameDoesNotStartWith = unmodifiableCollection(new LinkedHashSet<>(nameDoesNotStartWith));
   }
 
   @Override
@@ -42,6 +45,9 @@ private boolean matchesNameEqualTo(String metricName) {
     if (nameIsEqualTo.isEmpty()) {
       return true;
     }
+    if (nameIsEqualTo.contains(metricName)) {
+      return true;
+    }
     for (String name : nameIsEqualTo) {
       // The following ignores suffixes like _total.
       // "request_count" and "request_count_total" both match a metric named "request_count".
@@ -56,6 +62,9 @@ private boolean matchesNameNotEqualTo(String metricName) {
     if (nameIsNotEqualTo.isEmpty()) {
       return false;
     }
+    if (nameIsNotEqualTo.contains(metricName)) {
+      return true;
+    }
     for (String name : nameIsNotEqualTo) {
       // The following ignores suffixes like _total.
       // "request_count" and "request_count_total" both match a metric named "request_count".
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricType.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricType.java
new file mode 100644
index 000000000..f1b5d76ba
--- /dev/null
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MetricType.java
@@ -0,0 +1,21 @@
+package io.prometheus.metrics.model.registry;
+
+import io.prometheus.metrics.annotations.StableApi;
+
+/**
+ * Represents the type of Prometheus metric.
+ *
+ * <p>This enum is used for registration-time validation to ensure that metrics with the same name
+ * have consistent types across all registered collectors.
+ */
+@StableApi
+public enum MetricType {
+  COUNTER,
+  GAUGE,
+  HISTOGRAM,
+  SUMMARY,
+  INFO,
+  STATESET,
+  /** Unknown metric type, used as a fallback. */
+  UNKNOWN
+}
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java
index d1051958d..54ce8c47c 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/MultiCollector.java
@@ -1,14 +1,20 @@
 package io.prometheus.metrics.model.registry;
 
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
 /** Like {@link Collector}, but collecting multiple Snapshots at once. */
 @FunctionalInterface
+@StableApi
 public interface MultiCollector {
 
   /** Called when the Prometheus server scrapes metrics. */
@@ -51,6 +57,36 @@ default MetricSnapshots collect(
     return result.build();
   }
 
+  /**
+   * Returns registration-time descriptors for the metric families collected by this collector.
+   *
+   * <p>The registry uses these descriptors for duplicate-name, type, label-schema, help, and unit
+   * validation at registration time. Returning an empty list means registration-time validation is
+   * skipped for this collector.
+   *
+   * <p>The default implementation adapts the deprecated fragmented metadata methods. New collectors
+   * with fixed registration-time metadata should override this method directly.
+   */
+  @SuppressWarnings("deprecation")
+  default List<MetricFamilyDescriptor> getMetricFamilyDescriptors() {
+    List<String> prometheusNames = getPrometheusNames();
+    List<MetricFamilyDescriptor> descriptors = new ArrayList<>(prometheusNames.size());
+    for (String prometheusName : prometheusNames) {
+      MetricType metricType = getMetricType(prometheusName);
+      if (metricType != null) {
+        MetricMetadata metadata = getMetadata(prometheusName);
+        if (metadata == null) {
+          metadata = new MetricMetadata(prometheusName);
+        }
+        Set<String> labelNames = getLabelNames(prometheusName);
+        descriptors.add(
+            MetricFamilyDescriptor.of(
+                metricType, metadata, labelNames == null ? Collections.emptySet() : labelNames));
+      }
+    }
+    return Collections.unmodifiableList(descriptors);
+  }
+
   /**
    * This is called in two places:
    *
@@ -60,14 +96,79 @@ default MetricSnapshots collect(
    *       and all names are excluded.
    * </ol>
    *
-   * Returning an empty list means checks are omitted (registration metric always succeeds), and the
-   * collector is always scraped (if a name filter is present and all names are excluded the result
-   * is dropped).
+   * <p>Returning an empty list means checks are omitted (registration metric always succeeds), and
+   * the collector is always scraped (if a name filter is present and all names are excluded the
+   * result is dropped).
    *
    * <p>If your collector returns a constant list of metrics that have names that do not change at
    * runtime it is a good idea to overwrite this and return the names.
+   *
+   * @deprecated Override {@link #getMetricFamilyDescriptors()} instead.
    */
+  @Deprecated
   default List<String> getPrometheusNames() {
     return Collections.emptyList();
   }
+
+  /**
+   * Returns the metric type for the given Prometheus name.
+   *
+   * <p>This is used for per-name type validation during registration. Returning {@code null} means
+   * type validation is skipped for that specific metric name.
+   *
+   * <p>Validation is performed only at registration time. If this method returns {@code null}, no
+   * type validation is performed for that name, and duplicate or conflicting metrics may result in
+   * invalid exposition output.
+   *
+   * @param prometheusName the Prometheus metric name
+   * @return the metric type for the given name, or {@code null} to skip validation
+   * @deprecated Override {@link #getMetricFamilyDescriptors()} instead.
+   */
+  @Deprecated
+  @Nullable
+  default MetricType getMetricType(String prometheusName) {
+    return null;
+  }
+
+  /**
+   * Returns the complete set of label names for the given Prometheus name.
+   *
+   * <p>This includes both dynamic label names and constant label names. Label names are normalized
+   * using Prometheus naming conventions (dots converted to underscores).
+   *
+   * <p>This is used for per-name label schema validation during registration. Two collectors with
+   * the same name and type can coexist if they have different label name sets.
+   *
+   * <p>Returning {@code null} is treated as an empty label set: the registry normalizes it to
+   * {@code Collections.emptySet()} and performs full label-schema validation and duplicate
+   * detection. Two collectors with the same name, type, and {@code null} (or empty) label names are
+   * considered duplicate and registration of the second will fail.
+   *
+   * @param prometheusName the Prometheus metric name
+   * @return the set of all label names for the given name, or {@code null} (treated as empty) for a
+   *     metric with no labels
+   * @deprecated Override {@link #getMetricFamilyDescriptors()} instead.
+   */
+  @Deprecated
+  @Nullable
+  default Set<String> getLabelNames(String prometheusName) {
+    return null;
+  }
+
+  /**
+   * Returns the metric metadata (name, help, unit) for the given Prometheus name.
+   *
+   * <p>When non-null, the registry uses this to validate that metrics with the same name have
+   * consistent help and unit. Returning {@code null} means help/unit validation is skipped for that
+   * name.
+   *
+   * @param prometheusName the Prometheus metric name
+   * @return the metric metadata for that name, or {@code null} to skip help/unit validation
+   * @deprecated Override {@link #getMetricFamilyDescriptors()} instead.
+   */
+  @Deprecated
+  @Nullable
+  default MetricMetadata getMetadata(String prometheusName) {
+    return null;
+  }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java
index 7db568d95..882f5711d 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusRegistry.java
@@ -1,66 +1,416 @@
 package io.prometheus.metrics.model.registry;
 
-import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
+import static java.util.Collections.emptySet;
 
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import io.prometheus.metrics.model.snapshots.Unit;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
+@StableApi
 public class PrometheusRegistry {
 
   public static final PrometheusRegistry defaultRegistry = new PrometheusRegistry();
 
-  private final Set<String> prometheusNames = ConcurrentHashMap.newKeySet();
-  private final List<Collector> collectors = new CopyOnWriteArrayList<>();
-  private final List<MultiCollector> multiCollectors = new CopyOnWriteArrayList<>();
+  private final Set<Collector> collectors = ConcurrentHashMap.newKeySet();
+  private final Set<MultiCollector> multiCollectors = ConcurrentHashMap.newKeySet();
+  private final ConcurrentHashMap<String, RegistrationInfo> registered = new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<Collector, CollectorRegistration> collectorMetadata =
+      new ConcurrentHashMap<>();
+  private final ConcurrentHashMap<MultiCollector, List<MultiCollectorRegistration>>
+      multiCollectorMetadata = new ConcurrentHashMap<>();
+
+  /**
+   * Maps exposition-level names (e.g. "events_total", "events_created") to the owning
+   * prometheusName (e.g. "events"). Used to detect cross-type collisions at registration time.
+   */
+  private final ConcurrentHashMap<String, String> expositionNameOwners = new ConcurrentHashMap<>();
+
+  /** Stores the registration details for a Collector at registration time. */
+  private static class CollectorRegistration {
+    final String prometheusName;
+    @Nullable final String expositionBasePrometheusName;
+    final Set<String> labelNames;
+
+    CollectorRegistration(
+        String prometheusName,
+        @Nullable String expositionBasePrometheusName,
+        @Nullable Set<String> labelNames) {
+      this.prometheusName = prometheusName;
+      this.expositionBasePrometheusName = expositionBasePrometheusName;
+      this.labelNames = immutableLabelNames(labelNames);
+    }
+  }
+
+  /**
+   * Stores the registration details for a single metric within a MultiCollector. A MultiCollector
+   * can produce multiple metrics, so we need one of these per metric name.
+   */
+  private static class MultiCollectorRegistration {
+    final String prometheusName;
+    final Set<String> labelNames;
+
+    MultiCollectorRegistration(String prometheusName, @Nullable Set<String> labelNames) {
+      this.prometheusName = prometheusName;
+      this.labelNames = immutableLabelNames(labelNames);
+    }
+  }
+
+  /**
+   * Tracks registration information for each metric name to enable validation of type consistency,
+   * label schema uniqueness, and help/unit consistency.
+   */
+  private static class RegistrationInfo {
+    private final MetricType type;
+    private final Set<Set<String>> labelSchemas;
+    @Nullable private String help;
+    @Nullable private Unit unit;
+
+    private RegistrationInfo(
+        MetricType type,
+        Set<Set<String>> labelSchemas,
+        @Nullable String help,
+        @Nullable Unit unit) {
+      this.type = type;
+      this.labelSchemas = labelSchemas;
+      this.help = help;
+      this.unit = unit;
+    }
+
+    static RegistrationInfo of(
+        MetricType type,
+        @Nullable Set<String> labelNames,
+        @Nullable String help,
+        @Nullable Unit unit) {
+      Set<Set<String>> labelSchemas = ConcurrentHashMap.newKeySet();
+      Set<String> normalized =
+          (labelNames == null || labelNames.isEmpty()) ? emptySet() : labelNames;
+      labelSchemas.add(normalized);
+      return new RegistrationInfo(type, labelSchemas, help, unit);
+    }
+
+    /**
+     * Validates that the given help and unit are exactly equal to this registration. Throws if
+     * values differ, including when one is null and the other is non-null. This ensures consistent
+     * metadata across all collectors sharing the same metric name.
+     */
+    void validateMetadata(@Nullable String newHelp, @Nullable Unit newUnit) {
+      if (!Objects.equals(help, newHelp)) {
+        throw new IllegalArgumentException(
+            "Conflicting help strings. Existing: \"" + help + "\", new: \"" + newHelp + "\"");
+      }
+      if (!Objects.equals(unit, newUnit)) {
+        throw new IllegalArgumentException(
+            "Conflicting unit. Existing: " + unit + ", new: " + newUnit);
+      }
+    }
+
+    /**
+     * Adds a label schema to this registration.
+     *
+     * @param labelNames the label names to add (null or empty sets are normalized to empty set)
+     * @return true if the schema was added (new), false if it already existed
+     */
+    boolean addLabelSet(@Nullable Set<String> labelNames) {
+      Set<String> normalized =
+          (labelNames == null || labelNames.isEmpty()) ? emptySet() : labelNames;
+      return labelSchemas.add(normalized);
+    }
+
+    /**
+     * Removes a label schema from this registration.
+     *
+     * @param labelNames the label names to remove (null or empty sets are normalized to empty set)
+     */
+    void removeLabelSet(@Nullable Set<String> labelNames) {
+      Set<String> normalized =
+          (labelNames == null || labelNames.isEmpty()) ? emptySet() : labelNames;
+      labelSchemas.remove(normalized);
+    }
+
+    /** Returns true if all label schemas have been unregistered. */
+    boolean isEmpty() {
+      return labelSchemas.isEmpty();
+    }
+
+    MetricType getType() {
+      return type;
+    }
+  }
+
+  /**
+   * Returns an immutable set of label names for storage. Defends against mutation of the set
+   * returned by {@code Collector.getLabelNames()} after registration, which would break duplicate
+   * detection and unregistration.
+   */
+  private static Set<String> immutableLabelNames(@Nullable Set<String> labelNames) {
+    if (labelNames == null || labelNames.isEmpty()) {
+      return emptySet();
+    }
+    return Collections.unmodifiableSet(new HashSet<>(labelNames));
+  }
+
+  @SuppressWarnings("deprecation")
+  @Nullable
+  private static String getDeprecatedPrometheusName(Collector collector) {
+    return collector.getPrometheusName();
+  }
+
+  @SuppressWarnings("deprecation")
+  private static List<String> getDeprecatedPrometheusNames(MultiCollector collector) {
+    return collector.getPrometheusNames();
+  }
+
+  /**
+   * Computes the set of exposition-level time series names that a metric with the given name and
+   * type will produce.
+   */
+  static Set<String> computeExpositionNames(String prometheusName, MetricType type) {
+    Set<String> names = new HashSet<>();
+    switch (type) {
+      case COUNTER:
+        names.add(prometheusName + "_total");
+        names.add(prometheusName + "_created");
+        break;
+      case INFO:
+        names.add(prometheusName + "_info");
+        break;
+      case HISTOGRAM:
+        names.add(prometheusName + "_bucket");
+        names.add(prometheusName + "_count");
+        names.add(prometheusName + "_sum");
+        names.add(prometheusName + "_created");
+        break;
+      case SUMMARY:
+        names.add(prometheusName + "_count");
+        names.add(prometheusName + "_sum");
+        names.add(prometheusName + "_created");
+        break;
+      case GAUGE:
+      case STATESET:
+      case UNKNOWN:
+      default:
+        names.add(prometheusName);
+        break;
+    }
+    return names;
+  }
+
+  /**
+   * Validates the registration of a metric with the given parameters. Ensures type consistency,
+   * label schema uniqueness, help/unit consistency, and exposition name collision detection.
+   */
+  private void validateRegistration(
+      String prometheusName,
+      MetricType metricType,
+      Set<String> normalizedLabels,
+      @Nullable String help,
+      @Nullable Unit unit) {
+    final MetricType type = metricType;
+    final Set<String> names = normalizedLabels;
+    final String helpForValidation = help;
+    final Unit unitForValidation = unit;
+
+    Set<String> expositionNames = computeExpositionNames(prometheusName, type);
+    String claimError = claimExpositionNames(expositionNames, prometheusName);
+    if (claimError != null) {
+      throw new IllegalArgumentException(claimError);
+    }
+
+    boolean success = false;
+    try {
+      registered.compute(
+          prometheusName,
+          (n, existingInfo) -> {
+            if (existingInfo == null) {
+              return RegistrationInfo.of(type, names, helpForValidation, unitForValidation);
+            } else {
+              if (existingInfo.getType() != type) {
+                throw new IllegalArgumentException(
+                    prometheusName
+                        + ": Conflicting metric types. Existing: "
+                        + existingInfo.getType()
+                        + ", new: "
+                        + type);
+              }
+              // Check label set first; only mutate help/unit after validation passes.
+              if (!existingInfo.addLabelSet(names)) {
+                throw new IllegalArgumentException(
+                    prometheusName
+                        + ": duplicate metric name with identical label schema "
+                        + names);
+              }
+              // Roll back label schema if metadata validation fails
+              try {
+                existingInfo.validateMetadata(helpForValidation, unitForValidation);
+              } catch (IllegalArgumentException e) {
+                existingInfo.removeLabelSet(names);
+                throw e;
+              }
+              return existingInfo;
+            }
+          });
+      success = true;
+    } finally {
+      if (!success) {
+        releaseExpositionNames(expositionNames, prometheusName);
+      }
+    }
+  }
+
+  /**
+   * Atomically claims exposition names for the given metric. Returns null on success, or an error
+   * message on conflict. Rolls back any partially claimed names on failure.
+   */
+  @Nullable
+  private String claimExpositionNames(Set<String> expositionNames, String prometheusName) {
+    for (String expositionName : expositionNames) {
+      String existingOwner = expositionNameOwners.putIfAbsent(expositionName, prometheusName);
+      if (existingOwner != null && !existingOwner.equals(prometheusName)) {
+        releaseExpositionNames(expositionNames, prometheusName);
+        return "'"
+            + prometheusName
+            + "' and '"
+            + existingOwner
+            + "' have conflicting exposition name: '"
+            + expositionName
+            + "'";
+      }
+    }
+    return null;
+  }
+
+  private void releaseExpositionNames(Set<String> expositionNames, String owner) {
+    for (String expositionName : expositionNames) {
+      expositionNameOwners.remove(expositionName, owner);
+    }
+  }
 
   public void register(Collector collector) {
-    String prometheusName = collector.getPrometheusName();
-    if (prometheusName != null) {
-      if (!prometheusNames.add(prometheusName)) {
-        throw new IllegalStateException(
-            "Can't register "
-                + prometheusName
-                + " because a metric with that name is already registered.");
+    if (!collectors.add(collector)) {
+      throw new IllegalArgumentException("Collector instance is already registered");
+    }
+    try {
+      MetricFamilyDescriptor descriptor = collector.getMetricFamilyDescriptor();
+
+      // Only perform validation if collector provides sufficient metadata. Collectors that don't
+      // implement getMetricFamilyDescriptor() will skip registration-time validation.
+      if (descriptor != null) {
+        String prometheusName = descriptor.getPrometheusName();
+        MetricType metricType = descriptor.getType();
+        Set<String> normalizedLabels = immutableLabelNames(descriptor.getLabelNames());
+        MetricMetadata metadata = descriptor.getMetadata();
+        validateRegistration(
+            prometheusName, metricType, normalizedLabels, metadata.getHelp(), metadata.getUnit());
+        collectorMetadata.put(
+            collector,
+            new CollectorRegistration(
+                prometheusName, metadata.getExpositionBasePrometheusName(), normalizedLabels));
+      }
+      // Catch RuntimeException broadly because collector methods are user-implemented and could
+      // throw any RuntimeException. Ensures cleanup on failure.
+    } catch (RuntimeException e) {
+      collectors.remove(collector);
+      CollectorRegistration reg = collectorMetadata.remove(collector);
+      if (reg != null && reg.prometheusName != null) {
+        unregisterLabelSchema(reg.prometheusName, reg.labelNames);
       }
+      throw e;
     }
-    collectors.add(collector);
   }
 
   public void register(MultiCollector collector) {
-    for (String prometheusName : collector.getPrometheusNames()) {
-      if (!prometheusNames.add(prometheusName)) {
-        throw new IllegalStateException(
-            "Can't register " + prometheusName + " because that name is already registered.");
+    if (!multiCollectors.add(collector)) {
+      throw new IllegalArgumentException("MultiCollector instance is already registered");
+    }
+    List<MultiCollectorRegistration> registrations = new ArrayList<>();
+
+    try {
+      for (MetricFamilyDescriptor descriptor : collector.getMetricFamilyDescriptors()) {
+        String prometheusName = descriptor.getPrometheusName();
+        Set<String> normalizedLabels = immutableLabelNames(descriptor.getLabelNames());
+        MetricMetadata metadata = descriptor.getMetadata();
+
+        validateRegistration(
+            prometheusName,
+            descriptor.getType(),
+            normalizedLabels,
+            metadata.getHelp(),
+            metadata.getUnit());
+        registrations.add(new MultiCollectorRegistration(prometheusName, normalizedLabels));
+      }
+
+      multiCollectorMetadata.put(collector, registrations);
+      // Catch RuntimeException broadly because collector methods are user-implemented and could
+      // throw any RuntimeException. Ensures cleanup on failure.
+    } catch (RuntimeException e) {
+      multiCollectors.remove(collector);
+      for (MultiCollectorRegistration registration : registrations) {
+        unregisterLabelSchema(registration.prometheusName, registration.labelNames);
       }
+      throw e;
     }
-    multiCollectors.add(collector);
   }
 
   public void unregister(Collector collector) {
     collectors.remove(collector);
-    String prometheusName = collector.getPrometheusName();
-    if (prometheusName != null) {
-      prometheusNames.remove(collector.getPrometheusName());
+
+    CollectorRegistration registration = collectorMetadata.remove(collector);
+    if (registration != null && registration.prometheusName != null) {
+      unregisterLabelSchema(registration.prometheusName, registration.labelNames);
     }
   }
 
   public void unregister(MultiCollector collector) {
     multiCollectors.remove(collector);
-    for (String prometheusName : collector.getPrometheusNames()) {
-      prometheusNames.remove(prometheusName(prometheusName));
+
+    List<MultiCollectorRegistration> registrations = multiCollectorMetadata.remove(collector);
+    if (registrations != null) {
+      for (MultiCollectorRegistration registration : registrations) {
+        unregisterLabelSchema(registration.prometheusName, registration.labelNames);
+      }
     }
   }
 
+  /**
+   * Removes the label schema for the given metric name. If no label schemas remain for that name,
+   * removes the metric name entirely from the registry, including its exposition name reservations.
+   */
+  private void unregisterLabelSchema(String prometheusName, Set<String> labelNames) {
+    registered.computeIfPresent(
+        prometheusName,
+        (name, info) -> {
+          info.removeLabelSet(labelNames);
+          if (info.isEmpty()) {
+            // Remove exposition name reservations for this metric.
+            Set<String> expositionNames = computeExpositionNames(prometheusName, info.getType());
+            for (String expositionName : expositionNames) {
+              expositionNameOwners.remove(expositionName, prometheusName);
+            }
+            return null;
+          }
+          return info;
+        });
+  }
+
   public void clear() {
     collectors.clear();
     multiCollectors.clear();
-    prometheusNames.clear();
+    registered.clear();
+    collectorMetadata.clear();
+    multiCollectorMetadata.clear();
+    expositionNameOwners.clear();
   }
 
   public MetricSnapshots scrape() {
@@ -68,29 +418,26 @@ public MetricSnapshots scrape() {
   }
 
   public MetricSnapshots scrape(@Nullable PrometheusScrapeRequest scrapeRequest) {
-    MetricSnapshots.Builder result = MetricSnapshots.builder();
+    List<MetricSnapshot> allSnapshots = new ArrayList<>();
     for (Collector collector : collectors) {
       MetricSnapshot snapshot =
           scrapeRequest == null ? collector.collect() : collector.collect(scrapeRequest);
       if (snapshot != null) {
-        if (result.containsMetricName(snapshot.getMetadata().getName())) {
-          throw new IllegalStateException(
-              snapshot.getMetadata().getPrometheusName() + ": duplicate metric name.");
-        }
-        result.metricSnapshot(snapshot);
+        allSnapshots.add(snapshot);
       }
     }
     for (MultiCollector collector : multiCollectors) {
       MetricSnapshots snapshots =
           scrapeRequest == null ? collector.collect() : collector.collect(scrapeRequest);
       for (MetricSnapshot snapshot : snapshots) {
-        if (result.containsMetricName(snapshot.getMetadata().getName())) {
-          throw new IllegalStateException(
-              snapshot.getMetadata().getPrometheusName() + ": duplicate metric name.");
-        }
-        result.metricSnapshot(snapshot);
+        allSnapshots.add(snapshot);
       }
     }
+
+    MetricSnapshots.Builder result = MetricSnapshots.builder();
+    for (MetricSnapshot snapshot : allSnapshots) {
+      result.metricSnapshot(snapshot);
+    }
     return result.build();
   }
 
@@ -106,28 +453,44 @@ public MetricSnapshots scrape(
     if (includedNames == null) {
       return scrape(scrapeRequest);
     }
-    MetricSnapshots.Builder result = MetricSnapshots.builder();
+    List<MetricSnapshot> allSnapshots = new ArrayList<>();
     for (Collector collector : collectors) {
-      String prometheusName = collector.getPrometheusName();
+      CollectorRegistration reg = collectorMetadata.get(collector);
+      String prometheusName =
+          reg != null ? reg.prometheusName : getDeprecatedPrometheusName(collector);
       // prometheusName == null means the name is unknown, and we have to scrape to learn the name.
       // prometheusName != null means we can skip the scrape if the name is excluded.
-      if (prometheusName == null || includedNames.test(prometheusName)) {
+      // Also test the original name (e.g. "events_total" for a counter named "events").
+      String expositionName = reg != null ? reg.expositionBasePrometheusName : null;
+      if (prometheusName == null
+          || includedNames.test(prometheusName)
+          || (expositionName != null && includedNames.test(expositionName))) {
         MetricSnapshot snapshot =
             scrapeRequest == null
                 ? collector.collect(includedNames)
                 : collector.collect(includedNames, scrapeRequest);
         if (snapshot != null) {
-          result.metricSnapshot(snapshot);
+          allSnapshots.add(snapshot);
         }
       }
     }
     for (MultiCollector collector : multiCollectors) {
-      List<String> prometheusNames = collector.getPrometheusNames();
+      List<MultiCollectorRegistration> registrations = multiCollectorMetadata.get(collector);
+      List<String> prometheusNames = getDeprecatedPrometheusNames(collector);
       // empty prometheusNames means the names are unknown, and we have to scrape to learn the
       // names.
       // non-empty prometheusNames means we can exclude the collector if all names are excluded by
       // the filter.
-      boolean excluded = !prometheusNames.isEmpty();
+      boolean excluded =
+          (registrations != null && !registrations.isEmpty()) || !prometheusNames.isEmpty();
+      if (registrations != null) {
+        for (MultiCollectorRegistration registration : registrations) {
+          if (includedNames.test(registration.prometheusName)) {
+            excluded = false;
+            break;
+          }
+        }
+      }
       for (String prometheusName : prometheusNames) {
         if (includedNames.test(prometheusName)) {
           excluded = false;
@@ -141,11 +504,16 @@ public MetricSnapshots scrape(
                 : collector.collect(includedNames, scrapeRequest);
         for (MetricSnapshot snapshot : snapshots) {
           if (snapshot != null) {
-            result.metricSnapshot(snapshot);
+            allSnapshots.add(snapshot);
           }
         }
       }
     }
+
+    MetricSnapshots.Builder result = MetricSnapshots.builder();
+    for (MetricSnapshot snapshot : allSnapshots) {
+      result.metricSnapshot(snapshot);
+    }
     return result.build();
   }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusScrapeRequest.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusScrapeRequest.java
index 91a1313ab..2ec6c768f 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusScrapeRequest.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/registry/PrometheusScrapeRequest.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.model.registry;
 
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
 /** Infos extracted from the request received by the endpoint */
+@StableApi
 public interface PrometheusScrapeRequest {
 
   /** Absolute path of the HTTP request. */
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucket.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucket.java
index ebadd1f16..0f487efdf 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucket.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucket.java
@@ -1,9 +1,12 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 /**
  * Helper class for iterating over {@link ClassicHistogramBuckets}. Note that the {@code count} is
  * <i>not</i> cumulative.
  */
+@StableApi
 public class ClassicHistogramBucket implements Comparable<ClassicHistogramBucket> {
 
   private final long count; // not cumulative
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBuckets.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBuckets.java
index 09e75181b..b2998d799 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBuckets.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBuckets.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -11,6 +12,7 @@
  * Immutable container for histogram buckets with fixed bucket boundaries. Note that the counts are
  * <i>not</i> cumulative.
  */
+@StableApi
 public class ClassicHistogramBuckets implements Iterable<ClassicHistogramBucket> {
 
   /** Used in native histograms to indicate that no classic histogram buckets are present. */
@@ -110,25 +112,16 @@ private static void sortAndValidate(double[] upperBounds, long[] counts) {
     validate(upperBounds, counts);
   }
 
+  /**
+   * Sorts upperBounds and counts in place using introspective quicksort.
+   *
+   * <p>Algorithm: 3-way quicksort with insertion sort for tiny partitions and heapsort fallback at
+   * the recursion depth limit. Parallel arrays are swapped in lockstep.
+   *
+   * <p>Complexity: O(n log n) average and worst case.
+   */
   private static void sort(double[] upperBounds, long[] counts) {
-    // Bubblesort. Should be efficient here as in most cases upperBounds is already sorted.
-    int n = upperBounds.length;
-    for (int i = 0; i < n - 1; i++) {
-      for (int j = 0; j < n - i - 1; j++) {
-        if (upperBounds[j] > upperBounds[j + 1]) {
-          swap(j, j + 1, upperBounds, counts);
-        }
-      }
-    }
-  }
-
-  private static void swap(int i, int j, double[] upperBounds, long[] counts) {
-    double tmpDouble = upperBounds[j];
-    upperBounds[j] = upperBounds[i];
-    upperBounds[i] = tmpDouble;
-    long tmpLong = counts[j];
-    counts[j] = counts[i];
-    counts[i] = tmpLong;
+    DoubleArraySorter.sort(upperBounds, counts);
   }
 
   private static void validate(double[] upperBounds, long[] counts) {
@@ -224,4 +217,157 @@ public ClassicHistogramBuckets build() {
       return ClassicHistogramBuckets.of(upperBounds, counts);
     }
   }
+
+  /**
+   * In-place introsort for {@code upperBounds} and parallel {@code counts}.
+   *
+   * <p>Uses 3-way quicksort partitioning for large ranges, insertion sort for tiny ranges, and a
+   * heapsort fallback at the recursion-depth limit to guarantee O(n log n) worst-case complexity.
+   */
+  private static final class DoubleArraySorter {
+
+    private static final int INSERTION_SORT_THRESHOLD = 24;
+
+    private static void sort(double[] upperBounds, long[] counts) {
+      int right = upperBounds.length - 1;
+      if (right <= 0) {
+        return;
+      }
+      introSort(upperBounds, counts, 0, right, depthLimit(upperBounds.length));
+    }
+
+    private static void introSort(
+        double[] upperBounds, long[] counts, int left, int right, int depthLimit) {
+      while (left < right) {
+        if (right - left + 1 <= INSERTION_SORT_THRESHOLD) {
+          insertionSort(upperBounds, counts, left, right);
+          return;
+        }
+        if (depthLimit == 0) {
+          heapSort(upperBounds, counts, left, right);
+          return;
+        }
+        depthLimit--;
+
+        int mid = left + ((right - left) >>> 1);
+        int pivotIndex = medianOf3(upperBounds, left, mid, right);
+        double pivot = upperBounds[pivotIndex];
+
+        int lt = left;
+        int i = left;
+        int gt = right;
+        while (i <= gt) {
+          int cmp = compare(upperBounds[i], pivot);
+          if (cmp < 0) {
+            swap(i, lt, upperBounds, counts);
+            i++;
+            lt++;
+          } else if (cmp > 0) {
+            swap(i, gt, upperBounds, counts);
+            gt--;
+          } else {
+            i++;
+          }
+        }
+
+        if (lt - left < right - gt) {
+          introSort(upperBounds, counts, left, lt - 1, depthLimit);
+          left = gt + 1;
+        } else {
+          introSort(upperBounds, counts, gt + 1, right, depthLimit);
+          right = lt - 1;
+        }
+      }
+    }
+
+    private static void insertionSort(double[] upperBounds, long[] counts, int left, int right) {
+      for (int i = left + 1; i <= right; i++) {
+        double upperBound = upperBounds[i];
+        long count = counts[i];
+        int j = i - 1;
+        while (j >= left && compare(upperBounds[j], upperBound) > 0) {
+          upperBounds[j + 1] = upperBounds[j];
+          counts[j + 1] = counts[j];
+          j--;
+        }
+        upperBounds[j + 1] = upperBound;
+        counts[j + 1] = count;
+      }
+    }
+
+    private static void heapSort(double[] upperBounds, long[] counts, int left, int right) {
+      int size = right - left + 1;
+      for (int i = (size >>> 1) - 1; i >= 0; i--) {
+        siftDown(upperBounds, counts, left, i, size);
+      }
+      for (int end = size - 1; end > 0; end--) {
+        swap(left, left + end, upperBounds, counts);
+        siftDown(upperBounds, counts, left, 0, end);
+      }
+    }
+
+    private static void siftDown(
+        double[] upperBounds, long[] counts, int base, int root, int size) {
+      while (true) {
+        int child = (root << 1) + 1;
+        if (child >= size) {
+          return;
+        }
+        int rightChild = child + 1;
+        if (rightChild < size
+            && compare(upperBounds[base + child], upperBounds[base + rightChild]) < 0) {
+          child = rightChild;
+        }
+        if (compare(upperBounds[base + root], upperBounds[base + child]) >= 0) {
+          return;
+        }
+        swap(base + root, base + child, upperBounds, counts);
+        root = child;
+      }
+    }
+
+    private static int depthLimit(int length) {
+      int result = 0;
+      while (length > 1) {
+        result++;
+        length >>>= 1;
+      }
+      return result << 1;
+    }
+
+    private static int medianOf3(double[] upperBounds, int i, int j, int k) {
+      if (compare(upperBounds[i], upperBounds[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      if (compare(upperBounds[j], upperBounds[k]) > 0) {
+        int tmp = j;
+        j = k;
+        k = tmp;
+      }
+      if (compare(upperBounds[i], upperBounds[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      return j;
+    }
+
+    private static int compare(double a, double b) {
+      return Double.compare(a, b);
+    }
+
+    private static void swap(int i, int j, double[] upperBounds, long[] counts) {
+      if (i == j) {
+        return;
+      }
+      double upperBound = upperBounds[i];
+      upperBounds[i] = upperBounds[j];
+      upperBounds[j] = upperBound;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/CounterSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/CounterSnapshot.java
index 72a83a879..42a06f3bb 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/CounterSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/CounterSnapshot.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +8,7 @@
 import javax.annotation.Nullable;
 
 /** Immutable snapshot of a Counter. */
+@StableApi
 public class CounterSnapshot extends MetricSnapshot {
 
   /**
@@ -179,6 +181,14 @@ public Builder dataPoint(CounterDataPointSnapshot dataPoint) {
       return this;
     }
 
+    @Override
+    protected MetricMetadata buildMetadata() {
+      if (name == null) {
+        throw new IllegalArgumentException("Missing required field: name is null");
+      }
+      return MetricMetadataSupport.counterMetadata(name, help, unit);
+    }
+
     @Override
     public CounterSnapshot build() {
       return new CounterSnapshot(buildMetadata(), dataPoints);
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DataPointSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DataPointSnapshot.java
index d960912a0..910e2ef50 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DataPointSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DataPointSnapshot.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 
 @SuppressWarnings("this-escape")
+@StableApi
 public abstract class DataPointSnapshot {
   private final Labels labels;
   private final long createdTimestampMillis;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DistributionDataPointSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DistributionDataPointSnapshot.java
index 1ae0559e1..2d1331915 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DistributionDataPointSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DistributionDataPointSnapshot.java
@@ -1,9 +1,12 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 /**
  * Common base class for histogram and summary data. Histograms and Summaries represent
  * distributions, like a latency distribution or a distribution of request sizes in Bytes.
  */
+@StableApi
 public abstract class DistributionDataPointSnapshot extends DataPointSnapshot {
   private final long count; // optional, negative value means no count.
   private final double sum; // optional, Double.NaN means no sum.
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DuplicateLabelsException.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DuplicateLabelsException.java
index 721655105..fd1e6d838 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DuplicateLabelsException.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/DuplicateLabelsException.java
@@ -1,9 +1,12 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 /**
  * Thrown when a collector tries to create a {@link MetricSnapshot} where multiple data points have
  * the same labels (same label names and label values).
  */
+@StableApi
 public class DuplicateLabelsException extends IllegalArgumentException {
 
   private static final long serialVersionUID = 0L;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplar.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplar.java
index 418603580..07dc811f8 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplar.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplar.java
@@ -2,9 +2,11 @@
 
 import static java.util.Objects.requireNonNull;
 
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
 /** Immutable representation of an Exemplar. */
+@StableApi
 public class Exemplar {
 
   /** Label name for trace id. */
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplars.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplars.java
index 887a80fff..96ae697d0 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplars.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Exemplars.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -14,6 +15,7 @@
  * <p>This is currently backed by a {@code List<Exemplar>}. May be refactored later to use a more
  * efficient data structure.
  */
+@StableApi
 public class Exemplars implements Iterable<Exemplar> {
 
   /** EMPTY means no Exemplars. */
@@ -22,6 +24,10 @@ public class Exemplars implements Iterable<Exemplar> {
   private final List<Exemplar> exemplars;
 
   private Exemplars(Collection<Exemplar> exemplars) {
+    if (exemplars.isEmpty()) {
+      this.exemplars = Collections.emptyList();
+      return;
+    }
     List<Exemplar> copy = new ArrayList<>(exemplars.size());
     for (Exemplar exemplar : exemplars) {
       if (exemplar == null) {
@@ -39,7 +45,7 @@ private Exemplars(Collection<Exemplar> exemplars) {
    * @param exemplars a copy of the exemplars collection will be created.
    */
   public static Exemplars of(Collection<Exemplar> exemplars) {
-    return new Exemplars(exemplars);
+    return exemplars.isEmpty() ? EMPTY : new Exemplars(exemplars);
   }
 
   /**
@@ -49,7 +55,7 @@ public static Exemplars of(Collection<Exemplar> exemplars) {
    * @param exemplars a copy of the exemplars array will be created.
    */
   public static Exemplars of(Exemplar... exemplars) {
-    return new Exemplars(Arrays.asList(exemplars));
+    return exemplars.length == 0 ? EMPTY : new Exemplars(Arrays.asList(exemplars));
   }
 
   @Override
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/GaugeSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/GaugeSnapshot.java
index 03474852f..7a4208b05 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/GaugeSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/GaugeSnapshot.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +8,7 @@
 import javax.annotation.Nullable;
 
 /** Immutable snapshot of a Gauge. */
+@StableApi
 public final class GaugeSnapshot extends MetricSnapshot {
 
   /**
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/HistogramSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/HistogramSnapshot.java
index acc78d3d3..06c687c9f 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/HistogramSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/HistogramSnapshot.java
@@ -1,11 +1,13 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 /** Immutable snapshot of a Histogram. */
+@StableApi
 public final class HistogramSnapshot extends MetricSnapshot {
 
   private final boolean gaugeHistogram;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/InfoSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/InfoSnapshot.java
index ca6cf70a0..0178eea2e 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/InfoSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/InfoSnapshot.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +8,7 @@
 import javax.annotation.Nullable;
 
 /** Immutable snapshot of an Info metric. */
+@StableApi
 public final class InfoSnapshot extends MetricSnapshot {
 
   /**
@@ -118,6 +120,14 @@ public Builder unit(@Nullable Unit unit) {
       throw new IllegalArgumentException("Info metric cannot have a unit.");
     }
 
+    @Override
+    protected MetricMetadata buildMetadata() {
+      if (name == null) {
+        throw new IllegalArgumentException("Missing required field: name is null");
+      }
+      return MetricMetadataSupport.infoMetadata(name, help);
+    }
+
     @Override
     public InfoSnapshot build() {
       return new InfoSnapshot(buildMetadata(), dataPoints);
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Label.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Label.java
index 45acd56ee..7af8d3310 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Label.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Label.java
@@ -1,8 +1,10 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.Objects;
 
 /** Utility for iterating over {@link Labels}. */
+@StableApi
 public final class Label implements Comparable<Label> {
 
   private final String name;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Labels.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Labels.java
index 31c6ab485..d5c0a3a95 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Labels.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Labels.java
@@ -3,6 +3,7 @@
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.isValidLabelName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -12,6 +13,7 @@
 import javax.annotation.Nullable;
 
 /** Immutable set of name/value pairs, sorted by name. */
+@StableApi
 public final class Labels implements Comparable<Labels>, Iterable<Label> {
 
   public static final Labels EMPTY;
@@ -122,7 +124,7 @@ static String[] makePrometheusNames(String[] names) {
     for (int i = 0; i < names.length; i++) {
       String name = names[i];
       if (!PrometheusNaming.isValidLegacyLabelName(name)) {
-        if (prometheusNames == names) {
+        if (sameObject(prometheusNames, names)) {
           prometheusNames = Arrays.copyOf(names, names.length);
         }
         prometheusNames[i] = PrometheusNaming.prometheusName(name);
@@ -177,31 +179,16 @@ private static void validateNames(String[] names, String[] prometheusNames) {
     }
   }
 
+  /**
+   * Sorts all three parallel arrays in place using introspective quicksort.
+   *
+   * <p>Algorithm: 3-way quicksort with insertion sort for tiny partitions and heapsort fallback at
+   * the recursion depth limit. Parallel arrays are swapped in lockstep.
+   *
+   * <p>Complexity: O(n log n) average and worst case.
+   */
   private static void sort(String[] names, String[] prometheusNames, String[] values) {
-    // bubblesort
-    int n = prometheusNames.length;
-    for (int i = 0; i < n - 1; i++) {
-      for (int j = 0; j < n - i - 1; j++) {
-        if (prometheusNames[j].compareTo(prometheusNames[j + 1]) > 0) {
-          swap(j, j + 1, names, prometheusNames, values);
-        }
-      }
-    }
-  }
-
-  private static void swap(
-      int i, int j, String[] names, String[] prometheusNames, String[] values) {
-    String tmp = names[j];
-    names[j] = names[i];
-    names[i] = tmp;
-    tmp = values[j];
-    values[j] = values[i];
-    values[i] = tmp;
-    if (prometheusNames != names) {
-      tmp = prometheusNames[j];
-      prometheusNames[j] = prometheusNames[i];
-      prometheusNames[i] = tmp;
-    }
+    StringArraySorter.sort(names, prometheusNames, values);
   }
 
   @Override
@@ -247,7 +234,8 @@ public Labels merge(Labels other) {
     }
     String[] names = new String[this.names.length + other.names.length];
     String[] prometheusNames = names;
-    if (this.names != this.prometheusNames || other.names != other.prometheusNames) {
+    if (!sameObject(this.names, this.prometheusNames)
+        || !sameObject(other.names, other.prometheusNames)) {
       prometheusNames = new String[names.length];
     }
     String[] values = new String[names.length];
@@ -257,28 +245,28 @@ public Labels merge(Labels other) {
       if (thisPos >= this.names.length) {
         names[thisPos + otherPos] = other.names[otherPos];
         values[thisPos + otherPos] = other.values[otherPos];
-        if (prometheusNames != names) {
+        if (!sameObject(prometheusNames, names)) {
           prometheusNames[thisPos + otherPos] = other.prometheusNames[otherPos];
         }
         otherPos++;
       } else if (otherPos >= other.names.length) {
         names[thisPos + otherPos] = this.names[thisPos];
         values[thisPos + otherPos] = this.values[thisPos];
-        if (prometheusNames != names) {
+        if (!sameObject(prometheusNames, names)) {
           prometheusNames[thisPos + otherPos] = this.prometheusNames[thisPos];
         }
         thisPos++;
       } else if (this.prometheusNames[thisPos].compareTo(other.prometheusNames[otherPos]) < 0) {
         names[thisPos + otherPos] = this.names[thisPos];
         values[thisPos + otherPos] = this.values[thisPos];
-        if (prometheusNames != names) {
+        if (!sameObject(prometheusNames, names)) {
           prometheusNames[thisPos + otherPos] = this.prometheusNames[thisPos];
         }
         thisPos++;
       } else if (this.prometheusNames[thisPos].compareTo(other.prometheusNames[otherPos]) > 0) {
         names[thisPos + otherPos] = other.names[otherPos];
         values[thisPos + otherPos] = other.values[otherPos];
-        if (prometheusNames != names) {
+        if (!sameObject(prometheusNames, names)) {
           prometheusNames[thisPos + otherPos] = other.prometheusNames[otherPos];
         }
         otherPos++;
@@ -334,6 +322,11 @@ public int compareTo(Labels other) {
   }
 
   // Looks like Java doesn't have a compareTo() method for arrays.
+  @SuppressWarnings("ReferenceEquality")
+  private static boolean sameObject(Object left, Object right) {
+    return left == right;
+  }
+
   private int compare(String[] array1, String[] array2) {
     int result;
     for (int i = 0; i < array1.length; i++) {
@@ -441,4 +434,177 @@ public Labels build() {
       return Labels.of(names, values);
     }
   }
+
+  /**
+   * In-place introsort for label arrays, keyed by {@code prometheusNames}.
+   *
+   * <p>Uses 3-way quicksort partitioning for large ranges, insertion sort for tiny ranges, and a
+   * heapsort fallback at the recursion-depth limit to guarantee O(n log n) worst-case complexity.
+   */
+  private static final class StringArraySorter {
+
+    private static final int INSERTION_SORT_THRESHOLD = 24;
+
+    private static void sort(String[] names, String[] prometheusNames, String[] values) {
+      int right = names.length - 1;
+      if (right <= 0) {
+        return;
+      }
+      introSort(names, prometheusNames, values, 0, right, depthLimit(names.length));
+    }
+
+    private static void introSort(
+        String[] names,
+        String[] prometheusNames,
+        String[] values,
+        int left,
+        int right,
+        int depthLimit) {
+      while (left < right) {
+        if (right - left + 1 <= INSERTION_SORT_THRESHOLD) {
+          insertionSort(names, prometheusNames, values, left, right);
+          return;
+        }
+        if (depthLimit == 0) {
+          heapSort(names, prometheusNames, values, left, right);
+          return;
+        }
+        depthLimit--;
+
+        int mid = left + ((right - left) >>> 1);
+        int pivotIndex = medianOf3(prometheusNames, left, mid, right);
+        String pivot = prometheusNames[pivotIndex];
+
+        int lt = left;
+        int i = left;
+        int gt = right;
+        while (i <= gt) {
+          int cmp = compare(prometheusNames[i], pivot);
+          if (cmp < 0) {
+            swap(i, lt, names, prometheusNames, values);
+            i++;
+            lt++;
+          } else if (cmp > 0) {
+            swap(i, gt, names, prometheusNames, values);
+            gt--;
+          } else {
+            i++;
+          }
+        }
+
+        if (lt - left < right - gt) {
+          introSort(names, prometheusNames, values, left, lt - 1, depthLimit);
+          left = gt + 1;
+        } else {
+          introSort(names, prometheusNames, values, gt + 1, right, depthLimit);
+          right = lt - 1;
+        }
+      }
+    }
+
+    private static void insertionSort(
+        String[] names, String[] prometheusNames, String[] values, int left, int right) {
+      for (int i = left + 1; i <= right; i++) {
+        String name = names[i];
+        String prometheusName = prometheusNames[i];
+        final String value = values[i];
+        int j = i - 1;
+        while (j >= left && compare(prometheusNames[j], prometheusName) > 0) {
+          names[j + 1] = names[j];
+          if (!sameObject(prometheusNames, names)) {
+            prometheusNames[j + 1] = prometheusNames[j];
+          }
+          values[j + 1] = values[j];
+          j--;
+        }
+        names[j + 1] = name;
+        if (!sameObject(prometheusNames, names)) {
+          prometheusNames[j + 1] = prometheusName;
+        }
+        values[j + 1] = value;
+      }
+    }
+
+    private static void heapSort(
+        String[] names, String[] prometheusNames, String[] values, int left, int right) {
+      int size = right - left + 1;
+      for (int i = (size >>> 1) - 1; i >= 0; i--) {
+        siftDown(names, prometheusNames, values, left, i, size);
+      }
+      for (int end = size - 1; end > 0; end--) {
+        swap(left, left + end, names, prometheusNames, values);
+        siftDown(names, prometheusNames, values, left, 0, end);
+      }
+    }
+
+    private static void siftDown(
+        String[] names, String[] prometheusNames, String[] values, int base, int root, int size) {
+      while (true) {
+        int child = (root << 1) + 1;
+        if (child >= size) {
+          return;
+        }
+        int rightChild = child + 1;
+        if (rightChild < size
+            && compare(prometheusNames[base + child], prometheusNames[base + rightChild]) < 0) {
+          child = rightChild;
+        }
+        if (compare(prometheusNames[base + root], prometheusNames[base + child]) >= 0) {
+          return;
+        }
+        swap(base + root, base + child, names, prometheusNames, values);
+        root = child;
+      }
+    }
+
+    private static int depthLimit(int length) {
+      int result = 0;
+      while (length > 1) {
+        result++;
+        length >>>= 1;
+      }
+      return result << 1;
+    }
+
+    private static int medianOf3(String[] values, int i, int j, int k) {
+      if (compare(values[i], values[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      if (compare(values[j], values[k]) > 0) {
+        int tmp = j;
+        j = k;
+        k = tmp;
+      }
+      if (compare(values[i], values[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      return j;
+    }
+
+    private static int compare(String left, String right) {
+      return left.compareTo(right);
+    }
+
+    private static void swap(
+        int i, int j, String[] names, String[] prometheusNames, String[] values) {
+      if (i == j) {
+        return;
+      }
+      String tmp = names[i];
+      names[i] = names[j];
+      names[j] = tmp;
+      tmp = values[i];
+      values[i] = values[j];
+      values[j] = tmp;
+      if (!sameObject(prometheusNames, names)) {
+        tmp = prometheusNames[i];
+        prometheusNames[i] = prometheusNames[j];
+        prometheusNames[j] = tmp;
+      }
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricFamilyDescriptor.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricFamilyDescriptor.java
new file mode 100644
index 000000000..79b531fa8
--- /dev/null
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricFamilyDescriptor.java
@@ -0,0 +1,293 @@
+package io.prometheus.metrics.model.snapshots;
+
+import io.prometheus.metrics.annotations.StableApi;
+import io.prometheus.metrics.model.registry.MetricType;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+/** Registration-time descriptor for a metric family. */
+@StableApi
+public final class MetricFamilyDescriptor {
+
+  private final MetricType type;
+  private final MetricMetadata metadata;
+  private final Set<String> labelNames;
+
+  private MetricFamilyDescriptor(
+      MetricType type, MetricMetadata metadata, Collection<String> labelNames) {
+    if (type == null) {
+      throw new IllegalArgumentException("Missing required field: type is null");
+    }
+    if (metadata == null) {
+      throw new IllegalArgumentException("Missing required field: metadata is null");
+    }
+    if (labelNames == null) {
+      throw new IllegalArgumentException("Missing required field: labelNames is null");
+    }
+    this.type = type;
+    this.metadata = metadata;
+    this.labelNames = Collections.unmodifiableSet(new LinkedHashSet<>(labelNames));
+  }
+
+  public static MetricFamilyDescriptor of(MetricType type, MetricMetadata metadata) {
+    return of(type, metadata, Collections.emptySet());
+  }
+
+  public static MetricFamilyDescriptor of(
+      MetricType type, MetricMetadata metadata, Collection<String> labelNames) {
+    return new MetricFamilyDescriptor(type, metadata, labelNames);
+  }
+
+  public static Builder<?> of(MetricType type, String name) {
+    switch (type) {
+      case COUNTER:
+        return counter(name);
+      case GAUGE:
+        return gauge(name);
+      case HISTOGRAM:
+        return histogram(name);
+      case SUMMARY:
+        return summary(name);
+      case INFO:
+        return info(name);
+      case STATESET:
+        return stateSet(name);
+      case UNKNOWN:
+      default:
+        return unknown(name);
+    }
+  }
+
+  public static CounterBuilder counter(String name) {
+    return new CounterBuilder().name(name);
+  }
+
+  public static GaugeBuilder gauge(String name) {
+    return new GaugeBuilder().name(name);
+  }
+
+  public static HistogramBuilder histogram(String name) {
+    return new HistogramBuilder().name(name);
+  }
+
+  public static SummaryBuilder summary(String name) {
+    return new SummaryBuilder().name(name);
+  }
+
+  public static InfoBuilder info(String name) {
+    return new InfoBuilder().name(name);
+  }
+
+  public static StateSetBuilder stateSet(String name) {
+    return new StateSetBuilder().name(name);
+  }
+
+  public static UnknownBuilder unknown(String name) {
+    return new UnknownBuilder().name(name);
+  }
+
+  public MetricType getType() {
+    return type;
+  }
+
+  public MetricMetadata getMetadata() {
+    return metadata;
+  }
+
+  public Set<String> getLabelNames() {
+    return labelNames;
+  }
+
+  public String getPrometheusName() {
+    return metadata.getPrometheusName();
+  }
+
+  public abstract static class Builder<T extends Builder<T>> {
+
+    @Nullable protected String name;
+    @Nullable protected String help;
+    @Nullable protected Unit unit;
+    protected final Set<String> labelNames = new LinkedHashSet<>();
+
+    public T name(String name) {
+      this.name = name;
+      return self();
+    }
+
+    public T help(String help) {
+      if (help == null) {
+        throw new IllegalArgumentException("Missing required field: help is null");
+      }
+      this.help = help;
+      return self();
+    }
+
+    public T unit(Unit unit) {
+      if (unit == null) {
+        throw new IllegalArgumentException("Missing required field: unit is null");
+      }
+      this.unit = unit;
+      return self();
+    }
+
+    public T labelName(String labelName) {
+      this.labelNames.add(PrometheusNaming.prometheusName(labelName));
+      return self();
+    }
+
+    public T labelNames(String... labelNames) {
+      for (String labelName : labelNames) {
+        labelName(labelName);
+      }
+      return self();
+    }
+
+    public T labelNames(Collection<String> labelNames) {
+      for (String labelName : labelNames) {
+        labelName(labelName);
+      }
+      return self();
+    }
+
+    public MetricFamilyDescriptor build() {
+      return new MetricFamilyDescriptor(getType(), buildMetadata(), labelNames);
+    }
+
+    protected MetricMetadata buildMetadata() {
+      if (name == null) {
+        throw new IllegalArgumentException("Missing required field: name is null");
+      }
+      return MetricMetadataSupport.metricMetadata(name, help, unit);
+    }
+
+    protected abstract MetricType getType();
+
+    protected abstract T self();
+  }
+
+  public static final class CounterBuilder extends Builder<CounterBuilder> {
+
+    @Override
+    protected MetricMetadata buildMetadata() {
+      if (name == null) {
+        throw new IllegalArgumentException("Missing required field: name is null");
+      }
+      return MetricMetadataSupport.counterMetadata(name, help, unit);
+    }
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.COUNTER;
+    }
+
+    @Override
+    protected CounterBuilder self() {
+      return this;
+    }
+  }
+
+  public static final class GaugeBuilder extends Builder<GaugeBuilder> {
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.GAUGE;
+    }
+
+    @Override
+    protected GaugeBuilder self() {
+      return this;
+    }
+  }
+
+  public static final class HistogramBuilder extends Builder<HistogramBuilder> {
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.HISTOGRAM;
+    }
+
+    @Override
+    protected HistogramBuilder self() {
+      return this;
+    }
+  }
+
+  public static final class SummaryBuilder extends Builder<SummaryBuilder> {
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.SUMMARY;
+    }
+
+    @Override
+    protected SummaryBuilder self() {
+      return this;
+    }
+  }
+
+  public static final class InfoBuilder extends Builder<InfoBuilder> {
+
+    @Override
+    public InfoBuilder unit(Unit unit) {
+      if (unit == null) {
+        throw new IllegalArgumentException("Missing required field: unit is null");
+      }
+      throw new IllegalArgumentException("Info metric cannot have a unit.");
+    }
+
+    @Override
+    protected MetricMetadata buildMetadata() {
+      if (name == null) {
+        throw new IllegalArgumentException("Missing required field: name is null");
+      }
+      return MetricMetadataSupport.infoMetadata(name, help);
+    }
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.INFO;
+    }
+
+    @Override
+    protected InfoBuilder self() {
+      return this;
+    }
+  }
+
+  public static final class StateSetBuilder extends Builder<StateSetBuilder> {
+
+    @Override
+    public StateSetBuilder unit(Unit unit) {
+      if (unit == null) {
+        throw new IllegalArgumentException("Missing required field: unit is null");
+      }
+      throw new IllegalArgumentException("State set metric cannot have a unit.");
+    }
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.STATESET;
+    }
+
+    @Override
+    protected StateSetBuilder self() {
+      return this;
+    }
+  }
+
+  public static final class UnknownBuilder extends Builder<UnknownBuilder> {
+
+    @Override
+    protected MetricType getType() {
+      return MetricType.UNKNOWN;
+    }
+
+    @Override
+    protected UnknownBuilder self() {
+      return this;
+    }
+  }
+}
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadata.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadata.java
index 9c54f96d5..8fad68c85 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadata.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadata.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import javax.annotation.Nullable;
 
@@ -29,15 +30,33 @@ public final class MetricMetadata {
    */
   private final String prometheusName;
 
+  /**
+   * The base name for exposition, with unit suffix ensured and type suffix preserved. For example,
+   * for {@code Counter.builder().name("events_total").unit(BYTES)}, this is "events_total_bytes".
+   * Used by format writers for smart-append logic (e.g. deciding whether to append _total).
+   */
+  private final String expositionBaseName;
+
+  private final String expositionBasePrometheusName;
+
+  /**
+   * The original name as provided by the user, before any modification (no suffix stripping, no
+   * unit appending). For example, for {@code Counter.builder().name("req").unit(BYTES)}, this is
+   * "req". Used by the OTel exporter with {@code preserve_names=true}.
+   */
+  private final String originalName;
+
   @Nullable private final String help;
   @Nullable private final Unit unit;
 
   /** See {@link #MetricMetadata(String, String, Unit)} */
+  @StableApi
   public MetricMetadata(String name) {
     this(name, null, null);
   }
 
   /** See {@link #MetricMetadata(String, String, Unit)} */
+  @StableApi
   public MetricMetadata(String name, String help) {
     this(name, help, null);
   }
@@ -51,12 +70,161 @@ public MetricMetadata(String name, String help) {
    * @param help optional. May be {@code null}.
    * @param unit optional. May be {@code null}.
    */
+  @StableApi
   public MetricMetadata(String name, @Nullable String help, @Nullable Unit unit) {
+    this(name, name, help, unit);
+  }
+
+  /**
+   * Creates a builder for {@link MetricMetadata}.
+   *
+   * <p>Use the builder instead of the multi-arg constructors for cleaner, more readable code:
+   *
+   * <pre>{@code
+   * MetricMetadata.builder()
+   *     .name("http_requests")
+   *     .help("Total HTTP requests")
+   *     .unit(Unit.BYTES)
+   *     .counterSuffix(true)
+   *     .build();
+   * }</pre>
+   */
+  @StableApi
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  /** Builder for {@link MetricMetadata}. */
+  public static final class Builder {
+    @Nullable private String name;
+    @Nullable private String expositionBaseName;
+    @Nullable private String originalName;
+    @Nullable private String help;
+    @Nullable private Unit unit;
+    private boolean counterSuffix;
+
+    private Builder() {}
+
+    /** Required. The base metric name (without type suffix like {@code _total}). */
+    @StableApi
+    public Builder name(String name) {
+      this.name = name;
+      if (originalName == null) {
+        this.originalName = name;
+      }
+      return this;
+    }
+
+    /**
+     * Internal use only. Not part of the stable API.
+     *
+     * <p>Allows internal callers to preserve a separate exposition base name.
+     */
+    public Builder expositionBaseName(String expositionBaseName) {
+      this.expositionBaseName = expositionBaseName;
+      return this;
+    }
+
+    /**
+     * Internal use only. Not part of the stable API.
+     *
+     * <p>Allows internal callers to preserve the raw name before normalization.
+     */
+    public Builder originalName(String originalName) {
+      this.originalName = originalName;
+      return this;
+    }
+
+    /** Optional. Human-readable description of the metric. */
+    @StableApi
+    public Builder help(@Nullable String help) {
+      this.help = help;
+      return this;
+    }
+
+    /** Optional. The unit of measurement. Appended to the name if not already present. */
+    @StableApi
+    public Builder unit(@Nullable Unit unit) {
+      this.unit = unit;
+      return this;
+    }
+
+    /**
+     * Optional. When {@code true}, the writer appends {@code _total} to the exposition name. Use
+     * this for counter metrics, especially UTF-8 names where the writer cannot infer it from the
+     * snapshot type alone.
+     */
+    @StableApi
+    public Builder counterSuffix(boolean counterSuffix) {
+      this.counterSuffix = counterSuffix;
+      return this;
+    }
+
+    /** Builds the {@link MetricMetadata}. Throws if {@code name} was not set. */
+    @StableApi
+    public MetricMetadata build() {
+      if (name == null) {
+        throw new IllegalArgumentException("name is required");
+      }
+      String baseName = appendUnitIfMissing(name, unit);
+      String originalName = this.originalName == null ? name : this.originalName;
+      String expositionBaseName =
+          appendUnitIfMissing(
+              this.expositionBaseName == null ? baseName : this.expositionBaseName, unit);
+      if (counterSuffix
+          && !expositionBaseName.endsWith("_total")
+          && !expositionBaseName.endsWith(".total")) {
+        expositionBaseName = expositionBaseName + "_total";
+      }
+      return new MetricMetadata(baseName, expositionBaseName, originalName, help, unit);
+    }
+  }
+
+  /**
+   * Constructor with exposition base name.
+   *
+   * @param name the base name (with type suffixes stripped, e.g. "events" for a counter named
+   *     "events_total")
+   * @param expositionBaseName the name with unit suffix ensured and type suffix preserved, used by
+   *     format writers for smart-append logic
+   * @param help optional. May be {@code null}.
+   * @param unit optional. May be {@code null}.
+   * @deprecated Use {@link #builder()} instead.
+   */
+  @StableApi
+  @Deprecated
+  public MetricMetadata(
+      String name, String expositionBaseName, @Nullable String help, @Nullable Unit unit) {
+    this(name, expositionBaseName, expositionBaseName, help, unit);
+  }
+
+  /**
+   * Constructor with exposition base name and original name.
+   *
+   * @param name the base name (with type suffixes stripped, e.g. "events" for a counter named
+   *     "events_total")
+   * @param expositionBaseName the name with unit suffix ensured and type suffix preserved
+   * @param originalName the raw name as provided by the user, before any modification
+   * @param help optional. May be {@code null}.
+   * @param unit optional. May be {@code null}.
+   * @deprecated Use {@link #builder()} instead.
+   */
+  @StableApi
+  @Deprecated
+  public MetricMetadata(
+      String name,
+      String expositionBaseName,
+      String originalName,
+      @Nullable String help,
+      @Nullable Unit unit) {
     this.name = name;
+    this.expositionBaseName = expositionBaseName;
+    this.originalName = originalName;
     this.help = help;
     this.unit = unit;
     validate();
     this.prometheusName = PrometheusNaming.prometheusName(name);
+    this.expositionBasePrometheusName = PrometheusNaming.prometheusName(expositionBaseName);
   }
 
   /**
@@ -66,6 +234,7 @@ public MetricMetadata(String name, @Nullable String help, @Nullable Unit unit) {
    * <p>The name may contain any Unicode chars. Use {@link #getPrometheusName()} to get the name in
    * legacy Prometheus format, i.e. with all dots and all invalid chars replaced by underscores.
    */
+  @StableApi
   public String getName() {
     return name;
   }
@@ -75,24 +244,64 @@ public String getName() {
    *
    * <p>This is used by Prometheus exposition formats.
    */
+  @StableApi
   public String getPrometheusName() {
     return prometheusName;
   }
 
+  /**
+   * The original name as provided by the user, before any modification. For example, if the user
+   * called {@code Counter.builder().name("req").unit(BYTES)}, this returns "req" while {@link
+   * #getName()} returns "req_bytes" and {@link #getExpositionBaseName()} returns "req_bytes".
+   */
+  @StableApi
+  public String getOriginalName() {
+    return originalName;
+  }
+
+  /**
+   * The base name for exposition, with unit suffix ensured and type suffix preserved. For example,
+   * if the user called {@code Counter.builder().name("events_total")}, this returns "events_total"
+   * while {@link #getName()} returns "events".
+   */
+  @StableApi
+  public String getExpositionBaseName() {
+    return expositionBaseName;
+  }
+
+  /**
+   * Same as {@link #getExpositionBaseName()} but with all invalid characters and dots replaced by
+   * underscores.
+   */
+  @StableApi
+  public String getExpositionBasePrometheusName() {
+    return expositionBasePrometheusName;
+  }
+
+  @StableApi
   @Nullable
   public String getHelp() {
     return help;
   }
 
+  @StableApi
   public boolean hasUnit() {
     return unit != null;
   }
 
+  @StableApi
   @Nullable
   public Unit getUnit() {
     return unit;
   }
 
+  private static String appendUnitIfMissing(String name, @Nullable Unit unit) {
+    if (unit != null && !name.endsWith("_" + unit) && !name.endsWith("." + unit)) {
+      return name + "_" + unit;
+    }
+    return name;
+  }
+
   private void validate() {
     if (name == null) {
       throw new IllegalArgumentException("Missing required field: name is null");
@@ -125,6 +334,12 @@ private void validate() {
   }
 
   MetricMetadata escape(EscapingScheme escapingScheme) {
-    return new MetricMetadata(PrometheusNaming.escapeName(name, escapingScheme), help, unit);
+    return MetricMetadata.builder()
+        .name(PrometheusNaming.escapeName(name, escapingScheme))
+        .expositionBaseName(PrometheusNaming.escapeName(expositionBaseName, escapingScheme))
+        .originalName(PrometheusNaming.escapeName(originalName, escapingScheme))
+        .help(help)
+        .unit(unit)
+        .build();
   }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadataSupport.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadataSupport.java
new file mode 100644
index 000000000..978f56d43
--- /dev/null
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricMetadataSupport.java
@@ -0,0 +1,53 @@
+package io.prometheus.metrics.model.snapshots;
+
+import javax.annotation.Nullable;
+
+final class MetricMetadataSupport {
+
+  private MetricMetadataSupport() {}
+
+  static MetricMetadata metricMetadata(String name, @Nullable String help, @Nullable Unit unit) {
+    return new MetricMetadata(name, help, unit);
+  }
+
+  static MetricMetadata counterMetadata(String name, @Nullable String help, @Nullable Unit unit) {
+    return typedMetadata(name, help, unit, "_total", ".total");
+  }
+
+  static MetricMetadata infoMetadata(String name, @Nullable String help) {
+    return typedMetadata(name, help, null, "_info", ".info");
+  }
+
+  private static MetricMetadata typedMetadata(
+      String originalName,
+      @Nullable String help,
+      @Nullable Unit unit,
+      String suffix,
+      String dotSuffix) {
+    String baseName = stripSuffix(originalName, suffix, dotSuffix);
+    return MetricMetadata.builder()
+        .name(appendUnitIfMissing(baseName, unit))
+        .expositionBaseName(appendUnitIfMissing(originalName, unit))
+        .originalName(originalName)
+        .help(help)
+        .unit(unit)
+        .build();
+  }
+
+  private static String appendUnitIfMissing(String name, @Nullable Unit unit) {
+    if (unit != null && !name.endsWith("_" + unit) && !name.endsWith("." + unit)) {
+      return name + "_" + unit;
+    }
+    return name;
+  }
+
+  private static String stripSuffix(String name, String suffix, String dotSuffix) {
+    if (name.endsWith(suffix)) {
+      return name.substring(0, name.length() - suffix.length());
+    }
+    if (name.endsWith(dotSuffix)) {
+      return name.substring(0, name.length() - dotSuffix.length());
+    }
+    return name;
+  }
+}
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshot.java
index 4dac2e30e..5a2019c06 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshot.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -9,6 +10,7 @@
 import javax.annotation.Nullable;
 
 /** Base class for metric snapshots. */
+@StableApi
 public abstract class MetricSnapshot {
   private final MetricMetadata metadata;
   protected final List<? extends DataPointSnapshot> dataPoints;
@@ -55,9 +57,9 @@ private static <T extends DataPointSnapshot> void validateLabels(
 
   public abstract static class Builder<T extends Builder<T>> {
 
-    @Nullable private String name;
-    @Nullable private String help;
-    @Nullable private Unit unit;
+    @Nullable protected String name;
+    @Nullable protected String help;
+    @Nullable protected Unit unit;
 
     /**
      * The name is required. If the name is missing or invalid, {@code build()} will throw an {@link
@@ -85,7 +87,7 @@ protected MetricMetadata buildMetadata() {
       if (name == null) {
         throw new IllegalArgumentException("Missing required field: name is null");
       }
-      return new MetricMetadata(name, help, unit);
+      return MetricMetadataSupport.metricMetadata(name, help, unit);
     }
 
     protected abstract T self();
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshots.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshots.java
index ecee897e4..c4d7101df 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshots.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/MetricSnapshots.java
@@ -4,6 +4,7 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Comparator.comparing;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -14,6 +15,7 @@
 import java.util.stream.Stream;
 
 /** Immutable list of metric snapshots. */
+@StableApi
 public class MetricSnapshots implements Iterable<MetricSnapshot> {
 
   private final List<MetricSnapshot> snapshots;
@@ -28,23 +30,46 @@ public MetricSnapshots(MetricSnapshot... snapshots) {
    * #builder()}.
    *
    * @param snapshots the constructor creates a sorted copy of snapshots.
-   * @throws IllegalArgumentException if snapshots contains duplicate metric names. To avoid
-   *     duplicate metric names use {@link #builder()} and check {@link
-   *     Builder#containsMetricName(String)} before calling {@link
-   *     Builder#metricSnapshot(MetricSnapshot)}.
+   * @throws IllegalArgumentException if snapshots contain conflicting metric types (same name but
+   *     different metric types like Counter vs Gauge), or if two HistogramSnapshots share a name
+   *     but differ in gauge histogram vs classic histogram.
    */
   public MetricSnapshots(Collection<MetricSnapshot> snapshots) {
     List<MetricSnapshot> list = new ArrayList<>(snapshots);
     list.sort(comparing(s -> s.getMetadata().getPrometheusName()));
-    for (int i = 0; i < snapshots.size() - 1; i++) {
-      if (list.get(i)
-          .getMetadata()
-          .getPrometheusName()
-          .equals(list.get(i + 1).getMetadata().getPrometheusName())) {
-        throw new IllegalArgumentException(
-            list.get(i).getMetadata().getPrometheusName() + ": duplicate metric name");
+
+    // Validate no conflicting metric types
+    for (int i = 0; i < list.size() - 1; i++) {
+      String name1 = list.get(i).getMetadata().getPrometheusName();
+      String name2 = list.get(i + 1).getMetadata().getPrometheusName();
+
+      if (name1.equals(name2)) {
+        MetricSnapshot s1 = list.get(i);
+        MetricSnapshot s2 = list.get(i + 1);
+        Class<?> type1 = s1.getClass();
+        Class<?> type2 = s2.getClass();
+
+        if (!type1.equals(type2)) {
+          throw new IllegalArgumentException(
+              name1
+                  + ": conflicting metric types: "
+                  + type1.getSimpleName()
+                  + " and "
+                  + type2.getSimpleName());
+        }
+
+        // HistogramSnapshot: gauge histogram vs classic histogram are semantically different
+        if (s1 instanceof HistogramSnapshot) {
+          HistogramSnapshot h1 = (HistogramSnapshot) s1;
+          HistogramSnapshot h2 = (HistogramSnapshot) s2;
+          if (h1.isGaugeHistogram() != h2.isGaugeHistogram()) {
+            throw new IllegalArgumentException(
+                name1 + ": conflicting histogram types: gauge histogram and classic histogram");
+          }
+        }
       }
     }
+
     this.snapshots = unmodifiableList(list);
   }
 
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucket.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucket.java
index 9e58af18f..8278bfa2f 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucket.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucket.java
@@ -1,6 +1,9 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 /** For iterating over {@link NativeHistogramBuckets}. */
+@StableApi
 public class NativeHistogramBucket {
 
   private final int bucketIndex;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBuckets.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBuckets.java
index 3b1214364..9468f41cb 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBuckets.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/NativeHistogramBuckets.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -19,6 +20,7 @@
  *     upper bound = base^index
  * </pre>
  */
+@StableApi
 public class NativeHistogramBuckets implements Iterable<NativeHistogramBucket> {
 
   public static final NativeHistogramBuckets EMPTY =
@@ -107,25 +109,16 @@ private static void sortAndValidate(int[] bucketIndexes, long[] counts) {
     validate(bucketIndexes, counts);
   }
 
+  /**
+   * Sorts bucketIndexes and counts in place using introspective quicksort.
+   *
+   * <p>Algorithm: 3-way quicksort with insertion sort for tiny partitions and heapsort fallback at
+   * the recursion depth limit. Parallel arrays are swapped in lockstep.
+   *
+   * <p>Complexity: O(n log n) average and worst case.
+   */
   private static void sort(int[] bucketIndexes, long[] counts) {
-    // Bubblesort. Should be efficient here as in most cases bucketIndexes is already sorted.
-    int n = bucketIndexes.length;
-    for (int i = 0; i < n - 1; i++) {
-      for (int j = 0; j < n - i - 1; j++) {
-        if (bucketIndexes[j] > bucketIndexes[j + 1]) {
-          swap(j, j + 1, bucketIndexes, counts);
-        }
-      }
-    }
-  }
-
-  private static void swap(int i, int j, int[] bucketIndexes, long[] counts) {
-    int tmpInt = bucketIndexes[j];
-    bucketIndexes[j] = bucketIndexes[i];
-    bucketIndexes[i] = tmpInt;
-    long tmpLong = counts[j];
-    counts[j] = counts[i];
-    counts[i] = tmpLong;
+    IntArraySorter.sort(bucketIndexes, counts);
   }
 
   private static void validate(int[] bucketIndexes, long[] counts) {
@@ -166,4 +159,156 @@ public NativeHistogramBuckets build() {
       return NativeHistogramBuckets.of(bucketIndexes, counts);
     }
   }
+
+  /**
+   * In-place introsort for {@code bucketIndexes} and parallel {@code counts}.
+   *
+   * <p>Uses 3-way quicksort partitioning for large ranges, insertion sort for tiny ranges, and a
+   * heapsort fallback at the recursion-depth limit to guarantee O(n log n) worst-case complexity.
+   */
+  private static final class IntArraySorter {
+
+    private static final int INSERTION_SORT_THRESHOLD = 24;
+
+    private static void sort(int[] bucketIndexes, long[] counts) {
+      int right = bucketIndexes.length - 1;
+      if (right <= 0) {
+        return;
+      }
+      introSort(bucketIndexes, counts, 0, right, depthLimit(bucketIndexes.length));
+    }
+
+    private static void introSort(
+        int[] bucketIndexes, long[] counts, int left, int right, int depthLimit) {
+      while (left < right) {
+        if (right - left + 1 <= INSERTION_SORT_THRESHOLD) {
+          insertionSort(bucketIndexes, counts, left, right);
+          return;
+        }
+        if (depthLimit == 0) {
+          heapSort(bucketIndexes, counts, left, right);
+          return;
+        }
+        depthLimit--;
+
+        int mid = left + ((right - left) >>> 1);
+        int pivotIndex = medianOf3(bucketIndexes, left, mid, right);
+        int pivot = bucketIndexes[pivotIndex];
+
+        int lt = left;
+        int i = left;
+        int gt = right;
+        while (i <= gt) {
+          int cmp = compare(bucketIndexes[i], pivot);
+          if (cmp < 0) {
+            swap(i, lt, bucketIndexes, counts);
+            i++;
+            lt++;
+          } else if (cmp > 0) {
+            swap(i, gt, bucketIndexes, counts);
+            gt--;
+          } else {
+            i++;
+          }
+        }
+
+        if (lt - left < right - gt) {
+          introSort(bucketIndexes, counts, left, lt - 1, depthLimit);
+          left = gt + 1;
+        } else {
+          introSort(bucketIndexes, counts, gt + 1, right, depthLimit);
+          right = lt - 1;
+        }
+      }
+    }
+
+    private static void insertionSort(int[] bucketIndexes, long[] counts, int left, int right) {
+      for (int i = left + 1; i <= right; i++) {
+        int bucketIndex = bucketIndexes[i];
+        long count = counts[i];
+        int j = i - 1;
+        while (j >= left && compare(bucketIndexes[j], bucketIndex) > 0) {
+          bucketIndexes[j + 1] = bucketIndexes[j];
+          counts[j + 1] = counts[j];
+          j--;
+        }
+        bucketIndexes[j + 1] = bucketIndex;
+        counts[j + 1] = count;
+      }
+    }
+
+    private static void heapSort(int[] bucketIndexes, long[] counts, int left, int right) {
+      int size = right - left + 1;
+      for (int i = (size >>> 1) - 1; i >= 0; i--) {
+        siftDown(bucketIndexes, counts, left, i, size);
+      }
+      for (int end = size - 1; end > 0; end--) {
+        swap(left, left + end, bucketIndexes, counts);
+        siftDown(bucketIndexes, counts, left, 0, end);
+      }
+    }
+
+    private static void siftDown(int[] bucketIndexes, long[] counts, int base, int root, int size) {
+      while (true) {
+        int child = (root << 1) + 1;
+        if (child >= size) {
+          return;
+        }
+        int rightChild = child + 1;
+        if (rightChild < size
+            && compare(bucketIndexes[base + child], bucketIndexes[base + rightChild]) < 0) {
+          child = rightChild;
+        }
+        if (compare(bucketIndexes[base + root], bucketIndexes[base + child]) >= 0) {
+          return;
+        }
+        swap(base + root, base + child, bucketIndexes, counts);
+        root = child;
+      }
+    }
+
+    private static int depthLimit(int length) {
+      int result = 0;
+      while (length > 1) {
+        result++;
+        length >>>= 1;
+      }
+      return result << 1;
+    }
+
+    private static int medianOf3(int[] bucketIndexes, int i, int j, int k) {
+      if (compare(bucketIndexes[i], bucketIndexes[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      if (compare(bucketIndexes[j], bucketIndexes[k]) > 0) {
+        int tmp = j;
+        j = k;
+        k = tmp;
+      }
+      if (compare(bucketIndexes[i], bucketIndexes[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      return j;
+    }
+
+    private static int compare(int a, int b) {
+      return Integer.compare(a, b);
+    }
+
+    private static void swap(int i, int j, int[] bucketIndexes, long[] counts) {
+      if (i == j) {
+        return;
+      }
+      int bucketIndex = bucketIndexes[i];
+      bucketIndexes[i] = bucketIndexes[j];
+      bucketIndexes[j] = bucketIndex;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/PrometheusNaming.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/PrometheusNaming.java
index 71de5d0b4..f8f281dfc 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/PrometheusNaming.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/PrometheusNaming.java
@@ -4,6 +4,7 @@
 import static java.lang.Character.MAX_LOW_SURROGATE;
 import static java.lang.Character.MIN_HIGH_SURROGATE;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.nio.charset.StandardCharsets;
 import javax.annotation.Nullable;
@@ -15,41 +16,31 @@
  * replaced with underscores in Prometheus exposition formats. However, if metrics are exposed in
  * OpenTelemetry format the dots are retained.
  */
+@StableApi
 public class PrometheusNaming {
 
   /**
-   * According to OpenMetrics {@code _count} and {@code _sum} (and {@code _gcount}, {@code _gsum})
-   * should also be reserved metric name suffixes. However, popular instrumentation libraries have
-   * Gauges with names ending in {@code _count}. Examples:
-   *
-   * <ul>
-   *   <li>Micrometer: {@code jvm_buffer_count}
-   *   <li>OpenTelemetry: {@code process_runtime_jvm_buffer_count}
-   * </ul>
-   *
-   * We do not treat {@code _count} and {@code _sum} as reserved suffixes here for compatibility
-   * with these libraries. However, there is a risk of name conflict if someone creates a gauge
-   * named {@code my_data_count} and a histogram or summary named {@code my_data}, because the
-   * histogram or summary will implicitly have a sample named {@code my_data_count}.
+   * Reserved metric name suffixes. These suffixes are automatically appended by Prometheus
+   * exposition format writers for specific metric types: {@code _total} and {@code _created} for
+   * counters, {@code _info} for info metrics, and {@code _bucket} for histograms. Including these
+   * in a base metric name via {@link #sanitizeMetricName(String)} would cause confusion or
+   * double-suffixing, so they are stripped during sanitization.
    */
-  private static final String[] RESERVED_METRIC_NAME_SUFFIXES = {
-    "_total", "_created", "_bucket", "_info",
-    ".total", ".created", ".bucket", ".info"
+  static final String[] RESERVED_METRIC_NAME_SUFFIXES = {
+    "_total", "_created", "_bucket", "_info", ".total", ".created", ".bucket", ".info"
   };
 
   /**
-   * Test if a metric name is valid. Rules:
+   * Test if a metric name is valid. Any non-empty valid UTF-8 string is accepted.
    *
-   * <ul>
-   *   <li>The name must match <a
-   *       href="https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels">Metric
-   *       names</a>.
-   *   <li>The name MUST NOT end with one of the {@link #RESERVED_METRIC_NAME_SUFFIXES}.
-   * </ul>
+   * <p>Collision detection for suffixes like {@code _total}, {@code _info}, {@code _bucket}, etc.
+   * is handled at registration time by the {@link
+   * io.prometheus.metrics.model.registry.PrometheusRegistry PrometheusRegistry}, not by name
+   * validation.
    *
-   * If a metric has a {@link Unit}, the metric name SHOULD end with the unit as a suffix. Note that
-   * <a href="https://openmetrics.io/">OpenMetrics</a> requires metric names to have their unit as
-   * suffix, and we implement this in {@code prometheus-metrics-core}. However, {@code
+   * <p>If a metric has a {@link Unit}, the metric name SHOULD end with the unit as a suffix. Note
+   * that <a href="https://openmetrics.io/">OpenMetrics</a> requires metric names to have their unit
+   * as suffix, and we implement this in {@code prometheus-metrics-core}. However, {@code
    * prometheus-metrics-model} does not enforce Unit suffixes.
    *
    * <p>Example: If you create a Counter for a processing time with Unit {@link Unit#SECONDS
@@ -57,7 +48,9 @@ public class PrometheusNaming {
    * format, this will be represented as two values: {@code processing_time_seconds_total} for the
    * counter value, and the optional {@code processing_time_seconds_created} timestamp.
    *
-   * <p>Use {@link #sanitizeMetricName(String)} to convert arbitrary Strings to valid metric names.
+   * <p>Use {@link #sanitizeMetricName(String)} for compatibility-preserving sanitization that
+   * strips reserved suffixes, or {@link #normalizeMetricName(String)} for permissive normalization
+   * that keeps the original suffixes intact.
    */
   public static boolean isValidMetricName(String name) {
     return validateMetricName(name) == null;
@@ -70,11 +63,6 @@ public static boolean isValidMetricName(String name) {
    */
   @Nullable
   public static String validateMetricName(String name) {
-    for (String reservedSuffix : RESERVED_METRIC_NAME_SUFFIXES) {
-      if (name.endsWith(reservedSuffix)) {
-        return "The metric name must not include the '" + reservedSuffix + "' suffix.";
-      }
-    }
     if (isValidUtf8(name)) {
       return null;
     }
@@ -141,10 +129,7 @@ public static boolean isValidLegacyLabelName(String name) {
     return true;
   }
 
-  /**
-   * Units may not have illegal characters, and they may not end with a reserved suffix like
-   * 'total'.
-   */
+  /** Units may not have illegal characters. */
   public static boolean isValidUnitName(String name) {
     return validateUnitName(name) == null;
   }
@@ -155,12 +140,6 @@ public static String validateUnitName(String name) {
     if (name.isEmpty()) {
       return "The unit name must not be empty.";
     }
-    for (String reservedSuffix : RESERVED_METRIC_NAME_SUFFIXES) {
-      String suffixName = reservedSuffix.substring(1);
-      if (name.endsWith(suffixName)) {
-        return suffixName + " is a reserved suffix in Prometheus";
-      }
-    }
     // Check if all characters are [a-zA-Z0-9_.:]+
     for (int i = 0; i < name.length(); i++) {
       char c = name.charAt(i);
@@ -189,27 +168,46 @@ public static String prometheusName(String name) {
   }
 
   /**
-   * Convert an arbitrary string to a name where {@link #isValidMetricName(String)
-   * isValidMetricName(name)} is true.
+   * Convert an arbitrary string to a valid metric name.
+   *
+   * <p>Reserved metric name suffixes ({@code _total}, {@code _created}, {@code _bucket}, {@code
+   * _info} and their dot variants) are stripped. These suffixes are appended automatically by
+   * Prometheus exposition format writers, so including them in a base metric name would result in
+   * double-suffixing or unintended type inference. For example, a JMX attribute named {@code
+   * RequestTotal} would be sanitized from {@code kafka_consumer_request_total} to {@code
+   * kafka_consumer_request}, and the counter writer would add {@code _total} back at scrape time.
+   *
+   * <p>This behaviour was present in client_java 1.5.x and is restored here to fix a regression
+   * introduced in 1.6.0 that affected downstream tools (e.g. the JMX Exporter and the simpleclient
+   * bridge) which relied on {@code sanitizeMetricName} to strip these suffixes before passing names
+   * to the snapshot builders.
+   *
+   * <p>If you want permissive normalization that keeps reserved suffixes intact, use {@link
+   * #normalizeMetricName(String)} instead.
+   *
+   * @throws IllegalArgumentException if the input is empty
    */
   public static String sanitizeMetricName(String metricName) {
     if (metricName.isEmpty()) {
       throw new IllegalArgumentException("Cannot convert an empty string to a valid metric name.");
     }
     String sanitizedName = metricName;
-    boolean modified = true;
-    while (modified) {
-      modified = false;
+    boolean stripped = true;
+    while (stripped) {
+      stripped = false;
+      // When the name equals the suffix exactly, drop the leading separator character to avoid
+      // returning an empty string (e.g. "_total" → "total", ".info" → "info").
       for (String reservedSuffix : RESERVED_METRIC_NAME_SUFFIXES) {
         if (sanitizedName.equals(reservedSuffix)) {
-          // This is for the corner case when you call sanitizeMetricName("_total").
-          // In that case the result will be "total".
           return reservedSuffix.substring(1);
         }
+      }
+      for (String reservedSuffix : RESERVED_METRIC_NAME_SUFFIXES) {
         if (sanitizedName.endsWith(reservedSuffix)) {
           sanitizedName =
               sanitizedName.substring(0, sanitizedName.length() - reservedSuffix.length());
-          modified = true;
+          stripped = true;
+          break; // restart the outer loop to re-check all suffixes on the shortened name
         }
       }
     }
@@ -230,6 +228,37 @@ public static String sanitizeMetricName(String metricName, Unit unit) {
     return result;
   }
 
+  /**
+   * Convert an arbitrary string to a valid metric name without stripping reserved suffixes.
+   *
+   * <p>Any non-empty valid UTF-8 string is accepted and returned unchanged. This is the permissive
+   * normalization behavior introduced in 1.6.0. Use this method for new integrations that want to
+   * preserve the original metric name and rely on registration-time collision detection instead of
+   * suffix stripping.
+   *
+   * @throws IllegalArgumentException if the input is empty
+   */
+  public static String normalizeMetricName(String metricName) {
+    if (metricName.isEmpty()) {
+      throw new IllegalArgumentException("Cannot convert an empty string to a valid metric name.");
+    }
+    return metricName;
+  }
+
+  /**
+   * Like {@link #normalizeMetricName(String)}, but also makes sure that the unit is appended as a
+   * suffix if the unit is not {@code null}.
+   */
+  public static String normalizeMetricName(String metricName, Unit unit) {
+    String result = normalizeMetricName(metricName);
+    if (unit != null) {
+      if (!result.endsWith("_" + unit) && !result.endsWith("." + unit)) {
+        result += "_" + unit;
+      }
+    }
+    return result;
+  }
+
   /**
    * Convert an arbitrary string to a name where {@link #isValidLabelName(String)
    * isValidLabelName(name)} is true.
@@ -249,11 +278,10 @@ public static String sanitizeLabelName(String labelName) {
   }
 
   /**
-   * Convert an arbitrary string to a name where {@link #validateUnitName(String)} is {@code null}
-   * (i.e. the name is valid).
+   * Convert an arbitrary string to a valid unit name by replacing illegal characters.
    *
-   * @throws IllegalArgumentException if the {@code unitName} cannot be converted, for example if
-   *     you call {@code sanitizeUnitName("total")} or {@code sanitizeUnitName("")}.
+   * @throws IllegalArgumentException if the {@code unitName} cannot be converted, e.g. if you call
+   *     {@code sanitizeUnitName("")}.
    * @throws NullPointerException if {@code unitName} is null.
    */
   public static String sanitizeUnitName(String unitName) {
@@ -261,24 +289,11 @@ public static String sanitizeUnitName(String unitName) {
       throw new IllegalArgumentException("Cannot convert an empty string to a valid unit name.");
     }
     String sanitizedName = replaceIllegalCharsInUnitName(unitName);
-    boolean modified = true;
-    while (modified) {
-      modified = false;
-      while (sanitizedName.startsWith("_") || sanitizedName.startsWith(".")) {
-        sanitizedName = sanitizedName.substring(1);
-        modified = true;
-      }
-      while (sanitizedName.endsWith(".") || sanitizedName.endsWith("_")) {
-        sanitizedName = sanitizedName.substring(0, sanitizedName.length() - 1);
-        modified = true;
-      }
-      for (String reservedSuffix : RESERVED_METRIC_NAME_SUFFIXES) {
-        String suffixName = reservedSuffix.substring(1);
-        if (sanitizedName.endsWith(suffixName)) {
-          sanitizedName = sanitizedName.substring(0, sanitizedName.length() - suffixName.length());
-          modified = true;
-        }
-      }
+    while (sanitizedName.startsWith("_") || sanitizedName.startsWith(".")) {
+      sanitizedName = sanitizedName.substring(1);
+    }
+    while (sanitizedName.endsWith(".") || sanitizedName.endsWith("_")) {
+      sanitizedName = sanitizedName.substring(0, sanitizedName.length() - 1);
     }
     if (sanitizedName.isEmpty()) {
       throw new IllegalArgumentException(
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantile.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantile.java
index 1601920f0..8bc28ae95 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantile.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantile.java
@@ -1,6 +1,9 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
+
 /** Immutable representation of a Quantile. */
+@StableApi
 public class Quantile {
 
   private final double quantile;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantiles.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantiles.java
index 34a9bc048..8d93c5b4d 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantiles.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Quantiles.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -8,6 +9,7 @@
 import java.util.List;
 
 /** Immutable list of quantiles. */
+@StableApi
 public class Quantiles implements Iterable<Quantile> {
 
   private final List<Quantile> quantiles;
@@ -15,7 +17,7 @@ public class Quantiles implements Iterable<Quantile> {
 
   private Quantiles(List<Quantile> quantiles) {
     quantiles = new ArrayList<>(quantiles);
-    quantiles.sort(Comparator.comparing(Quantile::getQuantile));
+    quantiles.sort(Comparator.comparingDouble(Quantile::getQuantile));
     this.quantiles = Collections.unmodifiableList(quantiles);
     validate();
   }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SnapshotEscaper.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SnapshotEscaper.java
index 422b36ee0..b8c887f01 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SnapshotEscaper.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SnapshotEscaper.java
@@ -96,6 +96,43 @@ public static String getMetadataName(MetricMetadata metadata, EscapingScheme sch
     }
   }
 
+  public static String getExpositionBaseMetadataName(
+      MetricMetadata metadata, EscapingScheme scheme) {
+    if (scheme == EscapingScheme.UNDERSCORE_ESCAPING) {
+      return metadata.getExpositionBasePrometheusName();
+    } else {
+      return metadata.getExpositionBaseName();
+    }
+  }
+
+  public static String getOriginalMetadataName(MetricMetadata metadata, EscapingScheme scheme) {
+    if (scheme == EscapingScheme.UNDERSCORE_ESCAPING) {
+      return PrometheusNaming.prometheusName(metadata.getOriginalName());
+    } else {
+      return metadata.getOriginalName();
+    }
+  }
+
+  public static String getLegacyGaugeName(
+      MetricMetadata metadata, String rawOriginalName, EscapingScheme scheme) {
+    String legacyGaugeBaseName = stripLegacyGaugeSuffix(rawOriginalName);
+    if (legacyGaugeBaseName != null) {
+      return PrometheusNaming.escapeName(legacyGaugeBaseName, scheme);
+    }
+    return getMetadataName(metadata, scheme);
+  }
+
+  @Nullable
+  private static String stripLegacyGaugeSuffix(String rawOriginalName) {
+    if (rawOriginalName.endsWith(".created")) {
+      return rawOriginalName.substring(0, rawOriginalName.length() - ".created".length());
+    }
+    if (rawOriginalName.endsWith(".total")) {
+      return rawOriginalName.substring(0, rawOriginalName.length() - ".total".length());
+    }
+    return null;
+  }
+
   public static Labels escapeLabels(Labels labels, EscapingScheme scheme) {
     Labels.Builder outLabelsBuilder = Labels.builder();
 
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/StateSetSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/StateSetSnapshot.java
index 7ca7f36d1..d07308683 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/StateSetSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/StateSetSnapshot.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,6 +12,7 @@
 import javax.annotation.Nullable;
 
 /** Immutable snapshot of a StateSet metric. */
+@StableApi
 public final class StateSetSnapshot extends MetricSnapshot {
 
   /**
@@ -164,25 +166,16 @@ public Stream<State> stream() {
       return asList().stream();
     }
 
+    /**
+     * Sorts names and values in place using introspective quicksort.
+     *
+     * <p>Algorithm: 3-way quicksort with insertion sort for tiny partitions and heapsort fallback
+     * at the recursion depth limit. Parallel arrays are swapped in lockstep.
+     *
+     * <p>Complexity: O(n log n) average and worst case.
+     */
     private static void sort(String[] names, boolean[] values) {
-      // Bubblesort
-      int n = names.length;
-      for (int i = 0; i < n - 1; i++) {
-        for (int j = 0; j < n - i - 1; j++) {
-          if (names[j].compareTo(names[j + 1]) > 0) {
-            swap(j, j + 1, names, values);
-          }
-        }
-      }
-    }
-
-    private static void swap(int i, int j, String[] names, boolean[] values) {
-      String tmpName = names[j];
-      names[j] = names[i];
-      names[i] = tmpName;
-      boolean tmpValue = values[j];
-      values[j] = values[i];
-      values[i] = tmpValue;
+      StringBooleanArraySorter.sort(names, values);
     }
 
     public static Builder builder() {
@@ -268,4 +261,155 @@ protected Builder self() {
       return this;
     }
   }
+
+  /**
+   * In-place introsort for state {@code names} and parallel boolean {@code values}.
+   *
+   * <p>Uses 3-way quicksort partitioning for large ranges, insertion sort for tiny ranges, and a
+   * heapsort fallback at the recursion-depth limit to guarantee O(n log n) worst-case complexity.
+   */
+  private static final class StringBooleanArraySorter {
+
+    private static final int INSERTION_SORT_THRESHOLD = 24;
+
+    private static void sort(String[] names, boolean[] values) {
+      int right = names.length - 1;
+      if (right <= 0) {
+        return;
+      }
+      introSort(names, values, 0, right, depthLimit(names.length));
+    }
+
+    private static void introSort(
+        String[] names, boolean[] values, int left, int right, int depthLimit) {
+      while (left < right) {
+        if (right - left + 1 <= INSERTION_SORT_THRESHOLD) {
+          insertionSort(names, values, left, right);
+          return;
+        }
+        if (depthLimit == 0) {
+          heapSort(names, values, left, right);
+          return;
+        }
+        depthLimit--;
+
+        int mid = left + ((right - left) >>> 1);
+        int pivotIndex = medianOf3(names, left, mid, right);
+        String pivot = names[pivotIndex];
+
+        int lt = left;
+        int i = left;
+        int gt = right;
+        while (i <= gt) {
+          int cmp = compare(names[i], pivot);
+          if (cmp < 0) {
+            swap(i, lt, names, values);
+            i++;
+            lt++;
+          } else if (cmp > 0) {
+            swap(i, gt, names, values);
+            gt--;
+          } else {
+            i++;
+          }
+        }
+
+        if (lt - left < right - gt) {
+          introSort(names, values, left, lt - 1, depthLimit);
+          left = gt + 1;
+        } else {
+          introSort(names, values, gt + 1, right, depthLimit);
+          right = lt - 1;
+        }
+      }
+    }
+
+    private static void insertionSort(String[] names, boolean[] values, int left, int right) {
+      for (int i = left + 1; i <= right; i++) {
+        String name = names[i];
+        boolean value = values[i];
+        int j = i - 1;
+        while (j >= left && compare(names[j], name) > 0) {
+          names[j + 1] = names[j];
+          values[j + 1] = values[j];
+          j--;
+        }
+        names[j + 1] = name;
+        values[j + 1] = value;
+      }
+    }
+
+    private static void heapSort(String[] names, boolean[] values, int left, int right) {
+      int size = right - left + 1;
+      for (int i = (size >>> 1) - 1; i >= 0; i--) {
+        siftDown(names, values, left, i, size);
+      }
+      for (int end = size - 1; end > 0; end--) {
+        swap(left, left + end, names, values);
+        siftDown(names, values, left, 0, end);
+      }
+    }
+
+    private static void siftDown(String[] names, boolean[] values, int base, int root, int size) {
+      while (true) {
+        int child = (root << 1) + 1;
+        if (child >= size) {
+          return;
+        }
+        int rightChild = child + 1;
+        if (rightChild < size && compare(names[base + child], names[base + rightChild]) < 0) {
+          child = rightChild;
+        }
+        if (compare(names[base + root], names[base + child]) >= 0) {
+          return;
+        }
+        swap(base + root, base + child, names, values);
+        root = child;
+      }
+    }
+
+    private static int depthLimit(int length) {
+      int result = 0;
+      while (length > 1) {
+        result++;
+        length >>>= 1;
+      }
+      return result << 1;
+    }
+
+    private static int medianOf3(String[] names, int i, int j, int k) {
+      if (compare(names[i], names[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      if (compare(names[j], names[k]) > 0) {
+        int tmp = j;
+        j = k;
+        k = tmp;
+      }
+      if (compare(names[i], names[j]) > 0) {
+        int tmp = i;
+        i = j;
+        j = tmp;
+      }
+      return j;
+    }
+
+    private static int compare(String left, String right) {
+      return left.compareTo(right);
+    }
+
+    private static void swap(int i, int j, String[] names, boolean[] values) {
+      if (i == j) {
+        return;
+      }
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      boolean value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SummarySnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SummarySnapshot.java
index 1b8dbc2e9..e7203882c 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SummarySnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/SummarySnapshot.java
@@ -1,11 +1,13 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
 /** Immutable snapshot of a Summary metric. */
+@StableApi
 public final class SummarySnapshot extends MetricSnapshot {
 
   /**
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Unit.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Unit.java
index 31a9524e7..818f14416 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Unit.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/Unit.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import java.util.Objects;
 
 /**
@@ -9,9 +10,10 @@
  *     new Unit("myUnit");
  * </pre>
  *
- * Note that in Prometheus, units are largely based on SI base units (seconds, bytes, joules, grams,
- * meters, ratio, volts, amperes, and Celsius).
+ * <p>Note that in Prometheus, units are largely based on SI base units (seconds, bytes, joules,
+ * grams, meters, ratio, volts, amperes, and Celsius).
  */
+@StableApi
 public final class Unit {
 
   private final String name;
diff --git a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/UnknownSnapshot.java b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/UnknownSnapshot.java
index 09574d6cd..66e09abe0 100644
--- a/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/UnknownSnapshot.java
+++ b/prometheus-metrics-model/src/main/java/io/prometheus/metrics/model/snapshots/UnknownSnapshot.java
@@ -1,5 +1,6 @@
 package io.prometheus.metrics.model.snapshots;
 
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.EscapingScheme;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -7,6 +8,7 @@
 import javax.annotation.Nullable;
 
 /** Immutable snapshot of an Unknown (Untyped) metric. */
+@StableApi
 public final class UnknownSnapshot extends MetricSnapshot {
 
   /**
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MetricNameFilterTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MetricNameFilterTest.java
index 0dc9cdee1..8f554bdc5 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MetricNameFilterTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MetricNameFilterTest.java
@@ -13,7 +13,7 @@ class MetricNameFilterTest {
   private final PrometheusRegistry registry = new PrometheusRegistry();
 
   @Test
-  public void testCounter() {
+  void testCounter() {
     registry.register(
         () ->
             CounterSnapshot.builder()
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MultiCollectorNameFilterTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MultiCollectorNameFilterTest.java
index d2a38c3cf..46ba39a2b 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MultiCollectorNameFilterTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/MultiCollectorNameFilterTest.java
@@ -13,6 +13,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("deprecation")
 class MultiCollectorNameFilterTest {
 
   private static class Registry extends PrometheusRegistry {
@@ -51,7 +52,7 @@ private boolean collectCalled() {
   }
 
   @Test
-  public void testPartialFilter() {
+  void testPartialFilter() {
     Registry registry = new Registry(Collections.emptyList());
     MetricSnapshots snapshots = registry.scrape(name -> name.equals("counter_1"));
     assertThat(registry.collectCalled()).isTrue();
@@ -60,7 +61,7 @@ public void testPartialFilter() {
   }
 
   @Test
-  public void testPartialFilterWithPrometheusNames() {
+  void testPartialFilterWithPrometheusNames() {
     Registry registry = new Registry(Arrays.asList("counter_1", "gauge_2"));
 
     MetricSnapshots snapshots = registry.scrape(name -> name.equals("counter_1"));
@@ -70,7 +71,7 @@ public void testPartialFilterWithPrometheusNames() {
   }
 
   @Test
-  public void testCompleteFilter_CollectCalled() {
+  void testCompleteFilter_CollectCalled() {
     Registry registry = new Registry(Collections.emptyList());
     MetricSnapshots snapshots =
         registry.scrape(name -> !name.equals("counter_1") && !name.equals("gauge_2"));
@@ -79,7 +80,7 @@ public void testCompleteFilter_CollectCalled() {
   }
 
   @Test
-  public void testCompleteFilter_CollectNotCalled() {
+  void testCompleteFilter_CollectNotCalled() {
     Registry registry = new Registry(Arrays.asList("counter_1", "gauge_2"));
     MetricSnapshots snapshots =
         registry.scrape(name -> !name.equals("counter_1") && !name.equals("gauge_2"));
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/OpenTelemetryExporterRegistryCompatibilityTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/OpenTelemetryExporterRegistryCompatibilityTest.java
new file mode 100644
index 000000000..3142fabe8
--- /dev/null
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/OpenTelemetryExporterRegistryCompatibilityTest.java
@@ -0,0 +1,117 @@
+package io.prometheus.metrics.model.registry;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import io.prometheus.metrics.model.snapshots.CounterSnapshot;
+import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests that use the Prometheus registry in the same way as the OpenTelemetry Java SDK Prometheus
+ * exporter ({@code io.opentelemetry.exporter.prometheus}). The SDK's {@code PrometheusMetricReader}
+ * implements {@link MultiCollector} with default implementations for all optional methods: {@link
+ * MultiCollector#getPrometheusNames()} returns an empty list, and {@link
+ * MultiCollector#getMetricType(String)}, {@link MultiCollector#getLabelNames(String)}, and {@link
+ * MultiCollector#getMetadata(String)} return null. This test suite ensures that registration,
+ * scrape, and unregister continue to work for that usage pattern and that a shared registry with
+ * both SDK-style and validated collectors behaves correctly.
+ */
+@SuppressWarnings("deprecation")
+class OpenTelemetryExporterRegistryCompatibilityTest {
+
+  /**
+   * A MultiCollector that mimics the OpenTelemetry Java SDK's PrometheusMetricReader: it does not
+   * override getPrometheusNames() (empty list), getMetricType(String), getLabelNames(String), or
+   * getMetadata(String) (all null). Only collect() is implemented and returns MetricSnapshots.
+   */
+  private static final MultiCollector OTEL_STYLE_MULTI_COLLECTOR =
+      new MultiCollector() {
+        @Override
+        public MetricSnapshots collect() {
+          return new MetricSnapshots(
+              CounterSnapshot.builder()
+                  .name("otel_metric")
+                  .help("A metric produced by an OTel-style converter")
+                  .dataPoint(CounterSnapshot.CounterDataPointSnapshot.builder().value(42.0).build())
+                  .build());
+        }
+      };
+
+  @Test
+  void registerOtelStyleMultiCollector_succeeds() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    assertThatCode(() -> registry.register(OTEL_STYLE_MULTI_COLLECTOR)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void scrape_afterRegisteringOtelStyleMultiCollector_returnsSnapshotsFromCollector() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+    registry.register(OTEL_STYLE_MULTI_COLLECTOR);
+
+    MetricSnapshots snapshots = registry.scrape();
+
+    assertThat(snapshots).hasSize(1);
+    MetricSnapshot snapshot = snapshots.get(0);
+    assertThat(snapshot.getMetadata().getPrometheusName()).isEqualTo("otel_metric");
+  }
+
+  @Test
+  void unregisterOtelStyleMultiCollector_succeedsAndScrapeNoLongerIncludesIt() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+    registry.register(OTEL_STYLE_MULTI_COLLECTOR);
+
+    assertThat(registry.scrape()).hasSize(1);
+
+    assertThatCode(() -> registry.unregister(OTEL_STYLE_MULTI_COLLECTOR))
+        .doesNotThrowAnyException();
+
+    assertThat(registry.scrape()).isEmpty();
+  }
+
+  @Test
+  void sharedRegistry_otelStyleMultiCollectorAndValidatedCollector_bothParticipateInScrape() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector validatedCollector =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("app_gauge").help("App gauge").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "app_gauge";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+
+          @Override
+          public java.util.Set<String> getLabelNames() {
+            return Collections.emptySet();
+          }
+        };
+
+    registry.register(validatedCollector);
+    registry.register(OTEL_STYLE_MULTI_COLLECTOR);
+
+    MetricSnapshots snapshots = registry.scrape();
+
+    assertThat(snapshots).hasSize(2);
+    assertThat(snapshots)
+        .extracting(s -> s.getMetadata().getPrometheusName())
+        .containsExactlyInAnyOrder("app_gauge", "otel_metric");
+
+    registry.unregister(OTEL_STYLE_MULTI_COLLECTOR);
+    assertThat(registry.scrape()).hasSize(1);
+    assertThat(registry.scrape().get(0).getMetadata().getPrometheusName()).isEqualTo("app_gauge");
+  }
+}
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java
index 9e87f1fc9..5e33f0a44 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/registry/PrometheusRegistryTest.java
@@ -1,17 +1,23 @@
 package io.prometheus.metrics.model.registry;
 
+import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import io.prometheus.metrics.model.snapshots.CounterSnapshot;
 import io.prometheus.metrics.model.snapshots.GaugeSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricFamilyDescriptor;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
 import io.prometheus.metrics.model.snapshots.MetricSnapshot;
 import io.prometheus.metrics.model.snapshots.MetricSnapshots;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("deprecation")
 class PrometheusRegistryTest {
 
   Collector noName = () -> GaugeSnapshot.builder().name("no_name_gauge").build();
@@ -77,34 +83,509 @@ public MetricSnapshots collect() {
 
         @Override
         public List<String> getPrometheusNames() {
-          return Arrays.asList(gaugeA.getPrometheusName(), counterB.getPrometheusName());
+          return Arrays.asList("gauge_a", "counter_b");
         }
       };
 
   @Test
-  public void registerNoName() {
+  void register_sameInstanceTwice_notAllowed() {
     PrometheusRegistry registry = new PrometheusRegistry();
-    // If the collector does not have a name at registration time, there is no conflict during
-    // registration.
-    registry.register(noName);
+
     registry.register(noName);
-    // However, at scrape time the collector has to provide a metric name, and then we'll get a
-    // duplicate name error.
-    assertThatCode(registry::scrape)
-        .hasMessageContaining("duplicate")
-        .hasMessageContaining("no_name_gauge");
+
+    assertThatThrownBy(() -> registry.register(noName))
+        .hasMessageContaining("Collector instance is already registered");
   }
 
   @Test
-  public void registerDuplicateName() {
+  void register_duplicateName_differentTypes_notAllowed() {
     PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counterA1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("counter_a").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "counter_a";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+        };
+
+    Collector gaugeA1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("counter_a").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "counter_a";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+        };
+
     registry.register(counterA1);
-    assertThatExceptionOfType(IllegalStateException.class)
-        .isThrownBy(() -> registry.register(counterA2));
+
+    assertThatThrownBy(() -> registry.register(gaugeA1))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Conflicting metric types");
+  }
+
+  @Test
+  void register_sameName_sameType_differentLabelSchemas_allowed() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counterWithPathLabel =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    Collector counterWithRegionLabel =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("region"));
+          }
+        };
+
+    // Both collectors have same name and type, but different label schemas
+    // This should succeed
+    registry.register(counterWithPathLabel);
+    assertThatCode(() -> registry.register(counterWithRegionLabel)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void register_sameName_sameType_sameLabelSchema_notAllowed() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counter1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    Collector counter2 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    registry.register(counter1);
+
+    // Second collector has same name, type, and label schema - should fail
+    assertThatThrownBy(() -> registry.register(counter2))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("duplicate metric name with identical label schema");
   }
 
   @Test
-  public void registerOk() {
+  void register_duplicateLabelSchema_rollsBackCollectorOnFailure() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counter1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("http_requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "http_requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    Collector counter2 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("http_requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "http_requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    registry.register(counter1);
+
+    // Second collector has same name and label schema - registration fails during metadata
+    // validation. The failed collector must be rolled back (not present in the registry).
+    assertThatThrownBy(() -> registry.register(counter2))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("duplicate metric name with identical label schema");
+
+    // Only the first collector should be in the registry; counter2 was removed on rollback.
+    assertThat(registry.scrape().size()).isEqualTo(1);
+  }
+
+  @Test
+  void register_metadataValidationFailure_rollsBackLabelSchema() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counterWithHelpOne =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "First help", null);
+          }
+        };
+
+    Collector counterWithHelpTwo =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("status"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "Second help", null);
+          }
+        };
+
+    Collector counterWithCorrectHelp =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("status"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "First help", null);
+          }
+        };
+
+    registry.register(counterWithHelpOne);
+
+    // Second collector has conflicting help - should fail and roll back its label schema
+    assertThatThrownBy(() -> registry.register(counterWithHelpTwo))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Conflicting help strings");
+
+    // Third collector has same label schema as second (which failed), but correct help.
+    // If label schema wasn't rolled back, this would fail with "duplicate label schema".
+    // If rollback worked, this should succeed.
+    assertThatCode(() -> registry.register(counterWithCorrectHelp)).doesNotThrowAnyException();
+
+    // Verify both collectors are in the registry
+    assertThat(registry.scrape().size()).isEqualTo(2);
+  }
+
+  @Test
+  void register_nullType_skipsValidation() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    // Collectors without getMetricType() skip registration-time validation.
+    // This allows legacy collectors to work without implementing all getters.
+    Collector legacyCollector1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("legacy_metric").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "legacy_metric";
+          }
+        };
+
+    Collector legacyCollector2 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("legacy_metric").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "legacy_metric";
+          }
+        };
+
+    // Both collectors can register successfully since validation is skipped
+    assertThatCode(() -> registry.register(legacyCollector1)).doesNotThrowAnyException();
+    assertThatCode(() -> registry.register(legacyCollector2)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void register_metricFamilyDescriptor_usedForValidation() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counter =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public MetricFamilyDescriptor getMetricFamilyDescriptor() {
+            return MetricFamilyDescriptor.counter("requests_total").labelName("path").build();
+          }
+        };
+
+    Collector gauge =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public MetricFamilyDescriptor getMetricFamilyDescriptor() {
+            return MetricFamilyDescriptor.gauge("requests").labelName("path").build();
+          }
+        };
+
+    registry.register(counter);
+
+    assertThatThrownBy(() -> registry.register(gauge))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Conflicting metric types");
+  }
+
+  @Test
+  void register_multiCollector_metricFamilyDescriptorsUsedForValidation() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    MultiCollector multiCollector =
+        new MultiCollector() {
+          @Override
+          public MetricSnapshots collect() {
+            return new MetricSnapshots(CounterSnapshot.builder().name("requests_total").build());
+          }
+
+          @Override
+          public List<MetricFamilyDescriptor> getMetricFamilyDescriptors() {
+            return asList(
+                MetricFamilyDescriptor.counter("requests_total").labelName("path").build());
+          }
+        };
+
+    Collector duplicate =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public MetricFamilyDescriptor getMetricFamilyDescriptor() {
+            return MetricFamilyDescriptor.counter("requests_total").labelName("path").build();
+          }
+        };
+
+    registry.register(multiCollector);
+
+    assertThatThrownBy(() -> registry.register(duplicate))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("identical label schema");
+  }
+
+  @Test
+  void register_multiCollector_withTypeValidation() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counter =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("shared_metric").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "shared_metric";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+        };
+
+    MultiCollector multiWithGauge =
+        new MultiCollector() {
+          @Override
+          public MetricSnapshots collect() {
+            return new MetricSnapshots(GaugeSnapshot.builder().name("shared_metric").build());
+          }
+
+          @Override
+          public List<String> getPrometheusNames() {
+            return asList("shared_metric");
+          }
+
+          @Override
+          public MetricType getMetricType(String prometheusName) {
+            return MetricType.GAUGE;
+          }
+        };
+
+    registry.register(counter);
+
+    // MultiCollector tries to register a Gauge with the same name as existing Counter
+    assertThatThrownBy(() -> registry.register(multiWithGauge))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Conflicting metric types");
+  }
+
+  @Test
+  void registerOk() {
     PrometheusRegistry registry = new PrometheusRegistry();
     registry.register(counterA1);
     registry.register(counterB);
@@ -122,15 +603,17 @@ public void registerOk() {
   }
 
   @Test
-  public void registerDuplicateMultiCollector() {
+  void registerDuplicateMultiCollector() {
     PrometheusRegistry registry = new PrometheusRegistry();
     registry.register(multiCollector);
-    assertThatExceptionOfType(IllegalStateException.class)
-        .isThrownBy(() -> registry.register(multiCollector));
+    // Registering the same instance twice should fail
+    assertThatThrownBy(() -> registry.register(multiCollector))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("already registered");
   }
 
   @Test
-  public void registerOkMultiCollector() {
+  void registerOkMultiCollector() {
     PrometheusRegistry registry = new PrometheusRegistry();
     registry.register(multiCollector);
     MetricSnapshots snapshots = registry.scrape();
@@ -142,7 +625,7 @@ public void registerOkMultiCollector() {
   }
 
   @Test
-  public void clearOk() {
+  void clearOk() {
     PrometheusRegistry registry = new PrometheusRegistry();
     registry.register(counterA1);
     registry.register(counterB);
@@ -152,4 +635,722 @@ public void clearOk() {
     registry.clear();
     assertThat(registry.scrape().size()).isZero();
   }
+
+  @Test
+  void unregister_shouldRemoveLabelSchemaFromRegistrationInfo() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counterWithPathLabel =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    Collector counterWithRegionLabel =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("region"));
+          }
+        };
+
+    Collector counterWithPathLabelAgain =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path", "status"));
+          }
+        };
+
+    registry.register(counterWithPathLabel);
+    registry.register(counterWithRegionLabel);
+
+    registry.unregister(counterWithPathLabel);
+
+    assertThatCode(() -> registry.register(counterWithPathLabelAgain)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void register_withEmptyLabelSets_shouldDetectDuplicates() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector collector1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+
+          // getLabelNames() returns null by default
+        };
+
+    // Register another collector with same name and type, also no labels
+    Collector collector2 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+
+          // getLabelNames() returns null by default
+        };
+
+    registry.register(collector1);
+
+    assertThatThrownBy(() -> registry.register(collector2))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("duplicate metric name with identical label schema");
+  }
+
+  @Test
+  void register_withMixedNullAndEmptyLabelSets_shouldDetectDuplicates() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector collector1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>();
+          }
+        };
+
+    Collector collector2 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+
+          // getLabelNames() returns null by default
+        };
+
+    registry.register(collector1);
+
+    // null and empty should be treated the same
+    assertThatThrownBy(() -> registry.register(collector2))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("duplicate metric name with identical label schema");
+  }
+
+  @Test
+  void register_sameName_differentHelp_notAllowed() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector withHelpOne =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").help("First help").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "First help", null);
+          }
+        };
+
+    Collector withHelpTwo =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").help("Second help").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("status"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "Second help", null);
+          }
+        };
+
+    registry.register(withHelpOne);
+    assertThatThrownBy(() -> registry.register(withHelpTwo))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Conflicting help strings");
+  }
+
+  @Test
+  void register_sameName_nullVsNonNullHelp_notAllowed() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector withHelp =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").help("Total requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "Total requests", null);
+          }
+        };
+
+    Collector withoutHelp =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("status"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", null, null);
+          }
+        };
+
+    registry.register(withHelp);
+    assertThatThrownBy(() -> registry.register(withoutHelp))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("Conflicting help strings");
+  }
+
+  @Test
+  void register_sameName_sameHelpAndUnit_allowed() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector withPath =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").help("Total requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "Total requests", null);
+          }
+        };
+
+    Collector withStatus =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").help("Total requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("status"));
+          }
+
+          @Override
+          public MetricMetadata getMetadata() {
+            return new MetricMetadata("requests", "Total requests", null);
+          }
+        };
+
+    registry.register(withPath);
+    assertThatCode(() -> registry.register(withStatus)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void unregister_lastCollector_removesPrometheusName() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counter1 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("path"));
+          }
+        };
+
+    Collector counter2 =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+
+          @Override
+          public Set<String> getLabelNames() {
+            return new HashSet<>(asList("status"));
+          }
+        };
+
+    registry.register(counter1);
+    registry.register(counter2);
+
+    // Unregister first collector - name should still be registered
+    registry.unregister(counter1);
+    MetricSnapshots snapshots = registry.scrape();
+    assertThat(snapshots.size()).isEqualTo(1);
+
+    // Unregister second collector - name should be removed
+    registry.unregister(counter2);
+    snapshots = registry.scrape();
+    assertThat(snapshots.size()).isEqualTo(0);
+
+    // Should be able to register again with same name
+    assertThatCode(() -> registry.register(counter1)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void unregister_multiCollector_removesAllLabelSchemas() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    MultiCollector multi =
+        new MultiCollector() {
+          @Override
+          public MetricSnapshots collect() {
+            return new MetricSnapshots(
+                CounterSnapshot.builder().name("requests").build(),
+                GaugeSnapshot.builder().name("connections").build());
+          }
+
+          @Override
+          public List<String> getPrometheusNames() {
+            return asList("requests", "connections");
+          }
+
+          @Override
+          public MetricType getMetricType(String prometheusName) {
+            return prometheusName.equals("requests") ? MetricType.COUNTER : MetricType.GAUGE;
+          }
+        };
+
+    registry.register(multi);
+    assertThat(registry.scrape().size()).isEqualTo(2);
+
+    registry.unregister(multi);
+    assertThat(registry.scrape().size()).isEqualTo(0);
+
+    // Should be able to register collectors with same names again
+    Collector counter =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("requests").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "requests";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+        };
+
+    assertThatCode(() -> registry.register(counter)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void unregister_legacyCollector_noErrors() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector legacy =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("legacy_metric").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "legacy_metric";
+          }
+          // No getMetricType() - returns null
+        };
+
+    registry.register(legacy);
+    assertThat(registry.scrape().size()).isEqualTo(1);
+
+    // Unregister should work without errors even for legacy collectors
+    assertThatCode(() -> registry.unregister(legacy)).doesNotThrowAnyException();
+    assertThat(registry.scrape().size()).isEqualTo(0);
+  }
+
+  @Test
+  void register_gaugeWithTotalSuffix_andCounter_collisionDetected() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    // Register a counter "events" — this claims exposition name "events_total"
+    Collector counter =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("events").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "events";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+        };
+
+    // Register a gauge "events_total" — this claims exposition name "events_total"
+    Collector gauge =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("events_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "events_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+        };
+
+    registry.register(counter);
+    assertThatThrownBy(() -> registry.register(gauge))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("conflicting exposition name");
+  }
+
+  @Test
+  void register_gaugeWithCountSuffix_andHistogram_collisionDetected() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector histogram =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("foo").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "foo";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.HISTOGRAM;
+          }
+        };
+
+    Collector gauge =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("foo_count").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "foo_count";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+        };
+
+    registry.register(histogram);
+    assertThatThrownBy(() -> registry.register(gauge))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessageContaining("conflicting exposition name");
+  }
+
+  @Test
+  void register_gaugeWithTotalSuffix_andHistogram_noCollision() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    // Histogram "foo" claims: foo_bucket, foo_count, foo_sum, foo_created
+    // Gauge "foo_total" claims: foo_total
+    // No overlap — should succeed.
+    Collector histogram =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("foo").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "foo";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.HISTOGRAM;
+          }
+        };
+
+    Collector gauge =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("foo_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "foo_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+        };
+
+    registry.register(histogram);
+    assertThatCode(() -> registry.register(gauge)).doesNotThrowAnyException();
+  }
+
+  @Test
+  void register_expositionCollision_unregisterAndReregister() {
+    PrometheusRegistry registry = new PrometheusRegistry();
+
+    Collector counter =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return CounterSnapshot.builder().name("events").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "events";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.COUNTER;
+          }
+        };
+
+    Collector gauge =
+        new Collector() {
+          @Override
+          public MetricSnapshot collect() {
+            return GaugeSnapshot.builder().name("events_total").build();
+          }
+
+          @Override
+          public String getPrometheusName() {
+            return "events_total";
+          }
+
+          @Override
+          public MetricType getMetricType() {
+            return MetricType.GAUGE;
+          }
+        };
+
+    registry.register(counter);
+    assertThatThrownBy(() -> registry.register(gauge)).isInstanceOf(IllegalArgumentException.class);
+
+    // After unregistering the counter, the gauge should succeed
+    registry.unregister(counter);
+    assertThatCode(() -> registry.register(gauge)).doesNotThrowAnyException();
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucketsTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucketsTest.java
index d39b32436..574ed0720 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucketsTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ClassicHistogramBucketsTest.java
@@ -3,15 +3,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Random;
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 
 class ClassicHistogramBucketsTest {
 
   @Test
-  public void testGoodCase() {
+  void testGoodCase() {
     ClassicHistogramBuckets buckets =
         ClassicHistogramBuckets.builder()
             .bucket(Double.NEGATIVE_INFINITY, 0)
@@ -23,7 +26,7 @@ public void testGoodCase() {
   }
 
   @Test
-  public void testSort() {
+  void testSort() {
     ClassicHistogramBuckets buckets =
         ClassicHistogramBuckets.builder()
             .bucket(7, 2)
@@ -40,21 +43,21 @@ public void testSort() {
   }
 
   @Test
-  public void testMinimalBuckets() {
+  void testMinimalBuckets() {
     ClassicHistogramBuckets buckets =
         ClassicHistogramBuckets.builder().bucket(Double.POSITIVE_INFINITY, 0).build();
     assertThat(buckets.size()).isOne();
   }
 
   @Test
-  public void testInfBucketMissing() {
+  void testInfBucketMissing() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () -> ClassicHistogramBuckets.builder().bucket(Double.NEGATIVE_INFINITY, 0).build());
   }
 
   @Test
-  public void testNegativeCount() {
+  void testNegativeCount() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -65,7 +68,7 @@ public void testNegativeCount() {
   }
 
   @Test
-  public void testNaNBoundary() {
+  void testNaNBoundary() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -77,7 +80,7 @@ public void testNaNBoundary() {
   }
 
   @Test
-  public void testDuplicateBoundary() {
+  void testDuplicateBoundary() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -90,13 +93,13 @@ public void testDuplicateBoundary() {
   }
 
   @Test
-  public void testEmptyBuckets() {
+  void testEmptyBuckets() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> ClassicHistogramBuckets.builder().build());
   }
 
   @Test
-  public void testDifferentLength() {
+  void testDifferentLength() {
     double[] upperBounds = new double[] {0.7, 1.3, Double.POSITIVE_INFINITY};
     long[] counts = new long[] {13, 178, 1024, 3000};
     assertThatExceptionOfType(IllegalArgumentException.class)
@@ -104,7 +107,7 @@ public void testDifferentLength() {
   }
 
   @Test
-  public void testImmutable() {
+  void testImmutable() {
     ClassicHistogramBuckets buckets =
         ClassicHistogramBuckets.builder()
             .bucket(1.0, 7)
@@ -117,7 +120,7 @@ public void testImmutable() {
   }
 
   @Test
-  public void compare() {
+  void compare() {
     ClassicHistogramBuckets buckets =
         ClassicHistogramBuckets.builder()
             .bucket(1.0, 7)
@@ -127,4 +130,109 @@ public void compare() {
     List<ClassicHistogramBucket> list = buckets.stream().collect(Collectors.toList());
     assertThat(list.get(0)).isNotEqualByComparingTo(list.get(1));
   }
+
+  @Test
+  void testSortSmallInputMaintainsPairs() {
+    int size = 5;
+    double[] upperBounds = new double[size];
+    long[] counts = new long[size];
+    Map<Double, Long> expectedCounts = new HashMap<>();
+    for (int i = 0; i < size - 1; i++) {
+      upperBounds[i] = i + 0.5;
+      counts[i] = 100L + i;
+      expectedCounts.put(upperBounds[i], counts[i]);
+    }
+    upperBounds[size - 1] = Double.POSITIVE_INFINITY;
+    counts[size - 1] = 200L;
+    expectedCounts.put(upperBounds[size - 1], counts[size - 1]);
+
+    Random random = new Random(10L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      double upperBound = upperBounds[i];
+      upperBounds[i] = upperBounds[j];
+      upperBounds[j] = upperBound;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+
+    ClassicHistogramBuckets buckets = ClassicHistogramBuckets.of(upperBounds, counts);
+    for (int i = 1; i < buckets.size(); i++) {
+      assertThat(buckets.getUpperBound(i - 1)).isLessThan(buckets.getUpperBound(i));
+    }
+    for (int i = 0; i < buckets.size(); i++) {
+      assertThat(buckets.getCount(i)).isEqualTo(expectedCounts.get(buckets.getUpperBound(i)));
+    }
+  }
+
+  @Test
+  void testSortMediumInputMaintainsPairs() {
+    int size = 25;
+    double[] upperBounds = new double[size];
+    long[] counts = new long[size];
+    Map<Double, Long> expectedCounts = new HashMap<>();
+    for (int i = 0; i < size - 1; i++) {
+      upperBounds[i] = i + 0.125;
+      counts[i] = 1000L + i;
+      expectedCounts.put(upperBounds[i], counts[i]);
+    }
+    upperBounds[size - 1] = Double.POSITIVE_INFINITY;
+    counts[size - 1] = 2000L;
+    expectedCounts.put(upperBounds[size - 1], counts[size - 1]);
+
+    Random random = new Random(11L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      double upperBound = upperBounds[i];
+      upperBounds[i] = upperBounds[j];
+      upperBounds[j] = upperBound;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+
+    ClassicHistogramBuckets buckets = ClassicHistogramBuckets.of(upperBounds, counts);
+    for (int i = 1; i < buckets.size(); i++) {
+      assertThat(buckets.getUpperBound(i - 1)).isLessThan(buckets.getUpperBound(i));
+    }
+    for (int i = 0; i < buckets.size(); i++) {
+      assertThat(buckets.getCount(i)).isEqualTo(expectedCounts.get(buckets.getUpperBound(i)));
+    }
+  }
+
+  @Test
+  void testSortLargeInputMaintainsPairs() {
+    int size = 64;
+    double[] upperBounds = new double[size];
+    long[] counts = new long[size];
+    Map<Double, Long> expectedCounts = new HashMap<>();
+    for (int i = 0; i < size - 1; i++) {
+      upperBounds[i] = i + 0.125;
+      counts[i] = 1000L + i;
+      expectedCounts.put(upperBounds[i], counts[i]);
+    }
+    upperBounds[size - 1] = Double.POSITIVE_INFINITY;
+    counts[size - 1] = 2000L;
+    expectedCounts.put(upperBounds[size - 1], counts[size - 1]);
+
+    Random random = new Random(1L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      double upperBound = upperBounds[i];
+      upperBounds[i] = upperBounds[j];
+      upperBounds[j] = upperBound;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+
+    ClassicHistogramBuckets buckets = ClassicHistogramBuckets.of(upperBounds, counts);
+    for (int i = 1; i < buckets.size(); i++) {
+      assertThat(buckets.getUpperBound(i - 1)).isLessThan(buckets.getUpperBound(i));
+    }
+    for (int i = 0; i < buckets.size(); i++) {
+      assertThat(buckets.getCount(i)).isEqualTo(expectedCounts.get(buckets.getUpperBound(i)));
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/CounterSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/CounterSnapshotTest.java
index a69ccfbab..af6060e65 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/CounterSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/CounterSnapshotTest.java
@@ -11,7 +11,7 @@
 class CounterSnapshotTest {
 
   @Test
-  public void testCompleteGoodCase() {
+  void testCompleteGoodCase() {
     long createdTimestamp1 = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
     long createdTimestamp2 = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(2);
     long exemplarTimestamp = System.currentTimeMillis();
@@ -68,13 +68,14 @@ public void testCompleteGoodCase() {
   }
 
   @Test
-  public void testMinimalGoodCase() {
+  void testMinimalGoodCase() {
     CounterSnapshot snapshot =
         CounterSnapshot.builder()
             .name("events")
             .dataPoint(CounterDataPointSnapshot.builder().value(1.0).build())
             .build();
     SnapshotTestUtil.assertMetadata(snapshot, "events", null, null);
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "events", "events", "events");
     assertThat(snapshot.getDataPoints()).hasSize(1);
     CounterDataPointSnapshot data = snapshot.getDataPoints().get(0);
     assertThat((Iterable<? extends Label>) data.getLabels()).isEmpty();
@@ -85,25 +86,38 @@ public void testMinimalGoodCase() {
   }
 
   @Test
-  public void testEmptyCounter() {
+  void testEmptyCounter() {
     CounterSnapshot snapshot = CounterSnapshot.builder().name("events").build();
     assertThat(snapshot.getDataPoints()).isEmpty();
   }
 
   @Test
-  public void testTotalSuffixPresent() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> CounterSnapshot.builder().name("test_total").build());
+  void testTotalSuffixPresent() {
+    CounterSnapshot snapshot = CounterSnapshot.builder().name("test_total").build();
+    // Counter snapshots derive the internal metadata name without the _total suffix; the exposition
+    // base name keeps the literal original name that will still be used at the wire level.
+    assertThat(snapshot.getMetadata().getPrometheusName()).isEqualTo("test");
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "test", "test_total", "test_total");
+  }
+
+  @Test
+  void testCounterUnitDerivedFromTypedBuilder() {
+    CounterSnapshot snapshot =
+        CounterSnapshot.builder().name("test_total").unit(Unit.SECONDS).build();
+
+    SnapshotTestUtil.assertMetadata(snapshot, "test_seconds", null, "seconds");
+    SnapshotTestUtil.assertDerivedMetadata(
+        snapshot, "test_seconds", "test_total_seconds", "test_total");
   }
 
   @Test
-  public void testValueMissing() {
+  void testValueMissing() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> CounterDataPointSnapshot.builder().build());
   }
 
   @Test
-  public void testDataImmutable() {
+  void testDataImmutable() {
     CounterSnapshot snapshot =
         CounterSnapshot.builder()
             .name("events")
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarTest.java
index 4a40b47ef..db7ad2426 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarTest.java
@@ -9,7 +9,7 @@
 class ExemplarTest {
 
   @Test
-  public void testGoodCaseComplete() {
+  void testGoodCaseComplete() {
     long timestamp = System.currentTimeMillis();
     Exemplar exemplar =
         Exemplar.builder()
@@ -36,13 +36,13 @@ public void testGoodCaseComplete() {
   }
 
   @Test
-  public void testValueMissing() {
+  void testValueMissing() {
     assertThatExceptionOfType(IllegalStateException.class)
         .isThrownBy(() -> Exemplar.builder().build());
   }
 
   @Test
-  public void testMinimal() {
+  void testMinimal() {
     Exemplar exemplar = Exemplar.builder().value(0.0).build();
     assertThat(exemplar.getValue()).isEqualTo(0.0);
     assertLabels(exemplar.getLabels()).isEqualTo(Labels.EMPTY);
@@ -50,7 +50,7 @@ public void testMinimal() {
   }
 
   @Test
-  public void testLabelsMergeTraceId() {
+  void testLabelsMergeTraceId() {
     Exemplar exemplar =
         Exemplar.builder().value(0.0).labels(Labels.of("a", "b")).traceId("abc").build();
     assertLabels(exemplar.getLabels()).isEqualTo(Labels.of("a", "b", "trace_id", "abc"));
@@ -61,14 +61,14 @@ private static IterableAssert<? extends Label> assertLabels(Labels labels) {
   }
 
   @Test
-  public void testLabelsMergeSpanId() {
+  void testLabelsMergeSpanId() {
     Exemplar exemplar =
         Exemplar.builder().value(0.0).labels(Labels.of("a", "b")).spanId("abc").build();
     assertLabels(exemplar.getLabels()).isEqualTo(Labels.of("a", "b", "span_id", "abc"));
   }
 
   @Test
-  public void testLabelsMergeTraceIdAndSpanId() {
+  void testLabelsMergeTraceIdAndSpanId() {
     Exemplar exemplar =
         Exemplar.builder()
             .value(0.0)
@@ -81,7 +81,7 @@ public void testLabelsMergeTraceIdAndSpanId() {
   }
 
   @Test
-  public void testLabelsMergeNone() {
+  void testLabelsMergeNone() {
     Exemplar exemplar = Exemplar.builder().value(0.0).labels(Labels.of("a", "b")).build();
     assertLabels(exemplar.getLabels()).isEqualTo(Labels.of("a", "b"));
   }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarsTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarsTest.java
index cd38342cd..605326ea7 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarsTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/ExemplarsTest.java
@@ -3,13 +3,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import java.util.Collections;
 import java.util.Iterator;
 import org.junit.jupiter.api.Test;
 
 class ExemplarsTest {
 
   @Test
-  public void testUpperBound() {
+  void testUpperBound() {
     Exemplars exemplars =
         Exemplars.of(
             Exemplar.builder().value(1.0).build(),
@@ -26,7 +27,7 @@ public void testUpperBound() {
   }
 
   @Test
-  public void testImmutable() {
+  void testImmutable() {
     Exemplars exemplars =
         Exemplars.of(
             Exemplar.builder().value(1.0).build(),
@@ -38,7 +39,7 @@ public void testImmutable() {
   }
 
   @Test
-  public void testGet() {
+  void testGet() {
     Exemplar oldest =
         Exemplar.builder().timestampMillis(System.currentTimeMillis() - 100).value(1.8).build();
     Exemplar middle =
@@ -53,4 +54,22 @@ public void testGet() {
 
     assertThat(exemplars.getLatest()).isSameAs(newest);
   }
+
+  @Test
+  void testEmptyReturnsSingleton() {
+    // Empty inputs short-circuit to the EMPTY singleton, avoiding allocations.
+    assertThat(Exemplars.of()).isSameAs(Exemplars.EMPTY);
+    assertThat(Exemplars.of(Collections.emptyList())).isSameAs(Exemplars.EMPTY);
+    assertThat(Exemplars.builder().build()).isSameAs(Exemplars.EMPTY);
+  }
+
+  @Test
+  void testEmptyIteratorIsSingleton() {
+    // Collections.emptyList().iterator() returns the JDK singleton empty iterator, so reading an
+    // empty Exemplars allocates no iterator.
+    assertThat(Exemplars.EMPTY.size()).isZero();
+    assertThat(Exemplars.EMPTY.iterator()).isSameAs(Collections.emptyIterator());
+    assertThat(Exemplars.EMPTY.get(0.0, Double.POSITIVE_INFINITY)).isNull();
+    assertThat(Exemplars.EMPTY.getLatest()).isNull();
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/GaugeSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/GaugeSnapshotTest.java
index c469647e0..6a68ebd88 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/GaugeSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/GaugeSnapshotTest.java
@@ -11,7 +11,7 @@
 class GaugeSnapshotTest {
 
   @Test
-  public void testCompleteGoodCase() {
+  void testCompleteGoodCase() {
     long exemplarTimestamp = System.currentTimeMillis();
     GaugeSnapshot snapshot =
         GaugeSnapshot.builder()
@@ -63,7 +63,7 @@ public void testCompleteGoodCase() {
   }
 
   @Test
-  public void testMinimalGoodCase() {
+  void testMinimalGoodCase() {
     GaugeSnapshot snapshot =
         GaugeSnapshot.builder()
             .name("temperature")
@@ -80,31 +80,33 @@ public void testMinimalGoodCase() {
   }
 
   @Test
-  public void testEmptyGauge() {
+  void testEmptyGauge() {
     GaugeSnapshot snapshot = GaugeSnapshot.builder().name("temperature").build();
     assertThat(snapshot.getDataPoints().size()).isZero();
   }
 
   @Test
-  public void testTotalSuffixPresent() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> CounterSnapshot.builder().name("test_total").build());
+  void testTotalSuffixPresent() {
+    GaugeSnapshot snapshot = GaugeSnapshot.builder().name("test_total").build();
+    assertThat(snapshot.getMetadata().getPrometheusName()).isEqualTo("test_total");
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "test_total", "test_total", "test_total");
   }
 
   @Test
-  public void testTotalSuffixPresentDot() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> CounterSnapshot.builder().name("test.total").build());
+  void testTotalSuffixPresentDot() {
+    GaugeSnapshot snapshot = GaugeSnapshot.builder().name("test.total").build();
+    assertThat(snapshot.getMetadata().getPrometheusName()).isEqualTo("test_total");
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "test.total", "test.total", "test.total");
   }
 
   @Test
-  public void testValueMissing() {
+  void testValueMissing() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> CounterDataPointSnapshot.builder().build());
   }
 
   @Test
-  public void testDataImmutable() {
+  void testDataImmutable() {
     GaugeSnapshot snapshot =
         GaugeSnapshot.builder()
             .name("gauge")
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/HistogramSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/HistogramSnapshotTest.java
index 54eefbe66..6233481df 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/HistogramSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/HistogramSnapshotTest.java
@@ -13,7 +13,7 @@
 class HistogramSnapshotTest {
 
   @Test
-  public void testGoodCaseComplete() {
+  void testGoodCaseComplete() {
     long createdTimestamp = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
     long scrapeTimestamp = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(2);
     long exemplarTimestamp = System.currentTimeMillis();
@@ -170,7 +170,7 @@ public void testGoodCaseComplete() {
   }
 
   @Test
-  public void testEmptyHistogram() {
+  void testEmptyHistogram() {
     assertThat(HistogramSnapshot.builder().name("empty_histogram").build().getDataPoints())
         .isEmpty();
     HistogramSnapshot snapshot =
@@ -181,7 +181,7 @@ public void testEmptyHistogram() {
   }
 
   @Test
-  public void testMinimalClassicHistogram() {
+  void testMinimalClassicHistogram() {
     HistogramSnapshot snapshot =
         HistogramSnapshot.builder()
             .name("minimal_histogram")
@@ -198,7 +198,7 @@ public void testMinimalClassicHistogram() {
   }
 
   @Test
-  public void testMinimalNativeHistogram() {
+  void testMinimalNativeHistogram() {
     HistogramSnapshot snapshot =
         HistogramSnapshot.builder()
             .name("hist")
@@ -218,7 +218,7 @@ public void testMinimalNativeHistogram() {
   }
 
   @Test
-  public void testClassicCount() {
+  void testClassicCount() {
     HistogramSnapshot snapshot =
         HistogramSnapshot.builder()
             .name("test_histogram")
@@ -239,21 +239,21 @@ public void testClassicCount() {
   }
 
   @Test
-  public void testEmptyData() {
+  void testEmptyData() {
     // This will fail because one of nativeSchema and classicHistogramBuckets is required
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> HistogramDataPointSnapshot.builder().build());
   }
 
   @Test
-  public void testEmptyNativeData() {
+  void testEmptyNativeData() {
     HistogramDataPointSnapshot data = HistogramDataPointSnapshot.builder().nativeSchema(5).build();
     assertThat(data.getNativeBucketsForNegativeValues().size()).isZero();
     assertThat(data.getNativeBucketsForPositiveValues().size()).isZero();
   }
 
   @Test
-  public void testDataImmutable() {
+  void testDataImmutable() {
     HistogramSnapshot snapshot =
         HistogramSnapshot.builder()
             .name("test_histogram")
@@ -278,7 +278,7 @@ public void testDataImmutable() {
   }
 
   @Test
-  public void testEmptyClassicBuckets() {
+  void testEmptyClassicBuckets() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -287,7 +287,7 @@ public void testEmptyClassicBuckets() {
   }
 
   @Test
-  public void testMinimalNativeData() {
+  void testMinimalNativeData() {
     new HistogramDataPointSnapshot(
         ClassicHistogramBuckets.EMPTY,
         0,
@@ -302,7 +302,7 @@ public void testMinimalNativeData() {
   }
 
   @Test
-  public void testMinimalClassicData() {
+  void testMinimalClassicData() {
     ClassicHistogramBuckets buckets =
         ClassicHistogramBuckets.builder().bucket(Double.POSITIVE_INFINITY, 0).build();
     new HistogramDataPointSnapshot(
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/InfoSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/InfoSnapshotTest.java
index 983450181..065041bc7 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/InfoSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/InfoSnapshotTest.java
@@ -9,7 +9,7 @@
 class InfoSnapshotTest {
 
   @Test
-  public void testCompleteGoodCase() {
+  void testCompleteGoodCase() {
     InfoSnapshot snapshot =
         InfoSnapshot.builder()
             .name("target")
@@ -19,7 +19,7 @@ public void testCompleteGoodCase() {
                     .labels(Labels.of("instance_id", "127.0.0.1:9100", "service_name", "gateway"))
                     .build())
             .build();
-    assertThat(snapshot.getMetadata().getName()).isEqualTo("target");
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "target", "target", "target");
     assertThat(snapshot.getMetadata().getHelp()).isEqualTo("Target info");
     assertThat(snapshot.getMetadata().hasUnit()).isFalse();
     assertThat(snapshot.getDataPoints().size()).isOne();
@@ -33,13 +33,13 @@ void create() {
   }
 
   @Test
-  public void testEmptyInfo() {
+  void testEmptyInfo() {
     InfoSnapshot snapshot = InfoSnapshot.builder().name("target").build();
     assertThat(snapshot.getDataPoints()).isEmpty();
   }
 
   @Test
-  public void testDataImmutable() {
+  void testDataImmutable() {
     InfoSnapshot snapshot =
         InfoSnapshot.builder()
             .name("target")
@@ -60,14 +60,16 @@ public void testDataImmutable() {
   }
 
   @Test
-  public void testNameMustNotIncludeSuffix() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> InfoSnapshot.builder().name("jvm_info").build());
+  void testNameMayIncludeSuffix() {
+    InfoSnapshot snapshot = InfoSnapshot.builder().name("jvm_info").build();
+    assertThat(snapshot.getMetadata().getPrometheusName()).isEqualTo("jvm");
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "jvm", "jvm_info", "jvm_info");
   }
 
   @Test
-  public void testNameMustNotIncludeSuffixDot() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> InfoSnapshot.builder().name("jvm.info").build());
+  void testNameMayIncludeSuffixDot() {
+    InfoSnapshot snapshot = InfoSnapshot.builder().name("jvm.info").build();
+    assertThat(snapshot.getMetadata().getPrometheusName()).isEqualTo("jvm");
+    SnapshotTestUtil.assertDerivedMetadata(snapshot, "jvm", "jvm.info", "jvm.info");
   }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/LabelsTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/LabelsTest.java
index 5bdd285e3..fcc881d25 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/LabelsTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/LabelsTest.java
@@ -3,6 +3,9 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
 import org.assertj.core.api.IterableAssert;
 import org.junit.jupiter.api.Test;
 
@@ -17,7 +20,7 @@ private <T extends Comparable<T>> void assertGreaterThan(T a, T b) {
   }
 
   @Test
-  public void testCompareDifferentLabelNames() {
+  void testCompareDifferentLabelNames() {
     Labels labels1 = Labels.of("env", "prod", "status2", "200");
     Labels labels2 = Labels.of("env", "prod", "status1", "200");
     assertGreaterThan(labels1, labels2);
@@ -31,7 +34,7 @@ private static IterableAssert<? extends Label> assertLabels(Labels labels) {
   }
 
   @Test
-  public void testCompareSameLabelNames() {
+  void testCompareSameLabelNames() {
     // If all label names are the same, labels should be sorted by label value.
     Labels labels1 = Labels.of("env", "prod", "status", "200");
     Labels labels2 = Labels.of("env", "prod", "status", "500");
@@ -42,7 +45,7 @@ public void testCompareSameLabelNames() {
   }
 
   @Test
-  public void testCompareDifferentNumberOfLabels() {
+  void testCompareDifferentNumberOfLabels() {
     Labels labels1 = Labels.of("env", "prod", "status", "200");
     Labels labels2 = Labels.of("env", "prod", "status", "200", "x_code", "none");
     assertLessThan(labels1, labels2);
@@ -52,14 +55,14 @@ public void testCompareDifferentNumberOfLabels() {
   }
 
   @Test
-  public void testComparePrometheusNames() {
+  void testComparePrometheusNames() {
     Labels labels1 = Labels.of("my_a", "val");
     Labels labels2 = Labels.of("my.b", "val");
     assertLessThan(labels1, labels2); // this is true because it compares "my_a" to "my_b".
   }
 
   @Test
-  public void testEqualsHashcodeDots() {
+  void testEqualsHashcodeDots() {
     Labels labels1 = Labels.of("my_a", "val");
     Labels labels2 = Labels.of("my.a", "val");
     assertLabels(labels2).isEqualTo(labels1).hasSameHashCodeAs(labels1);
@@ -67,7 +70,7 @@ public void testEqualsHashcodeDots() {
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   @Test
-  public void testCompareEquals() {
+  void testCompareEquals() {
     Labels labels1 = Labels.of("env", "prod", "status", "200");
     Labels labels2 = Labels.of("env", "prod", "status", "200");
     assertThat((Comparable) labels1).isEqualByComparingTo(labels2);
@@ -77,19 +80,19 @@ public void testCompareEquals() {
   }
 
   @Test
-  public void testReservedLabelName() {
+  void testReservedLabelName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Labels.of("__name__", "requests_total"));
   }
 
   @Test
-  public void testDuplicateLabelName() {
+  void testDuplicateLabelName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Labels.of("name1", "value1", "name2", "value2", "name1", "value3"));
   }
 
   @Test
-  public void testMakePrometheusNames() {
+  void testMakePrometheusNames() {
     String[] names = new String[] {};
     String[] prometheusNames = Labels.makePrometheusNames(names);
     assertThat(prometheusNames).isSameAs(names);
@@ -107,7 +110,7 @@ public void testMakePrometheusNames() {
   }
 
   @Test
-  public void testMerge() {
+  void testMerge() {
     Labels labels1 = Labels.of("key.1", "value 1", "key.3", "value 3");
     Labels labels2 = Labels.of("key_2", "value 2");
     Labels merged = labels2.merge(labels1);
@@ -117,7 +120,7 @@ public void testMerge() {
   }
 
   @Test
-  public void testMergeDuplicateName() {
+  void testMergeDuplicateName() {
     Labels labels1 = Labels.of("key_one", "v1");
     Labels labels2 = Labels.of("key.one", "v2");
     assertThatExceptionOfType(IllegalArgumentException.class)
@@ -125,8 +128,104 @@ public void testMergeDuplicateName() {
   }
 
   @Test
-  public void testDuplicateName() {
+  void testDuplicateName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> Labels.of("key_one", "v1", "key.one", "v2"));
   }
+
+  @Test
+  void testSortSmallInputMaintainsPairs() {
+    int size = 5;
+    String[] names = new String[size];
+    String[] values = new String[size];
+    Map<String, String> expectedValues = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      names[i] = i % 2 == 0 ? "even_" + i : "odd." + i;
+      values[i] = "value-" + i;
+      expectedValues.put(names[i], values[i]);
+    }
+
+    Random random = new Random(14L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      String value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+
+    Labels labels = Labels.of(names, values);
+    for (int i = 1; i < labels.size(); i++) {
+      assertThat(labels.getPrometheusName(i - 1)).isLessThan(labels.getPrometheusName(i));
+    }
+    for (int i = 0; i < labels.size(); i++) {
+      assertThat(labels.getValue(i)).isEqualTo(expectedValues.get(labels.getName(i)));
+    }
+  }
+
+  @Test
+  void testSortMediumInputMaintainsPairs() {
+    int size = 25;
+    String[] names = new String[size];
+    String[] values = new String[size];
+    Map<String, String> expectedValues = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      names[i] = i % 2 == 0 ? "even_" + i : "odd." + i;
+      values[i] = "value-" + i;
+      expectedValues.put(names[i], values[i]);
+    }
+
+    Random random = new Random(15L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      String value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+
+    Labels labels = Labels.of(names, values);
+    for (int i = 1; i < labels.size(); i++) {
+      assertThat(labels.getPrometheusName(i - 1)).isLessThan(labels.getPrometheusName(i));
+    }
+    for (int i = 0; i < labels.size(); i++) {
+      assertThat(labels.getValue(i)).isEqualTo(expectedValues.get(labels.getName(i)));
+    }
+  }
+
+  @Test
+  void testSortLargeInputMaintainsPairs() {
+    int size = 64;
+    String[] names = new String[size];
+    String[] values = new String[size];
+    Map<String, String> expectedValues = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      names[i] = i % 2 == 0 ? "even_" + i : "odd." + i;
+      values[i] = "value-" + i;
+      expectedValues.put(names[i], values[i]);
+    }
+
+    Random random = new Random(3L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      String value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+
+    Labels labels = Labels.of(names, values);
+    for (int i = 1; i < labels.size(); i++) {
+      assertThat(labels.getPrometheusName(i - 1)).isLessThan(labels.getPrometheusName(i));
+    }
+    for (int i = 0; i < labels.size(); i++) {
+      assertThat(labels.getValue(i)).isEqualTo(expectedValues.get(labels.getName(i)));
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricFamilyDescriptorTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricFamilyDescriptorTest.java
new file mode 100644
index 000000000..eca3ad163
--- /dev/null
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricFamilyDescriptorTest.java
@@ -0,0 +1,149 @@
+package io.prometheus.metrics.model.snapshots;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import io.prometheus.metrics.model.registry.MetricType;
+import java.util.Arrays;
+import org.junit.jupiter.api.Test;
+
+class MetricFamilyDescriptorTest {
+
+  @Test
+  void counterDescriptorDerivesMetadata() {
+    MetricFamilyDescriptor descriptor =
+        MetricFamilyDescriptor.counter("events_total")
+            .help("help")
+            .unit(Unit.SECONDS)
+            .labelNames(Arrays.asList("method.name", "status"))
+            .build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.COUNTER);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("events_seconds");
+    assertThat(descriptor.getLabelNames()).containsExactly("method_name", "status");
+    assertThat(descriptor.getMetadata().getName()).isEqualTo("events_seconds");
+    assertThat(descriptor.getMetadata().getExpositionBaseName()).isEqualTo("events_total_seconds");
+    assertThat(descriptor.getMetadata().getOriginalName()).isEqualTo("events_total");
+  }
+
+  @Test
+  void infoDescriptorDerivesMetadata() {
+    MetricFamilyDescriptor descriptor =
+        MetricFamilyDescriptor.info("jvm_info").help("JVM info").labelName("vendor").build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.INFO);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("jvm");
+    assertThat(descriptor.getLabelNames()).containsExactly("vendor");
+    assertThat(descriptor.getMetadata().getName()).isEqualTo("jvm");
+    assertThat(descriptor.getMetadata().getExpositionBaseName()).isEqualTo("jvm_info");
+    assertThat(descriptor.getMetadata().getOriginalName()).isEqualTo("jvm_info");
+  }
+
+  @Test
+  void gaugeDescriptorKeepsLiteralName() {
+    MetricFamilyDescriptor descriptor = MetricFamilyDescriptor.gauge("test_total").build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.GAUGE);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("test_total");
+    assertThat(descriptor.getMetadata().getExpositionBaseName()).isEqualTo("test_total");
+    assertThat(descriptor.getMetadata().getOriginalName()).isEqualTo("test_total");
+  }
+
+  @Test
+  void histogramDescriptorKeepsLiteralName() {
+    MetricFamilyDescriptor descriptor =
+        MetricFamilyDescriptor.histogram("request_duration_seconds")
+            .help("Request duration")
+            .labelName("method")
+            .build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.HISTOGRAM);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("request_duration_seconds");
+    assertThat(descriptor.getLabelNames()).containsExactly("method");
+  }
+
+  @Test
+  void summaryDescriptorKeepsLiteralName() {
+    MetricFamilyDescriptor descriptor =
+        MetricFamilyDescriptor.summary("request_size_bytes")
+            .help("Request size")
+            .labelName("method")
+            .build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.SUMMARY);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("request_size_bytes");
+    assertThat(descriptor.getLabelNames()).containsExactly("method");
+  }
+
+  @Test
+  void stateSetDescriptorKeepsLiteralName() {
+    MetricFamilyDescriptor descriptor =
+        MetricFamilyDescriptor.stateSet("feature_flags").help("Flags").labelName("service").build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.STATESET);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("feature_flags");
+    assertThat(descriptor.getLabelNames()).containsExactly("service");
+  }
+
+  @Test
+  void unknownDescriptorKeepsLiteralName() {
+    MetricFamilyDescriptor descriptor =
+        MetricFamilyDescriptor.unknown("vendor_metric").help("Vendor metric").build();
+
+    assertThat(descriptor.getType()).isEqualTo(MetricType.UNKNOWN);
+    assertThat(descriptor.getPrometheusName()).isEqualTo("vendor_metric");
+  }
+
+  @Test
+  void genericFactoryUsesTypedBuilderSemanticsForAllKinds() {
+    MetricFamilyDescriptor counter =
+        MetricFamilyDescriptor.of(MetricType.COUNTER, "http_requests_total").build();
+    MetricFamilyDescriptor gauge =
+        MetricFamilyDescriptor.of(MetricType.GAUGE, "queue_depth").build();
+    MetricFamilyDescriptor histogram =
+        MetricFamilyDescriptor.of(MetricType.HISTOGRAM, "request_duration_seconds").build();
+    MetricFamilyDescriptor summary =
+        MetricFamilyDescriptor.of(MetricType.SUMMARY, "request_size_bytes").build();
+    MetricFamilyDescriptor info = MetricFamilyDescriptor.of(MetricType.INFO, "build_info").build();
+    MetricFamilyDescriptor stateSet =
+        MetricFamilyDescriptor.of(MetricType.STATESET, "feature_flags").build();
+    MetricFamilyDescriptor unknown =
+        MetricFamilyDescriptor.of(MetricType.UNKNOWN, "vendor_metric").build();
+
+    assertThat(counter.getPrometheusName()).isEqualTo("http_requests");
+    assertThat(gauge.getPrometheusName()).isEqualTo("queue_depth");
+    assertThat(histogram.getPrometheusName()).isEqualTo("request_duration_seconds");
+    assertThat(summary.getPrometheusName()).isEqualTo("request_size_bytes");
+    assertThat(info.getPrometheusName()).isEqualTo("build");
+    assertThat(stateSet.getPrometheusName()).isEqualTo("feature_flags");
+    assertThat(unknown.getPrometheusName()).isEqualTo("vendor_metric");
+  }
+
+  @Test
+  void infoDescriptorRejectsUnit() {
+    assertThatThrownBy(() -> MetricFamilyDescriptor.info("jvm_info").unit(Unit.SECONDS))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Info metric cannot have a unit.");
+  }
+
+  @Test
+  void buildersRejectNullHelp() {
+    assertThatThrownBy(() -> MetricFamilyDescriptor.counter("events_total").help(null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Missing required field: help is null");
+  }
+
+  @Test
+  void buildersRejectNullUnit() {
+    assertThatThrownBy(() -> MetricFamilyDescriptor.counter("events_total").unit(null))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("Missing required field: unit is null");
+  }
+
+  @Test
+  void stateSetDescriptorRejectsUnit() {
+    assertThatThrownBy(() -> MetricFamilyDescriptor.stateSet("feature_flags").unit(Unit.SECONDS))
+        .isInstanceOf(IllegalArgumentException.class)
+        .hasMessage("State set metric cannot have a unit.");
+  }
+}
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricMetadataTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricMetadataTest.java
index f2d6a6ba4..3d83887d5 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricMetadataTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricMetadataTest.java
@@ -9,19 +9,19 @@
 class MetricMetadataTest {
 
   @Test
-  public void testEmptyName() {
+  void testEmptyName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> new MetricMetadata(""));
   }
 
   @Test
-  public void testNullName() {
+  void testNullName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> new MetricMetadata(null));
   }
 
   @Test
-  public void testSanitizationIllegalCharacters() {
+  void testSanitizationIllegalCharacters() {
     MetricMetadata metadata =
         new MetricMetadata(
             sanitizeMetricName("my_namespace/http.server.duration", Unit.SECONDS),
@@ -34,42 +34,161 @@ public void testSanitizationIllegalCharacters() {
   }
 
   @Test
-  public void testSanitizationCounter() {
+  void testNameWithTotalSuffix() {
+    // sanitizeMetricName strips the reserved _total suffix.
     MetricMetadata metadata = new MetricMetadata(sanitizeMetricName("my_events_total"));
     assertThat(metadata.getName()).isEqualTo("my_events");
   }
 
   @Test
-  public void testSanitizationInfo() {
+  void testNameWithInfoSuffix() {
+    // sanitizeMetricName strips the reserved _info suffix.
     MetricMetadata metadata = new MetricMetadata(sanitizeMetricName("target_info"));
     assertThat(metadata.getName()).isEqualTo("target");
   }
 
   @Test
-  public void testSanitizationWeirdCornerCase() {
-    MetricMetadata metadata = new MetricMetadata(sanitizeMetricName("_total_created"));
-    assertThat(metadata.getName()).isEqualTo("total");
+  void testNameWithCreatedSuffix() {
+    // sanitizeMetricName strips the reserved _created suffix.
+    MetricMetadata metadata = new MetricMetadata(sanitizeMetricName("my_events_created"));
+    assertThat(metadata.getName()).isEqualTo("my_events");
+  }
+
+  @Test
+  void testNameWithBucketSuffix() {
+    // sanitizeMetricName strips the reserved _bucket suffix.
+    MetricMetadata metadata = new MetricMetadata(sanitizeMetricName("my_histogram_bucket"));
+    assertThat(metadata.getName()).isEqualTo("my_histogram");
   }
 
   @Test
-  public void testSanitizeEmptyString() {
+  void testSanitizeEmptyString() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> sanitizeMetricName(""));
   }
 
   @Test
-  public void testUnitSuffixRequired() {
+  void testUnitSuffixRequired() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> new MetricMetadata("my_counter", "help", Unit.SECONDS));
   }
 
   @Test
-  public void testUnitSuffixAdded() {
+  void testUnitSuffixAdded() {
     new MetricMetadata(sanitizeMetricName("my_counter", Unit.SECONDS), "help", Unit.SECONDS);
   }
 
   @Test
-  public void testUnitNotDuplicated() {
+  void testUnitNotDuplicated() {
     assertThat(sanitizeMetricName("my_counter_bytes", Unit.BYTES)).isEqualTo("my_counter_bytes");
   }
+
+  @SuppressWarnings("deprecation")
+  @Test
+  void testFiveArgConstructor() {
+    MetricMetadata metadata =
+        new MetricMetadata("req_bytes", "req_bytes", "req", "help", Unit.BYTES);
+    assertThat(metadata.getName()).isEqualTo("req_bytes");
+    assertThat(metadata.getExpositionBaseName()).isEqualTo("req_bytes");
+    assertThat(metadata.getOriginalName()).isEqualTo("req");
+    assertThat(metadata.getHelp()).isEqualTo("help");
+    assertThat(metadata.getUnit()).isEqualTo(Unit.BYTES);
+  }
+
+  @SuppressWarnings("deprecation")
+  @Test
+  void testFourArgConstructorDefaultsOriginalName() {
+    MetricMetadata metadata = new MetricMetadata("req_bytes", "req_bytes", "help", Unit.BYTES);
+    assertThat(metadata.getOriginalName()).isEqualTo("req_bytes");
+    assertThat(metadata.getExpositionBaseName()).isEqualTo("req_bytes");
+  }
+
+  @Test
+  void testThreeArgConstructorDefaultsOriginalName() {
+    MetricMetadata metadata = new MetricMetadata("req_bytes", "help", Unit.BYTES);
+    assertThat(metadata.getOriginalName()).isEqualTo("req_bytes");
+    assertThat(metadata.getExpositionBaseName()).isEqualTo("req_bytes");
+  }
+
+  @Test
+  void builder_noUnit() {
+    MetricMetadata m = MetricMetadata.builder().name("requests").help("total requests").build();
+    assertThat(m.getName()).isEqualTo("requests");
+    assertThat(m.getExpositionBaseName()).isEqualTo("requests");
+    assertThat(m.getOriginalName()).isEqualTo("requests");
+    assertThat(m.getHelp()).isEqualTo("total requests");
+    assertThat(m.getUnit()).isNull();
+  }
+
+  @Test
+  void builder_unitAppendedWhenAbsent() {
+    MetricMetadata m = MetricMetadata.builder().name("requests").unit(Unit.BYTES).build();
+    assertThat(m.getName()).isEqualTo("requests_bytes");
+    assertThat(m.getExpositionBaseName()).isEqualTo("requests_bytes");
+    assertThat(m.getOriginalName()).isEqualTo("requests");
+  }
+
+  @Test
+  void builder_unitNotDuplicatedWhenPresent() {
+    MetricMetadata m = MetricMetadata.builder().name("requests_bytes").unit(Unit.BYTES).build();
+    assertThat(m.getName()).isEqualTo("requests_bytes");
+    assertThat(m.getExpositionBaseName()).isEqualTo("requests_bytes");
+    assertThat(m.getOriginalName()).isEqualTo("requests_bytes");
+  }
+
+  @Test
+  void builder_counterSuffixAppended() {
+    MetricMetadata m = MetricMetadata.builder().name("requests").counterSuffix(true).build();
+    assertThat(m.getName()).isEqualTo("requests");
+    assertThat(m.getExpositionBaseName()).isEqualTo("requests_total");
+    assertThat(m.getOriginalName()).isEqualTo("requests");
+  }
+
+  @Test
+  void builder_counterSuffixAndUnit() {
+    MetricMetadata m =
+        MetricMetadata.builder().name("requests").unit(Unit.BYTES).counterSuffix(true).build();
+    assertThat(m.getName()).isEqualTo("requests_bytes");
+    assertThat(m.getExpositionBaseName()).isEqualTo("requests_bytes_total");
+    assertThat(m.getOriginalName()).isEqualTo("requests");
+  }
+
+  @Test
+  void builder_utf8NameWithCounterSuffix() {
+    MetricMetadata m = MetricMetadata.builder().name("my.requests").counterSuffix(true).build();
+    assertThat(m.getName()).isEqualTo("my.requests");
+    assertThat(m.getExpositionBaseName()).isEqualTo("my.requests_total");
+    assertThat(m.getPrometheusName()).isEqualTo("my_requests");
+    assertThat(m.getExpositionBasePrometheusName()).isEqualTo("my_requests_total");
+  }
+
+  @Test
+  void builder_customOriginalAndExpositionBaseName() {
+    MetricMetadata m =
+        MetricMetadata.builder()
+            .name("requests_bytes")
+            .expositionBaseName("requests_total_bytes")
+            .originalName("requests_total")
+            .help("help")
+            .unit(Unit.BYTES)
+            .build();
+    assertThat(m.getName()).isEqualTo("requests_bytes");
+    assertThat(m.getExpositionBaseName()).isEqualTo("requests_total_bytes");
+    assertThat(m.getOriginalName()).isEqualTo("requests_total");
+    assertThat(m.getHelp()).isEqualTo("help");
+    assertThat(m.getUnit()).isEqualTo(Unit.BYTES);
+  }
+
+  @Test
+  void builder_nonCounterExpositionBaseEqualsName() {
+    MetricMetadata m = MetricMetadata.builder().name("active_connections").build();
+    assertThat(m.getExpositionBaseName()).isEqualTo(m.getName());
+  }
+
+  @Test
+  void builder_nameRequired() {
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> MetricMetadata.builder().help("help").build())
+        .withMessage("name is required");
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotTest.java
index 2c1c04bb6..199cb8f4c 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotTest.java
@@ -8,7 +8,7 @@
 class MetricSnapshotTest {
 
   @Test
-  public void testDuplicateLabels() {
+  void testDuplicateLabels() {
     assertThatExceptionOfType(DuplicateLabelsException.class)
         .isThrownBy(
             () ->
@@ -39,13 +39,13 @@ public void testDuplicateLabels() {
   }
 
   @Test
-  public void testNoData() {
+  void testNoData() {
     MetricSnapshot snapshot = CounterSnapshot.builder().name("test").build();
     assertThat(snapshot.getDataPoints().size()).isEqualTo(0);
   }
 
   @Test
-  public void testNullData() {
+  void testNullData() {
     assertThatExceptionOfType(NullPointerException.class)
         .isThrownBy(() -> new CounterSnapshot(new MetricMetadata("test"), null));
   }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotsTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotsTest.java
index 04a824f02..224ca691a 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotsTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/MetricSnapshotsTest.java
@@ -9,13 +9,13 @@
 class MetricSnapshotsTest {
 
   @Test
-  public void testEmpty() {
+  void testEmpty() {
     MetricSnapshots snapshots = MetricSnapshots.builder().build();
     assertThat(snapshots.stream().findAny()).isNotPresent();
   }
 
   @Test
-  public void testSort() {
+  void testSort() {
     CounterSnapshot c1 =
         CounterSnapshot.builder()
             .name("counter1")
@@ -39,7 +39,7 @@ public void testSort() {
   }
 
   @Test
-  public void testDuplicateName() {
+  void testDuplicateName() {
     // Q: What if you have a counter named "foo" and a gauge named "foo"?
     // A: Great question. You might think this is a valid scenario, because the counter will produce
     //    the values "foo_total" and "foo_created" while the gauge will produce the value "foo".
@@ -62,7 +62,35 @@ public void testDuplicateName() {
   }
 
   @Test
-  public void testBuilder() {
+  void testDuplicateName_histogramGaugeVsClassic_throws() {
+    HistogramSnapshot classic =
+        HistogramSnapshot.builder()
+            .name("my_histogram")
+            .dataPoint(
+                HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                    .classicHistogramBuckets(
+                        ClassicHistogramBuckets.of(
+                            new double[] {Double.POSITIVE_INFINITY}, new long[] {0}))
+                    .build())
+            .build();
+    HistogramSnapshot gauge =
+        HistogramSnapshot.builder()
+            .name("my_histogram")
+            .gaugeHistogram(true)
+            .dataPoint(
+                HistogramSnapshot.HistogramDataPointSnapshot.builder()
+                    .classicHistogramBuckets(
+                        ClassicHistogramBuckets.of(
+                            new double[] {Double.POSITIVE_INFINITY}, new long[] {0}))
+                    .build())
+            .build();
+    assertThatExceptionOfType(IllegalArgumentException.class)
+        .isThrownBy(() -> new MetricSnapshots(classic, gauge))
+        .withMessageContaining("conflicting histogram types");
+  }
+
+  @Test
+  void testBuilder() {
     CounterSnapshot counter =
         CounterSnapshot.builder()
             .name("my_metric")
@@ -75,7 +103,7 @@ public void testBuilder() {
   }
 
   @Test
-  public void testImmutable() {
+  void testImmutable() {
     CounterSnapshot c1 =
         CounterSnapshot.builder()
             .name("counter1")
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucketsTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucketsTest.java
index 32c7f3eb3..5bc19a6f5 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucketsTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/NativeHistogramBucketsTest.java
@@ -3,13 +3,16 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
 import org.junit.jupiter.api.Test;
 
 class NativeHistogramBucketsTest {
 
   @Test
-  public void testGoodCase() {
+  void testGoodCase() {
     NativeHistogramBuckets buckets =
         NativeHistogramBuckets.builder().bucket(-10, 12).bucket(120, 17).build();
     assertThat(buckets.size()).isEqualTo(2);
@@ -20,13 +23,13 @@ public void testGoodCase() {
   }
 
   @Test
-  public void testEmpty() {
+  void testEmpty() {
     NativeHistogramBuckets buckets = NativeHistogramBuckets.builder().build();
     assertThat(buckets.size()).isZero();
   }
 
   @Test
-  public void testSort() {
+  void testSort() {
     NativeHistogramBuckets buckets =
         NativeHistogramBuckets.builder().bucket(7, 4).bucket(2, 0).bucket(5, 3).build();
     assertThat(buckets.size()).isEqualTo(3);
@@ -39,7 +42,7 @@ public void testSort() {
   }
 
   @Test
-  public void testDifferentLength() {
+  void testDifferentLength() {
     int[] bucketIndexes = new int[] {0, 1, 2};
     long[] cumulativeCounts = new long[] {13, 178, 1024, 3000};
     assertThatExceptionOfType(IllegalArgumentException.class)
@@ -47,11 +50,107 @@ public void testDifferentLength() {
   }
 
   @Test
-  public void testImmutable() {
+  void testImmutable() {
     NativeHistogramBuckets buckets =
         NativeHistogramBuckets.builder().bucket(1, 1).bucket(2, 1).build();
     Iterator<NativeHistogramBucket> iterator = buckets.iterator();
     iterator.next();
     assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(iterator::remove);
   }
+
+  @Test
+  void testSortSmallInputMaintainsPairs() {
+    int size = 5;
+    int[] bucketIndexes = new int[size];
+    long[] counts = new long[size];
+    Map<Integer, Long> expectedCounts = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      bucketIndexes[i] = (i * 3) - 5;
+      counts[i] = 100L + i;
+      expectedCounts.put(bucketIndexes[i], counts[i]);
+    }
+
+    Random random = new Random(12L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      int bucketIndex = bucketIndexes[i];
+      bucketIndexes[i] = bucketIndexes[j];
+      bucketIndexes[j] = bucketIndex;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+
+    NativeHistogramBuckets buckets = NativeHistogramBuckets.of(bucketIndexes, counts);
+    for (int i = 1; i < buckets.size(); i++) {
+      assertThat(buckets.getBucketIndex(i - 1)).isLessThan(buckets.getBucketIndex(i));
+    }
+    for (int i = 0; i < buckets.size(); i++) {
+      assertThat(buckets.getCount(i)).isEqualTo(expectedCounts.get(buckets.getBucketIndex(i)));
+    }
+  }
+
+  @Test
+  void testSortMediumInputMaintainsPairs() {
+    int size = 25;
+    int[] bucketIndexes = new int[size];
+    long[] counts = new long[size];
+    Map<Integer, Long> expectedCounts = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      bucketIndexes[i] = (i * 3) - 25;
+      counts[i] = 1000L + i;
+      expectedCounts.put(bucketIndexes[i], counts[i]);
+    }
+
+    Random random = new Random(13L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      int bucketIndex = bucketIndexes[i];
+      bucketIndexes[i] = bucketIndexes[j];
+      bucketIndexes[j] = bucketIndex;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+
+    NativeHistogramBuckets buckets = NativeHistogramBuckets.of(bucketIndexes, counts);
+    for (int i = 1; i < buckets.size(); i++) {
+      assertThat(buckets.getBucketIndex(i - 1)).isLessThan(buckets.getBucketIndex(i));
+    }
+    for (int i = 0; i < buckets.size(); i++) {
+      assertThat(buckets.getCount(i)).isEqualTo(expectedCounts.get(buckets.getBucketIndex(i)));
+    }
+  }
+
+  @Test
+  void testSortLargeInputMaintainsPairs() {
+    int size = 64;
+    int[] bucketIndexes = new int[size];
+    long[] counts = new long[size];
+    Map<Integer, Long> expectedCounts = new HashMap<>();
+    for (int i = 0; i < size; i++) {
+      bucketIndexes[i] = (i * 3) - 50;
+      counts[i] = 1000L + i;
+      expectedCounts.put(bucketIndexes[i], counts[i]);
+    }
+
+    Random random = new Random(2L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      int bucketIndex = bucketIndexes[i];
+      bucketIndexes[i] = bucketIndexes[j];
+      bucketIndexes[j] = bucketIndex;
+      long count = counts[i];
+      counts[i] = counts[j];
+      counts[j] = count;
+    }
+
+    NativeHistogramBuckets buckets = NativeHistogramBuckets.of(bucketIndexes, counts);
+    for (int i = 1; i < buckets.size(); i++) {
+      assertThat(buckets.getBucketIndex(i - 1)).isLessThan(buckets.getBucketIndex(i));
+    }
+    for (int i = 0; i < buckets.size(); i++) {
+      assertThat(buckets.getCount(i)).isEqualTo(expectedCounts.get(buckets.getBucketIndex(i)));
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/PrometheusNamingTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/PrometheusNamingTest.java
index 40c1f1bde..ee6d2d027 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/PrometheusNamingTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/PrometheusNamingTest.java
@@ -2,6 +2,7 @@
 
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.escapeName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.isValidLabelName;
+import static io.prometheus.metrics.model.snapshots.PrometheusNaming.normalizeMetricName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.prometheusName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.sanitizeLabelName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.sanitizeMetricName;
@@ -21,20 +22,50 @@
 class PrometheusNamingTest {
 
   @Test
-  public void testSanitizeMetricName() {
+  void testSanitizeMetricName() {
+    // Reserved suffixes are stripped to avoid confusion with Prometheus type conventions.
     assertThat(sanitizeMetricName("my_counter_total")).isEqualTo("my_counter");
     assertThat(sanitizeMetricName("jvm.info")).isEqualTo("jvm");
     assertThat(sanitizeMetricName("jvm_info")).isEqualTo("jvm");
-    assertThat(sanitizeMetricName("jvm.info")).isEqualTo("jvm");
     assertThat(sanitizeMetricName("a.b")).isEqualTo("a.b");
+    // "_total" / ".total" corner cases: the suffix is the entire name, so the separator
+    // character is dropped to avoid returning an empty string.
     assertThat(sanitizeMetricName("_total")).isEqualTo("total");
+    assertThat(sanitizeMetricName(".total")).isEqualTo("total");
     assertThat(sanitizeMetricName("total")).isEqualTo("total");
+    assertThat(sanitizeMetricName("my_events_created")).isEqualTo("my_events");
+    assertThat(sanitizeMetricName("my_histogram_bucket")).isEqualTo("my_histogram");
   }
 
+  /**
+   * Regression test: reserved suffixes must be stripped even when the raw name comes from an
+   * external system (e.g. JMX Exporter converting a JMX attribute named {@code "Total"} into a
+   * Prometheus name {@code kafka_consumer_request_total}).
+   *
+   * <p>Without stripping, an UNKNOWN metric would be stored under {@code
+   * kafka_consumer_request_total} instead of {@code kafka_consumer_request}, breaking registry
+   * lookups by the expected base name and potentially triggering unintended counter-type inference
+   * in tools that check for the {@code _total} suffix.
+   */
   @Test
-  public void testSanitizeMetricNameWithUnit() {
+  void testSanitizeMetricNameStripsReservedSuffixForDownstreamTools() {
+    // A JMX attribute "Total" produces "kafka_consumer_request_total" as the raw name.
+    // sanitizeMetricName must strip "_total" so that the metric is stored and looked up under
+    // "kafka_consumer_request", not "kafka_consumer_request_total".
+    assertThat(sanitizeMetricName("kafka_consumer_request_total"))
+        .isEqualTo("kafka_consumer_request");
+    // Dot variant is stripped too.
+    assertThat(sanitizeMetricName("kafka_consumer_request.total"))
+        .isEqualTo("kafka_consumer_request");
+    // Multiple chained reserved suffixes are stripped iteratively.
+    assertThat(sanitizeMetricName("events_total_created")).isEqualTo("events");
+  }
+
+  @Test
+  void testSanitizeMetricNameWithUnit() {
     assertThat(prometheusName(sanitizeMetricName("def", Unit.RATIO)))
         .isEqualTo("def_" + Unit.RATIO);
+    // _total is stripped first, then the unit is appended.
     assertThat(prometheusName(sanitizeMetricName("my_counter_total", Unit.RATIO)))
         .isEqualTo("my_counter_" + Unit.RATIO);
     assertThat(sanitizeMetricName("jvm.info", Unit.RATIO)).isEqualTo("jvm_" + Unit.RATIO);
@@ -43,7 +74,30 @@ public void testSanitizeMetricNameWithUnit() {
   }
 
   @Test
-  public void testSanitizeLabelName() {
+  void testNormalizeMetricName() {
+    assertThat(normalizeMetricName("my_counter_total")).isEqualTo("my_counter_total");
+    assertThat(normalizeMetricName("jvm.info")).isEqualTo("jvm.info");
+    assertThat(normalizeMetricName("jvm_info")).isEqualTo("jvm_info");
+    assertThat(normalizeMetricName("a.b")).isEqualTo("a.b");
+    assertThat(normalizeMetricName("_total")).isEqualTo("_total");
+    assertThat(normalizeMetricName(".total")).isEqualTo(".total");
+    assertThat(normalizeMetricName("my_events_created")).isEqualTo("my_events_created");
+    assertThat(normalizeMetricName("my_histogram_bucket")).isEqualTo("my_histogram_bucket");
+  }
+
+  @Test
+  void testNormalizeMetricNameWithUnit() {
+    assertThat(prometheusName(normalizeMetricName("def", Unit.RATIO)))
+        .isEqualTo("def_" + Unit.RATIO);
+    assertThat(prometheusName(normalizeMetricName("my_counter_total", Unit.RATIO)))
+        .isEqualTo("my_counter_total_" + Unit.RATIO);
+    assertThat(normalizeMetricName("jvm.info", Unit.RATIO)).isEqualTo("jvm.info_" + Unit.RATIO);
+    assertThat(normalizeMetricName("_total", Unit.RATIO)).isEqualTo("_total_" + Unit.RATIO);
+    assertThat(normalizeMetricName("total", Unit.RATIO)).isEqualTo("total_" + Unit.RATIO);
+  }
+
+  @Test
+  void testSanitizeLabelName() {
     assertThat(prometheusName(sanitizeLabelName("0abc.def"))).isEqualTo("_abc_def");
     assertThat(prometheusName(sanitizeLabelName("_abc"))).isEqualTo("_abc");
     assertThat(prometheusName(sanitizeLabelName("__abc"))).isEqualTo("_abc");
@@ -54,47 +108,36 @@ public void testSanitizeLabelName() {
   }
 
   @Test
-  public void testValidateUnitName() {
-    assertThat(validateUnitName("secondstotal")).isNotNull();
-    assertThat(validateUnitName("total")).isNotNull();
-    assertThat(validateUnitName("seconds_total")).isNotNull();
-    assertThat(validateUnitName("_total")).isNotNull();
+  void testValidateUnitName() {
     assertThat(validateUnitName("")).isNotNull();
 
     assertThat(validateUnitName("seconds")).isNull();
     assertThat(validateUnitName("2")).isNull();
+    assertThat(validateUnitName("total")).isNull();
+    assertThat(validateUnitName("info")).isNull();
+    assertThat(validateUnitName("created")).isNull();
+    assertThat(validateUnitName("bucket")).isNull();
   }
 
   @Test
-  public void testSanitizeUnitName() {
+  void testSanitizeUnitName() {
     assertThat(sanitizeUnitName("seconds")).isEqualTo("seconds");
-    assertThat(sanitizeUnitName("seconds_total")).isEqualTo("seconds");
-    assertThat(sanitizeUnitName("seconds_total_total")).isEqualTo("seconds");
     assertThat(sanitizeUnitName("m/s")).isEqualTo("m_s");
-    assertThat(sanitizeUnitName("secondstotal")).isEqualTo("seconds");
     assertThat(sanitizeUnitName("2")).isEqualTo("2");
+    assertThat(sanitizeUnitName("total")).isEqualTo("total");
+    assertThat(sanitizeUnitName("info")).isEqualTo("info");
+    assertThat(sanitizeUnitName("created")).isEqualTo("created");
+    assertThat(sanitizeUnitName("bucket")).isEqualTo("bucket");
   }
 
   @Test
-  public void testInvalidUnitName1() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> sanitizeUnitName("total"));
-  }
-
-  @Test
-  public void testInvalidUnitName2() {
-    assertThatExceptionOfType(IllegalArgumentException.class)
-        .isThrownBy(() -> sanitizeUnitName("_total"));
-  }
-
-  @Test
-  public void testInvalidUnitName3() {
+  void testInvalidUnitName_percent() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> sanitizeUnitName("%"));
   }
 
   @Test
-  public void testEmptyUnitName() {
+  void testEmptyUnitName() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> sanitizeUnitName(""));
   }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/QuantilesTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/QuantilesTest.java
index 8703657ca..4ccadddc8 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/QuantilesTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/QuantilesTest.java
@@ -9,7 +9,7 @@
 class QuantilesTest {
 
   @Test
-  public void testSort() {
+  void testSort() {
     Quantiles quantiles =
         Quantiles.builder().quantile(0.99, 0.23).quantile(0.5, 0.2).quantile(0.95, 0.22).build();
     assertThat(quantiles.size()).isEqualTo(3);
@@ -22,7 +22,7 @@ public void testSort() {
   }
 
   @Test
-  public void testImmutable() {
+  void testImmutable() {
     Quantiles quantiles =
         Quantiles.builder().quantile(0.99, 0.23).quantile(0.5, 0.2).quantile(0.95, 0.22).build();
     Iterator<Quantile> iterator = quantiles.iterator();
@@ -31,12 +31,12 @@ public void testImmutable() {
   }
 
   @Test
-  public void testEmpty() {
+  void testEmpty() {
     assertThat(Quantiles.EMPTY.size()).isZero();
   }
 
   @Test
-  public void testDuplicate() {
+  void testDuplicate() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotEscaperTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotEscaperTest.java
index f84024e95..5c04719c0 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotEscaperTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotEscaperTest.java
@@ -15,7 +15,7 @@
 class SnapshotEscaperTest {
 
   @Test
-  public void testEscapeMetricSnapshotEmpty() {
+  void testEscapeMetricSnapshotEmpty() {
     MetricSnapshot original = CounterSnapshot.builder().name("empty").build();
     MetricSnapshot got = escapeMetricSnapshot(original, EscapingScheme.VALUE_ENCODING_ESCAPING);
     assertThat(Objects.requireNonNull(got).getMetadata().getName()).isEqualTo("empty");
@@ -23,7 +23,7 @@ public void testEscapeMetricSnapshotEmpty() {
   }
 
   @Test
-  public void testEscapeMetricSnapshotSimpleNoEscapingNeeded() {
+  void testEscapeMetricSnapshotSimpleNoEscapingNeeded() {
     testEscapeMetricSnapshot(
         "my_metric",
         "some_label",
@@ -36,7 +36,7 @@ public void testEscapeMetricSnapshotSimpleNoEscapingNeeded() {
   }
 
   @Test
-  public void testEscapeMetricSnapshotLabelNameEscapingNeeded() {
+  void testEscapeMetricSnapshotLabelNameEscapingNeeded() {
     testEscapeMetricSnapshot(
         "my_metric",
         "some.label",
@@ -49,7 +49,7 @@ public void testEscapeMetricSnapshotLabelNameEscapingNeeded() {
   }
 
   @Test
-  public void testEscapeMetricSnapshotCounterEscapingNeeded() {
+  void testEscapeMetricSnapshotCounterEscapingNeeded() {
     testEscapeMetricSnapshot(
         "my.metric",
         "some?label",
@@ -62,7 +62,7 @@ public void testEscapeMetricSnapshotCounterEscapingNeeded() {
   }
 
   @Test
-  public void testEscapeMetricSnapshotGaugeEscapingNeeded() {
+  void testEscapeMetricSnapshotGaugeEscapingNeeded() {
     testEscapeMetricSnapshot(
         "unicode.and.dots.花火",
         "some_label",
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotTestUtil.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotTestUtil.java
index d8e8d33e4..de75eeaeb 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotTestUtil.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SnapshotTestUtil.java
@@ -2,7 +2,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SnapshotTestUtil {
+public class SnapshotTestUtil {
 
   public static void assertMetadata(
       MetricSnapshot snapshot, String name, String help, String unit) {
@@ -14,4 +14,11 @@ public static void assertMetadata(
       assertThat(snapshot.getMetadata().getUnit()).isNull();
     }
   }
+
+  public static void assertDerivedMetadata(
+      MetricSnapshot snapshot, String name, String expositionBaseName, String originalName) {
+    assertThat(snapshot.getMetadata().getName()).isEqualTo(name);
+    assertThat(snapshot.getMetadata().getExpositionBaseName()).isEqualTo(expositionBaseName);
+    assertThat(snapshot.getMetadata().getOriginalName()).isEqualTo(originalName);
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/StateSetSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/StateSetSnapshotTest.java
index 05e102b9d..57696cfd1 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/StateSetSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/StateSetSnapshotTest.java
@@ -4,13 +4,16 @@
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 
 class StateSetSnapshotTest {
 
   @Test
-  public void testCompleteGoodCase() {
+  void testCompleteGoodCase() {
     long scrapeTimestamp = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
     StateSetSnapshot snapshot =
         StateSetSnapshot.builder()
@@ -49,7 +52,7 @@ public void testCompleteGoodCase() {
   }
 
   @Test
-  public void testStateSetDataSorted() {
+  void testStateSetDataSorted() {
     StateSetSnapshot.StateSetDataPointSnapshot data =
         StateSetSnapshot.StateSetDataPointSnapshot.builder()
             .state("b", true)
@@ -69,14 +72,14 @@ public void testStateSetDataSorted() {
   }
 
   @Test
-  public void testMustHaveState() {
+  void testMustHaveState() {
     // Must have at least one state.
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> StateSetSnapshot.StateSetDataPointSnapshot.builder().build());
   }
 
   @Test
-  public void testMinimal() {
+  void testMinimal() {
     StateSetSnapshot snapshot =
         StateSetSnapshot.builder()
             .name("my_flag")
@@ -87,13 +90,13 @@ public void testMinimal() {
   }
 
   @Test
-  public void testEmpty() {
+  void testEmpty() {
     StateSetSnapshot snapshot = StateSetSnapshot.builder().name("my_flag").build();
     assertThat(snapshot.dataPoints).isEmpty();
   }
 
   @Test
-  public void testDataImmutable() {
+  void testDataImmutable() {
     StateSetSnapshot.StateSetDataPointSnapshot data =
         StateSetSnapshot.StateSetDataPointSnapshot.builder()
             .state("a", true)
@@ -111,7 +114,7 @@ public void testDataImmutable() {
   }
 
   @Test
-  public void testDuplicateState() {
+  void testDuplicateState() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -123,13 +126,13 @@ public void testDuplicateState() {
   }
 
   @Test
-  public void noUnit() {
+  void noUnit() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> StateSetSnapshot.builder().name("flags").unit(Unit.BYTES).build());
   }
 
   @Test
-  public void testStateSetImmutable() {
+  void testStateSetImmutable() {
     StateSetSnapshot snapshot =
         StateSetSnapshot.builder()
             .name("flags")
@@ -151,7 +154,7 @@ public void testStateSetImmutable() {
   }
 
   @Test
-  public void testLabelsUnique() {
+  void testLabelsUnique() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(
             () ->
@@ -167,4 +170,103 @@ public void testLabelsUnique() {
                             .build())
                     .build());
   }
+
+  @Test
+  void testSortSmallInputMaintainsPairs() {
+    int size = 5;
+    String[] names = new String[size];
+    boolean[] values = new boolean[size];
+    Map<String, Boolean> expectedValues = new TreeMap<>();
+    for (int i = 0; i < size; i++) {
+      names[i] = "state_" + i;
+      values[i] = i % 3 == 0;
+      expectedValues.put(names[i], values[i]);
+    }
+
+    Random random = new Random(16L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      boolean value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+
+    StateSetSnapshot.StateSetDataPointSnapshot snapshot =
+        new StateSetSnapshot.StateSetDataPointSnapshot(names, values, Labels.EMPTY);
+    for (int i = 1; i < snapshot.size(); i++) {
+      assertThat(snapshot.getName(i - 1)).isLessThan(snapshot.getName(i));
+    }
+    for (int i = 0; i < snapshot.size(); i++) {
+      assertThat(snapshot.isTrue(i)).isEqualTo(expectedValues.get(snapshot.getName(i)));
+    }
+  }
+
+  @Test
+  void testSortMediumInputMaintainsPairs() {
+    int size = 25;
+    String[] names = new String[size];
+    boolean[] values = new boolean[size];
+    Map<String, Boolean> expectedValues = new TreeMap<>();
+    for (int i = 0; i < size; i++) {
+      names[i] = "state_" + i;
+      values[i] = i % 3 == 0;
+      expectedValues.put(names[i], values[i]);
+    }
+
+    Random random = new Random(17L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      boolean value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+
+    StateSetSnapshot.StateSetDataPointSnapshot snapshot =
+        new StateSetSnapshot.StateSetDataPointSnapshot(names, values, Labels.EMPTY);
+    for (int i = 1; i < snapshot.size(); i++) {
+      assertThat(snapshot.getName(i - 1)).isLessThan(snapshot.getName(i));
+    }
+    for (int i = 0; i < snapshot.size(); i++) {
+      assertThat(snapshot.isTrue(i)).isEqualTo(expectedValues.get(snapshot.getName(i)));
+    }
+  }
+
+  @Test
+  void testSortLargeInputMaintainsPairs() {
+    int size = 64;
+    String[] names = new String[size];
+    boolean[] values = new boolean[size];
+    Map<String, Boolean> expectedValues = new TreeMap<>();
+    for (int i = 0; i < size; i++) {
+      names[i] = "state_" + i;
+      values[i] = i % 3 == 0;
+      expectedValues.put(names[i], values[i]);
+    }
+
+    Random random = new Random(4L);
+    for (int i = size - 1; i > 0; i--) {
+      int j = random.nextInt(i + 1);
+      String name = names[i];
+      names[i] = names[j];
+      names[j] = name;
+      boolean value = values[i];
+      values[i] = values[j];
+      values[j] = value;
+    }
+
+    StateSetSnapshot.StateSetDataPointSnapshot snapshot =
+        new StateSetSnapshot.StateSetDataPointSnapshot(names, values, Labels.EMPTY);
+    for (int i = 1; i < snapshot.size(); i++) {
+      assertThat(snapshot.getName(i - 1)).isLessThan(snapshot.getName(i));
+    }
+    for (int i = 0; i < snapshot.size(); i++) {
+      assertThat(snapshot.isTrue(i)).isEqualTo(expectedValues.get(snapshot.getName(i)));
+    }
+  }
 }
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SummarySnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SummarySnapshotTest.java
index df423ba97..8cd9571f5 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SummarySnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/SummarySnapshotTest.java
@@ -9,7 +9,7 @@
 class SummarySnapshotTest {
 
   @Test
-  public void testCompleteGoodCase() {
+  void testCompleteGoodCase() {
     long createdTimestamp = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
     long scrapeTimestamp = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(2);
     long exemplarTimestamp = System.currentTimeMillis();
@@ -82,7 +82,7 @@ public void testCompleteGoodCase() {
   }
 
   @Test
-  public void testMinimal() {
+  void testMinimal() {
     SummarySnapshot snapshot =
         SummarySnapshot.builder()
             .name("size_bytes")
@@ -95,13 +95,13 @@ public void testMinimal() {
   }
 
   @Test
-  public void testEmptySnapshot() {
+  void testEmptySnapshot() {
     SummarySnapshot snapshot = SummarySnapshot.builder().name("empty_summary").build();
     assertThat(snapshot.getDataPoints()).isEmpty();
   }
 
   @Test
-  public void testEmptyData() {
+  void testEmptyData() {
     SummarySnapshot.SummaryDataPointSnapshot data =
         SummarySnapshot.SummaryDataPointSnapshot.builder().build();
     assertThat(data.getQuantiles().size()).isZero();
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnitTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnitTest.java
index 4585e7281..e288a2375 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnitTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnitTest.java
@@ -8,12 +8,12 @@
 class UnitTest {
 
   @Test
-  public void testEmpty() {
+  void testEmpty() {
     assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new Unit(" "));
   }
 
   @Test
-  public void testEquals1() {
+  void testEquals1() {
     Unit unit1 = Unit.BYTES;
     Unit unit2 = new Unit("bytes");
 
@@ -21,7 +21,7 @@ public void testEquals1() {
   }
 
   @Test
-  public void testEquals2() {
+  void testEquals2() {
     Unit unit1 = new Unit("bytes ");
     Unit unit2 = new Unit("bytes");
 
@@ -29,7 +29,7 @@ public void testEquals2() {
   }
 
   @Test
-  public void testEquals3() {
+  void testEquals3() {
     Unit unit1 = new Unit(" bytes");
     Unit unit2 = new Unit("bytes");
 
@@ -37,7 +37,7 @@ public void testEquals3() {
   }
 
   @Test
-  public void testEquals4() {
+  void testEquals4() {
     Unit unit1 = new Unit(" bytes ");
     Unit unit2 = new Unit("bytes");
 
diff --git a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnknownSnapshotTest.java b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnknownSnapshotTest.java
index 53df0a95d..33b4ac2b4 100644
--- a/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnknownSnapshotTest.java
+++ b/prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/UnknownSnapshotTest.java
@@ -9,7 +9,7 @@
 class UnknownSnapshotTest {
 
   @Test
-  public void testCompleteGoodCase() {
+  void testCompleteGoodCase() {
     long exemplarTimestamp = System.currentTimeMillis();
     UnknownSnapshot snapshot =
         UnknownSnapshot.builder()
@@ -46,7 +46,7 @@ public void testCompleteGoodCase() {
   }
 
   @Test
-  public void testMinimal() {
+  void testMinimal() {
     UnknownSnapshot snapshot =
         UnknownSnapshot.builder()
             .name("test")
@@ -56,25 +56,25 @@ public void testMinimal() {
   }
 
   @Test
-  public void testEmpty() {
+  void testEmpty() {
     UnknownSnapshot snapshot = UnknownSnapshot.builder().name("test").build();
     assertThat(snapshot.getDataPoints()).isEmpty();
   }
 
   @Test
-  public void testNameMissing() {
+  void testNameMissing() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> UnknownSnapshot.builder().build());
   }
 
   @Test
-  public void testValueMissing() {
+  void testValueMissing() {
     assertThatExceptionOfType(IllegalArgumentException.class)
         .isThrownBy(() -> UnknownSnapshot.UnknownDataPointSnapshot.builder().build());
   }
 
   @Test
-  public void testUnknownDataPointSnapshot() {
+  void testUnknownDataPointSnapshot() {
     Labels labels = Labels.of("k1", "v1");
     Exemplar exemplar = Exemplar.builder().value(2.0).build();
 
diff --git a/prometheus-metrics-otel-support/pom.xml b/prometheus-metrics-otel-support/pom.xml
new file mode 100644
index 000000000..0365c4695
--- /dev/null
+++ b/prometheus-metrics-otel-support/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.prometheus</groupId>
+    <artifactId>client_java</artifactId>
+    <version>1.8.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>prometheus-metrics-otel-support</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Prometheus Metrics OpenTelemetry Support</name>
+  <description>
+    Bundles the OpenTelemetry SDK and Prometheus exporter so that users
+    who want to combine OTel instrumentations with the Prometheus Java
+    client only need a single dependency.
+  </description>
+
+  <properties>
+    <coverage.skip>true</coverage.skip>
+    <javadoc.skip>true</javadoc.skip>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.opentelemetry.instrumentation</groupId>
+        <artifactId>opentelemetry-instrumentation-bom-alpha</artifactId>
+        <version>${otel.instrumentation.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-sdk</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-exporter-prometheus</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/prometheus-metrics-parent/pom.xml b/prometheus-metrics-parent/pom.xml
index 4c23c670d..94467188d 100644
--- a/prometheus-metrics-parent/pom.xml
+++ b/prometheus-metrics-parent/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <packaging>pom</packaging>
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.prometheus</groupId>
   <artifactId>client_java_parent</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.8.1-SNAPSHOT</version>
 
   <name>Prometheus Metrics Library Parent</name>
   <url>http://github.com/prometheus/client_java</url>
@@ -16,9 +14,7 @@
   </description>
 
   <properties>
-    <checkstyle.skip>true</checkstyle.skip>
     <coverage.skip>true</coverage.skip>
-    <spotless.skip>true</spotless.skip>
     <javadoc.skip>true</javadoc.skip>
   </properties>
 
@@ -68,25 +64,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>3.0.0</version>
-        <configuration>
-          <java>
-            <googleJavaFormat/>
-          </java>
-          <skip>${spotless.skip}</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>verify</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -95,6 +72,32 @@
       <id>release</id>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>3.6.1</version>
+            <executions>
+              <execution>
+                <id>add-license-resources</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>add-resource</goal>
+                </goals>
+                <configuration>
+                  <resources>
+                    <resource>
+                      <directory>${maven.multiModuleProjectDirectory}</directory>
+                      <targetPath>META-INF</targetPath>
+                      <includes>
+                        <include>LICENSE</include>
+                        <include>NOTICE</include>
+                      </includes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -118,7 +121,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
+            <version>3.4.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -131,7 +134,7 @@
           <plugin>
             <groupId>org.sonatype.central</groupId>
             <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.9.0</version>
+            <version>0.11.0</version>
             <extensions>true</extensions>
             <configuration>
               <publishingServerId>ossrh</publishingServerId>
diff --git a/prometheus-metrics-simpleclient-bridge/pom.xml b/prometheus-metrics-simpleclient-bridge/pom.xml
index e15a5631c..e40e04275 100644
--- a/prometheus-metrics-simpleclient-bridge/pom.xml
+++ b/prometheus-metrics-simpleclient-bridge/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-simpleclient-bridge</artifactId>
@@ -22,6 +21,12 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.prometheus</groupId>
       <artifactId>prometheus-metrics-model</artifactId>
diff --git a/prometheus-metrics-simpleclient-bridge/src/main/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollector.java b/prometheus-metrics-simpleclient-bridge/src/main/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollector.java
index 3a96453e7..b2d724997 100644
--- a/prometheus-metrics-simpleclient-bridge/src/main/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollector.java
+++ b/prometheus-metrics-simpleclient-bridge/src/main/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollector.java
@@ -5,6 +5,7 @@
 
 import io.prometheus.client.Collector;
 import io.prometheus.client.CollectorRegistry;
+import io.prometheus.metrics.annotations.StableApi;
 import io.prometheus.metrics.config.PrometheusProperties;
 import io.prometheus.metrics.model.registry.MultiCollector;
 import io.prometheus.metrics.model.registry.PrometheusRegistry;
@@ -54,6 +55,7 @@
  *     .register(prometheusRegistry);
  * }</pre>
  */
+@StableApi
 public class SimpleclientCollector implements MultiCollector {
 
   private final CollectorRegistry simpleclientRegistry;
diff --git a/prometheus-metrics-simpleclient-bridge/src/test/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollectorTest.java b/prometheus-metrics-simpleclient-bridge/src/test/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollectorTest.java
index a17ed8bc4..3905f8f42 100644
--- a/prometheus-metrics-simpleclient-bridge/src/test/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollectorTest.java
+++ b/prometheus-metrics-simpleclient-bridge/src/test/java/io/prometheus/metrics/simpleclient/bridge/SimpleclientCollectorTest.java
@@ -30,14 +30,14 @@ class SimpleclientCollectorTest {
   private PrometheusRegistry newRegistry;
 
   @BeforeEach
-  public void setUp() {
+  void setUp() {
     origRegistry = new CollectorRegistry();
     newRegistry = new PrometheusRegistry();
     SimpleclientCollector.builder().collectorRegistry(origRegistry).register(newRegistry);
   }
 
   @Test
-  public void testCounterComplete() throws IOException, InterruptedException {
+  void testCounterComplete() throws IOException, InterruptedException {
     Counter counter =
         Counter.build()
             .name("service_time_seconds_total")
@@ -52,14 +52,14 @@ public void testCounterComplete() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testCounterMinimal() throws IOException {
+  void testCounterMinimal() throws IOException {
     Counter.build().name("events").help("total number of events").register(origRegistry);
 
     assertThat(sort(newOpenMetrics())).isEqualTo(fixTimestamps(sort(origOpenMetrics())));
   }
 
   @Test
-  public void testGaugeComplete() throws IOException, InterruptedException {
+  void testGaugeComplete() throws IOException, InterruptedException {
     Gauge gauge =
         Gauge.build()
             .name("disk_usage_ratio")
@@ -75,7 +75,7 @@ public void testGaugeComplete() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testGaugeMinimal() throws IOException {
+  void testGaugeMinimal() throws IOException {
     Gauge gauge =
         Gauge.build()
             .name("temperature_centigrade")
@@ -88,7 +88,7 @@ public void testGaugeMinimal() throws IOException {
   }
 
   @Test
-  public void testHistogramComplete() throws IOException, InterruptedException {
+  void testHistogramComplete() throws IOException, InterruptedException {
     Histogram histogram =
         Histogram.build()
             .name("response_size_bytes")
@@ -108,14 +108,14 @@ public void testHistogramComplete() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testHistogramMinimal() throws IOException {
+  void testHistogramMinimal() throws IOException {
     Histogram.build().name("request_latency").help("request latency").register(origRegistry);
 
     assertThat(sort(newOpenMetrics())).isEqualTo(fixCounts(fixTimestamps(sort(origOpenMetrics()))));
   }
 
   @Test
-  public void testSummaryComplete() throws IOException, InterruptedException {
+  void testSummaryComplete() throws IOException, InterruptedException {
     Summary summary =
         Summary.build()
             .name("http_request_duration_seconds")
@@ -139,14 +139,14 @@ public void testSummaryComplete() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testSummaryMinimal() throws IOException {
+  void testSummaryMinimal() throws IOException {
     Summary.build().name("request_size").help("request size").register(origRegistry);
 
     assertThat(sort(newOpenMetrics())).isEqualTo(fixCounts(fixTimestamps(sort(origOpenMetrics()))));
   }
 
   @Test
-  public void testInfoComplete() throws IOException, InterruptedException {
+  void testInfoComplete() throws IOException, InterruptedException {
     Info info =
         Info.build()
             .name("version")
@@ -161,7 +161,7 @@ public void testInfoComplete() throws IOException, InterruptedException {
   }
 
   @Test
-  public void testInfoMinimal() throws IOException {
+  void testInfoMinimal() throws IOException {
     Info info = Info.build().name("jvm").help("JVM info").register(origRegistry);
     info.info("version", "17");
 
@@ -169,7 +169,7 @@ public void testInfoMinimal() throws IOException {
   }
 
   @Test
-  public void testStateSetComplete() throws IOException {
+  void testStateSetComplete() throws IOException {
     Collector stateSet =
         new Collector() {
           @Override
@@ -192,7 +192,7 @@ public List<MetricFamilySamples> collect() {
   }
 
   @Test
-  public void testUnknownComplete() throws IOException {
+  void testUnknownComplete() throws IOException {
     Collector unknown =
         new Collector() {
           @Override
diff --git a/prometheus-metrics-tracer/pom.xml b/prometheus-metrics-tracer/pom.xml
index 15ea09307..7ba9fe6f5 100644
--- a/prometheus-metrics-tracer/pom.xml
+++ b/prometheus-metrics-tracer/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-tracer</artifactId>
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml
index 573e78801..6087f3431 100644
--- a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml
+++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-metrics-tracer</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-tracer-common</artifactId>
@@ -21,4 +20,13 @@
     <automatic.module.name>io.prometheus.metrics.tracer.common</automatic.module.name>
   </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>io.prometheus</groupId>
+      <artifactId>prometheus-metrics-annotations</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/src/main/java/io/prometheus/metrics/tracer/common/SpanContext.java b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/src/main/java/io/prometheus/metrics/tracer/common/SpanContext.java
index 7d087f8b5..4da3b13ea 100644
--- a/prometheus-metrics-tracer/prometheus-metrics-tracer-common/src/main/java/io/prometheus/metrics/tracer/common/SpanContext.java
+++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-common/src/main/java/io/prometheus/metrics/tracer/common/SpanContext.java
@@ -1,7 +1,9 @@
 package io.prometheus.metrics.tracer.common;
 
+import io.prometheus.metrics.annotations.StableApi;
 import javax.annotation.Nullable;
 
+@StableApi
 public interface SpanContext {
 
   String EXEMPLAR_ATTRIBUTE_NAME = "exemplar";
@@ -25,7 +27,7 @@ public interface SpanContext {
    * @return the state of the current Span. If this value is false a component before in the chain
    *     take the decision to not record it. Subsequent calling service have to respect this value
    *     in order not to have partial TraceID with only some Span in it. This value is important to
-   *     be sure to choose a recorded Trace in Examplar sampling process
+   *     be sure to choose a recorded Trace in Exemplar sampling process
    */
   boolean isCurrentSpanSampled();
 
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml
index 2d15be029..7ff43b009 100644
--- a/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml
+++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-initializer/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-metrics-tracer</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-tracer-initializer</artifactId>
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml
index be140167d..f16bca4c6 100644
--- a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml
+++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel-agent/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-metrics-tracer</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-tracer-otel-agent</artifactId>
diff --git a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml
index 3dda51c6b..37f0e79b8 100644
--- a/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml
+++ b/prometheus-metrics-tracer/prometheus-metrics-tracer-otel/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-metrics-tracer</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>prometheus-metrics-tracer-otel</artifactId>
diff --git a/simpleclient-archive/integration_tests/it_common/pom.xml b/simpleclient-archive/integration_tests/it_common/pom.xml
index 46ec6cead..ec9d5ad1c 100644
--- a/simpleclient-archive/integration_tests/it_common/pom.xml
+++ b/simpleclient-archive/integration_tests/it_common/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_common</artifactId>
diff --git a/simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml b/simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml
index 4a70ea136..a56cd25d4 100644
--- a/simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml
+++ b/simpleclient-archive/integration_tests/it_exemplars_otel_agent/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_exemplars_otel_agent</artifactId>
diff --git a/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml b/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml
index 213dd63f7..fbea39601 100644
--- a/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml
+++ b/simpleclient-archive/integration_tests/it_exemplars_otel_sdk/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_exemplars_otel_sdk</artifactId>
diff --git a/simpleclient-archive/integration_tests/it_java_versions/pom.xml b/simpleclient-archive/integration_tests/it_java_versions/pom.xml
index 19587bcc3..a58611b73 100644
--- a/simpleclient-archive/integration_tests/it_java_versions/pom.xml
+++ b/simpleclient-archive/integration_tests/it_java_versions/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_java_versions</artifactId>
@@ -65,8 +64,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.client.it.java_versions.ExampleApplication</mainClass>
                 </transformer>
               </transformers>
diff --git a/simpleclient-archive/integration_tests/it_log4j2/pom.xml b/simpleclient-archive/integration_tests/it_log4j2/pom.xml
index 384e1de43..f432406b9 100644
--- a/simpleclient-archive/integration_tests/it_log4j2/pom.xml
+++ b/simpleclient-archive/integration_tests/it_log4j2/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_log4j2</artifactId>
@@ -81,8 +80,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>io.prometheus.client.it.log4j2.ExampleApplication</mainClass>
                 </transformer>
               </transformers>
diff --git a/simpleclient-archive/integration_tests/it_pushgateway/pom.xml b/simpleclient-archive/integration_tests/it_pushgateway/pom.xml
index 4be9bb954..36b8d75a1 100644
--- a/simpleclient-archive/integration_tests/it_pushgateway/pom.xml
+++ b/simpleclient-archive/integration_tests/it_pushgateway/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_pushgateway</artifactId>
@@ -62,8 +61,7 @@
             </goals>
             <configuration>
               <transformers>
-                <transformer
-                  implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   simpleclient-archive/integration_tests/it_pushgateway/pom.xml
                   <mainClass>io.prometheus.client.it.pushgateway.ExampleBatchJob</mainClass>
                 </transformer>
diff --git a/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml b/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml
index 0213445b4..734695ed9 100644
--- a/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml
+++ b/simpleclient-archive/integration_tests/it_servlet_jakarta_exporter_webxml/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>integration_tests</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>it_servlet_jakarta_exporter_webxml</artifactId>
diff --git a/simpleclient-archive/integration_tests/pom.xml b/simpleclient-archive/integration_tests/pom.xml
index ecaddd212..1daa97de6 100644
--- a/simpleclient-archive/integration_tests/pom.xml
+++ b/simpleclient-archive/integration_tests/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>integration_tests</artifactId>
diff --git a/simpleclient-archive/simpleclient_graphite_bridge/pom.xml b/simpleclient-archive/simpleclient_graphite_bridge/pom.xml
index 612097f25..c539a5e6e 100644
--- a/simpleclient-archive/simpleclient_graphite_bridge/pom.xml
+++ b/simpleclient-archive/simpleclient_graphite_bridge/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_graphite_bridge</artifactId>
diff --git a/simpleclient-archive/simpleclient_hibernate/pom.xml b/simpleclient-archive/simpleclient_hibernate/pom.xml
index 6c90ac93b..10d2c2924 100644
--- a/simpleclient-archive/simpleclient_hibernate/pom.xml
+++ b/simpleclient-archive/simpleclient_hibernate/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_hibernate</artifactId>
diff --git a/simpleclient-archive/simpleclient_httpserver/pom.xml b/simpleclient-archive/simpleclient_httpserver/pom.xml
index efcc225eb..3cc821908 100644
--- a/simpleclient-archive/simpleclient_httpserver/pom.xml
+++ b/simpleclient-archive/simpleclient_httpserver/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_httpserver</artifactId>
diff --git a/simpleclient-archive/simpleclient_jetty/pom.xml b/simpleclient-archive/simpleclient_jetty/pom.xml
index 8cbc5a604..924decf76 100644
--- a/simpleclient-archive/simpleclient_jetty/pom.xml
+++ b/simpleclient-archive/simpleclient_jetty/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_jetty</artifactId>
diff --git a/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml b/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml
index 2cd3ce7ed..8c8c5a82d 100644
--- a/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml
+++ b/simpleclient-archive/simpleclient_jetty_jdk8/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_jetty_jdk8</artifactId>
diff --git a/simpleclient-archive/simpleclient_log4j/pom.xml b/simpleclient-archive/simpleclient_log4j/pom.xml
index 0942c1d9d..214c5c695 100644
--- a/simpleclient-archive/simpleclient_log4j/pom.xml
+++ b/simpleclient-archive/simpleclient_log4j/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_log4j</artifactId>
diff --git a/simpleclient-archive/simpleclient_log4j2/pom.xml b/simpleclient-archive/simpleclient_log4j2/pom.xml
index 5627f0660..9669eda30 100644
--- a/simpleclient-archive/simpleclient_log4j2/pom.xml
+++ b/simpleclient-archive/simpleclient_log4j2/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_log4j2</artifactId>
diff --git a/simpleclient-archive/simpleclient_logback/pom.xml b/simpleclient-archive/simpleclient_logback/pom.xml
index 415ea5e24..e17168531 100644
--- a/simpleclient-archive/simpleclient_logback/pom.xml
+++ b/simpleclient-archive/simpleclient_logback/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_logback</artifactId>
diff --git a/simpleclient-archive/simpleclient_servlet/pom.xml b/simpleclient-archive/simpleclient_servlet/pom.xml
index 46c559b48..364b1484a 100644
--- a/simpleclient-archive/simpleclient_servlet/pom.xml
+++ b/simpleclient-archive/simpleclient_servlet/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_servlet</artifactId>
diff --git a/simpleclient-archive/simpleclient_servlet_common/pom.xml b/simpleclient-archive/simpleclient_servlet_common/pom.xml
index f50d5a8a3..7e7c8c016 100644
--- a/simpleclient-archive/simpleclient_servlet_common/pom.xml
+++ b/simpleclient-archive/simpleclient_servlet_common/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_servlet_common</artifactId>
diff --git a/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml b/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml
index e82941a38..0989f363b 100644
--- a/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml
+++ b/simpleclient-archive/simpleclient_servlet_jakarta/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_servlet_jakarta</artifactId>
diff --git a/simpleclient-archive/simpleclient_spring_web/pom.xml b/simpleclient-archive/simpleclient_spring_web/pom.xml
index 3bfc03a11..b6087f9f5 100644
--- a/simpleclient-archive/simpleclient_spring_web/pom.xml
+++ b/simpleclient-archive/simpleclient_spring_web/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_spring_web</artifactId>
diff --git a/simpleclient-archive/simpleclient_vertx/pom.xml b/simpleclient-archive/simpleclient_vertx/pom.xml
index e8442d36a..fede323e6 100644
--- a/simpleclient-archive/simpleclient_vertx/pom.xml
+++ b/simpleclient-archive/simpleclient_vertx/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_vertx</artifactId>
diff --git a/simpleclient-archive/simpleclient_vertx4/pom.xml b/simpleclient-archive/simpleclient_vertx4/pom.xml
index 0cc06340e..4c80b20f4 100644
--- a/simpleclient-archive/simpleclient_vertx4/pom.xml
+++ b/simpleclient-archive/simpleclient_vertx4/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>io.prometheus</groupId>
     <artifactId>client_java</artifactId>
-    <version>1.0.0-beta-2-SNAPSHOT</version>
+    <version>1.8.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>simpleclient_vertx4</artifactId>