Fix internal root tracing should also be settable at runtime.

Author: chumer

truffle/src/com.oracle.truffle.api.library/snapshot.sigtest

@@ -124,7 +124,7 @@ meth public abstract java.lang.Object readDelegateExport(java.lang.Object)
 
 CLSS public abstract com.oracle.truffle.api.library.LibraryFactory<%0 extends com.oracle.truffle.api.library.Library>
 cons protected init(java.lang.Class<{com.oracle.truffle.api.library.LibraryFactory%0}>,java.util.List<com.oracle.truffle.api.library.Message>)
- anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="26.0")
+ anno 0 java.lang.Deprecated(boolean forRemoval=false, java.lang.String since="")
 cons protected init(java.lang.Class<{com.oracle.truffle.api.library.LibraryFactory%0}>,java.util.List<com.oracle.truffle.api.library.Message>,boolean)
 meth protected !varargs com.oracle.truffle.api.utilities.FinalBitSet createMessageBitSet(com.oracle.truffle.api.library.Message[])
 meth protected abstract java.lang.Class<?> getDefaultClass(java.lang.Object)

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/InternalResourceCache.java

@@ -163,7 +163,7 @@ void initializeOwningRoot(InternalResourceRoots.Root root) {
             case UNVERSIONED -> findStandaloneResourceRoot(root.path());
             case VERSIONED -> null;
         };
-        if (path != null && InternalResourceRoots.TRACE_INTERNAL_RESOURCE_EVENTS) {
+        if (path != null && InternalResourceRoots.isTraceInternalResourceEvents()) {
             /*
              * The path for the VERSIONED resource is logged when the resource is requested.
              * Computation of this path is expensive and involves a call to
@@ -254,7 +254,7 @@ private Path installResource(Function<InternalResource, InternalResource.Env> re
         }
         Path target = owningRoot.path().resolve(Path.of(sanitize(id), sanitize(resourceId), sanitize(versionHash)));
         if (!Files.exists(target)) {
-            if (InternalResourceRoots.TRACE_INTERNAL_RESOURCE_EVENTS) {
+            if (InternalResourceRoots.isTraceInternalResourceEvents()) {
                 InternalResourceRoots.logInternalResourceEvent("Resolved a directory for the internal resource %s::%s to: %s, unpacking resource files.", id, resourceId, target);
             }
             Path parent = target.getParent();
@@ -282,7 +282,7 @@ private Path installResource(Function<InternalResource, InternalResource.Env> re
                 }
             }
         } else {
-            if (InternalResourceRoots.TRACE_INTERNAL_RESOURCE_EVENTS) {
+            if (InternalResourceRoots.isTraceInternalResourceEvents()) {
                 InternalResourceRoots.logInternalResourceEvent("Resolved a directory for the internal resource %s::%s to: %s, using existing resource files.",
                                 id, resourceId, target);
             }

truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/InternalResourceRoots.java

@@ -65,7 +65,7 @@ final class InternalResourceRoots {
     private static final String PROPERTY_RESOURCE_PATH = "polyglot.engine.resourcePath";
     private static final String PROPERTY_USER_RESOURCE_CACHE = "polyglot.engine.userResourceCache";
     private static final Map<Collection<EngineAccessor.AbstractClassLoaderSupplier>, InternalResourceRoots> runtimeCaches = new ConcurrentHashMap<>();
-    static final boolean TRACE_INTERNAL_RESOURCE_EVENTS = Boolean.getBoolean("polyglotimpl.TraceInternalResources");
+    private static final boolean TRACE_INTERNAL_RESOURCE_EVENTS = Boolean.getBoolean("polyglotimpl.TraceInternalResources");
 
     static String overriddenComponentRootProperty(String componentId) {
         StringBuilder builder = new StringBuilder(PROPERTY_RESOURCE_PATH);
@@ -253,7 +253,7 @@ private static Pair<Path, Root.Kind> findDefaultRoot() {
             root = findCacheRootDefault();
             kind = Root.Kind.VERSIONED;
         }
-        if (TRACE_INTERNAL_RESOURCE_EVENTS) {
+        if (isTraceInternalResourceEvents()) {
             logInternalResourceEvent("Resolved the root directory for the internal resource cache to: %s, determined by the %s with the value %s.",
                             root.path(), root.hint(), root.hintValue());
         }
@@ -347,8 +347,16 @@ private static ResolvedCacheFolder findCacheRootDefault() {
         return container.resolve("org.graalvm.polyglot");
     }
 
+    static boolean isTraceInternalResourceEvents() {
+        /*
+         * In AOT we want to enable tracing if its enabled in the built image or using the option at
+         * runtime.
+         */
+        return TRACE_INTERNAL_RESOURCE_EVENTS || (TruffleOptions.AOT && Boolean.getBoolean("polyglotimpl.TraceInternalResources"));
+    }
+
     static void logInternalResourceEvent(String message, Object... args) {
-        assert TRACE_INTERNAL_RESOURCE_EVENTS : "need to check for TRACE_INTERNAL_RESOURCE_EVENTS before use";
+        assert isTraceInternalResourceEvents() : "need to check for TRACE_INTERNAL_RESOURCE_EVENTS before use";
         PolyglotEngineImpl.logFallback(String.format("[engine][resource] " + message + "%n", args));
     }