From 6a57268f883fe4e2cc6d75b3daa3c841894e5a3d Mon Sep 17 00:00:00 2001
From: Jason Plumb <jplumb@splunk.com>
Date: Thu, 5 Dec 2024 14:55:59 -0800
Subject: [PATCH 1/2] remove v1.7.x base branch (main is the place again)

---
 .github/renovate.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index bb4ce2e2..8f7be0e9 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -3,7 +3,7 @@
   "extends": [
     "config:base"
   ],
-  "baseBranches": ["main", "v1.7.x"],
+  "baseBranches": ["main"],
   "packageRules": [
     {
       "matchPackageNames": [

From da69442a3112a200003d224b0d803d075c76d42e Mon Sep 17 00:00:00 2001
From: Jason Plumb <jplumb@splunk.com>
Date: Thu, 5 Dec 2024 15:00:12 -0800
Subject: [PATCH 2/2] pin upstream otel version

---
 .github/renovate.json5 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 8f7be0e9..f37655ea 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -5,6 +5,14 @@
   ],
   "baseBranches": ["main"],
   "packageRules": [
+    {
+      // Don't bump upstream otel versions
+      "matchPackagePatterns": [
+        "^io.opentelemetry",
+        "^io.opentelemetry.instrumentation"
+      ],
+      "enabled": false
+    },
     {
       "matchPackageNames": [
         "io.opentelemetry:opentelemetry-api-incubator",
@@ -18,15 +26,6 @@
       // stable version of opentelemetry-instrumentation-bom-alpha so this logic doesn't apply
       "ignoreUnstable": false
     },
-    {
-      // Don't bump to 2.x in the 1.x line
-      "matchUpdateTypes": ["major"],
-      "matchPackagePatterns": [
-        "^io.opentelemetry.instrumentation"
-      ],
-      "matchBaseBranches": ["v1.7.x"],
-      "enabled": false
-    },
     {
       // navigation-fragment 2.7.0 and above require android api 34+, which we are not ready for
       // yet due to android gradle plugin only supporting min 33.