From 54a1e6689530acf3d09619d1cb920f10ecdc3201 Mon Sep 17 00:00:00 2001
From: adabugra <57899270+adabugra@users.noreply.github.com>
Date: Sat, 12 Apr 2025 19:29:13 +0300
Subject: [PATCH 1/2] Add java flag to disable InstrumentationClassFinder

---
 .../src/main/java/me/lucko/spark/common/SparkPlugin.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
index 9901bdb9938..1020bf3bbbb 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
@@ -150,6 +150,9 @@ default ClassSourceLookup createClassSourceLookup() {
      * @return the class finder
      */
     default ClassFinder createClassFinder() {
+        if (Boolean.getBoolean("disableInstrumentation")) {
+            return FallbackClassFinder.INSTANCE;
+        }
         return ClassFinder.combining(
                 new InstrumentationClassFinder(this),
                 FallbackClassFinder.INSTANCE

From 9480553dabbe69f9cff7d313e6344c7f7bb0b9ef Mon Sep 17 00:00:00 2001
From: adabugra <57899270+adabugra@users.noreply.github.com>
Date: Sun, 13 Apr 2025 15:58:28 +0300
Subject: [PATCH 2/2] Updated the flag to use `spark.disableInstrumentation`
 instead of `disableInstrumentation`

---
 .../src/main/java/me/lucko/spark/common/SparkPlugin.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
index 1020bf3bbbb..a557bd17eb1 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/SparkPlugin.java
@@ -150,7 +150,7 @@ default ClassSourceLookup createClassSourceLookup() {
      * @return the class finder
      */
     default ClassFinder createClassFinder() {
-        if (Boolean.getBoolean("disableInstrumentation")) {
+        if (Boolean.getBoolean("spark.disableInstrumentation")) {
             return FallbackClassFinder.INSTANCE;
         }
         return ClassFinder.combining(