From ce940e4c39ae470f5044cc5e1edcbfcfb70ce0f3 Mon Sep 17 00:00:00 2001
From: ADITYA-CODE-SOURCE <adityavishe67@gmail.com>
Date: Tue, 9 Jun 2026 19:21:50 +0530
Subject: [PATCH] test: switch Micrometer compatibility workflow to upstream
 only

Signed-off-by: ADITYA-CODE-SOURCE <adityavishe67@gmail.com>
---
 .github/renovate-tracked-deps.json            |  3 +-
 .github/renovate.json5                        |  8 -----
 .../workflows/micrometer-compatibility.yml    | 34 ++-----------------
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/.github/renovate-tracked-deps.json b/.github/renovate-tracked-deps.json
index eebbdf0d6..c0acb2e6b 100644
--- a/.github/renovate-tracked-deps.json
+++ b/.github/renovate-tracked-deps.json
@@ -59,8 +59,7 @@
     ".github/workflows/micrometer-compatibility.yml": {
       "regex": [
         "micrometer-metrics/micrometer",
-        "mise",
-        "zeitlinger/micrometer"
+        "mise"
       ]
     },
     ".github/workflows/native-tests.yml": {
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index ae1be2747..3db1bc989 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -85,13 +85,5 @@
          "# 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/workflows/micrometer-compatibility.yml b/.github/workflows/micrometer-compatibility.yml
index 5ed33e660..3abea143b 100644
--- a/.github/workflows/micrometer-compatibility.yml
+++ b/.github/workflows/micrometer-compatibility.yml
@@ -9,23 +9,7 @@ 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.0
-          - 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: 09f32142f06b11a88afe41eab50daaf6c8d08efb
     steps:
       - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
@@ -43,19 +27,7 @@ jobs:
       - name: Run Micrometer compatibility tests
         working-directory: .mise/envs/micrometer
         env:
-          MICROMETER_REPOSITORY: ${{ matrix.repository }}
-          MICROMETER_REF: ${{ matrix.ref }}
+          MICROMETER_REPOSITORY: micrometer-metrics/micrometer
+          # renovate: datasource=github-releases depName=micrometer-metrics/micrometer packageName=micrometer-metrics/micrometer
+          MICROMETER_REF: v1.17.0
         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