From afb434da9da79b53da1ea4c7bcc00571dbea6d3f Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Tue, 5 Jul 2022 04:45:42 -0700
Subject: [PATCH] Fix behavior of `print()` in module extensions

Previously, messages printed with `print()` didn't have the usual
`DEBUG:` prefix.

Fixes #14526

Closes #15795.

PiperOrigin-RevId: 459052873
Change-Id: I1b75498d448aaae137dd63ea0a418572097bdac2
---
 .../build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java     | 2 ++
 1 file changed, 2 insertions(+)

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
index 8611b8bc08cd01..a2da5c8513069d 100644
--- 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);