From bb51294c0934b9f85a86de6cea154e03f6ab286e Mon Sep 17 00:00:00 2001
From: Hubert Plociniczak <hubert.plociniczak@gmail.com>
Date: Fri, 28 Feb 2025 10:44:11 +0100
Subject: [PATCH] Fix minor issues discovered in native-image (#12379)

* Fix minor issues discovered in native-image

Bugs have been reported by first users of NI.

* nit
---
 .../execution/JobExecutionEngine.scala        |  8 ++++-
 .../org/enso/base/proxy-config.json           |  7 ++++
 .../org/enso/base/reflect-config.json         | 36 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/proxy-config.json

diff --git a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala
index d5b528a11ee8..122e6c2fe8c1 100644
--- a/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala
+++ b/engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala
@@ -9,7 +9,7 @@ import org.enso.text.Sha3_224VersionCalculator
 import java.util
 import java.util.{Collections, UUID}
 import java.util.concurrent.atomic.AtomicReference
-import java.util.concurrent.{ExecutorService, TimeUnit}
+import java.util.concurrent.{CancellationException, ExecutorService, TimeUnit}
 import java.util.logging.Level
 import scala.concurrent.{Future, Promise, TimeoutException}
 import scala.util.control.NonFatal
@@ -131,6 +131,12 @@ final class JobExecutionEngine(
               }
               logger.log(Level.WARNING, sb.toString())
               runningJob.future.cancel(runningJob.job.mayInterruptIfRunning)
+            case _: CancellationException =>
+              logger.log(
+                Level.FINE,
+                "Job `{}` was cancelled by an external task",
+                runningJob.id
+              )
             case e: Throwable =>
               logger.log(
                 Level.WARNING,
diff --git a/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/proxy-config.json b/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/proxy-config.json
new file mode 100644
index 000000000000..90c6d07774af
--- /dev/null
+++ b/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/proxy-config.json
@@ -0,0 +1,7 @@
+[
+    {
+        "interfaces": [
+            "org.enso.base.enso_cloud.AuthenticationProvider$AuthenticationService"
+        ]
+    }
+]
diff --git a/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/reflect-config.json b/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/reflect-config.json
index 73456fcbe6f2..49c1bb3d740f 100644
--- a/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/reflect-config.json
+++ b/std-bits/base/src/main/resources/META-INF/native-image/org/enso/base/reflect-config.json
@@ -321,5 +321,41 @@
                 ]
             }
         ]
+    },
+    {
+        "name": "org.slf4j.Logger",
+        "methods": [
+            {
+                "name": "info",
+                "parameterTypes": [
+                    "java.lang.String"
+                ]
+            },
+            {
+                "name": "debug",
+                "parameterTypes": [
+                    "java.lang.String"
+                ]
+            },
+            {
+                "name": "error",
+                "parameterTypes": [
+                    "java.lang.String"
+                ]
+            },
+            {
+                "name": "warn",
+                "parameterTypes": [
+                    "java.lang.String"
+                ]
+            },
+            {
+                "name": "trace",
+                "parameterTypes": [
+                    "java.lang.String"
+                ]
+            }
+
+        ]
     }
 ]