Fix behavior of print() in module extensions

fmeum · copybara-github · commit afb434da9da7 · 2022-07-05T04:46:55.000-07:00
Previously, messages printed with `print()` didn't have the usual `DEBUG:` prefix. Fixes #14526 Closes #15795. PiperOrigin-RevId: 459052873 Change-Id: I1b75498d448aaae137dd63ea0a418572097bdac2
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java
@@ -85,6 +85,7 @@ public void setRepositoryRemoteExecutor(RepositoryRemoteExecutor repositoryRemot
     this.repositoryRemoteExecutor = repositoryRemoteExecutor;
   }
 
+  @Nullable
   @Override
   public SkyValue compute(SkyKey skyKey, Environment env)
       throws SkyFunctionException, InterruptedException {
@@ -165,6 +166,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
     try (Mutability mu =
         Mutability.create("module extension", usagesValue.getExtensionUniqueName())) {
       StarlarkThread thread = new StarlarkThread(mu, starlarkSemantics);
+      thread.setPrintHandler(Event.makeDebugPrintHandler(env.getListener()));
       ModuleExtensionContext moduleContext =
           createContext(env, usagesValue, starlarkSemantics, extension);
       threadContext.storeInThread(thread);
