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
enso-org · Feb 28, 2025 · bb51294 · bb51294
1 parent 1574089
commit bb51294
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 1 deletion.
diff --git a/...-common/src/main/scala/org/enso/interpreter/instrument/execution/JobExecutionEngine.scala b/...-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
@@ -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
@@ -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"
+                ]
+            }
+
+        ]
     }
 ]