gnodet-bot commented on code in PR #13700:
URL: https://github.com/apache/maven/pull/13700#discussion_r4369978580
##########
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java:
##########
@@ -190,52 +201,40 @@ protected int doInvoke(C context) throws Exception {
}
protected InvokerException.ExitException handleException(C context,
Exception e) {
- printErrors(
- context,
- context.options().showErrors().orElse(false),
- List.of(new Logger.Entry(Logger.Level.ERROR, e.getMessage(),
e.getCause())),
- context.logger);
- return new InvokerException.ExitException(2);
- }
-
- protected void printErrors(C context, boolean showStackTrace,
List<Logger.Entry> entries, Logger logger) {
- // if accumulating logger passed, this is "early failure", swap logger
for stdErr and use that to emit log
- if (logger instanceof AccumulatingLogger) {
- logger = new
SystemLogger(context.invokerRequest.stdErr().orElse(null));
- }
- // this is important message; many Maven IT assert for presence of
this message
+ Logger logger = context.logger;
logger.error("Error executing " +
context.invokerRequest.parserRequest().commandName() + ".");
- for (Logger.Entry entry : entries) {
- if (showStackTrace) {
- logger.log(entry.level(), entry.message(), entry.error());
- } else {
- logger.error(entry.message());
- for (Throwable cause = entry.error();
- cause != null && cause != cause.getCause();
- cause = cause.getCause()) {
- logger.log(entry.level(), "Caused by: " +
cause.getMessage());
- }
+ boolean showStackTrace = context.options().showErrors().orElse(false);
+ if (showStackTrace) {
+ logger.error(e.getMessage(), e.getCause());
Review Comment:
⚠️ **NPE risk: `e.getMessage()` can return `null`**
The previous `printError` method guarded against null messages with `message
!= null ? message : ""`. The refactored code removed that guard.
`Exception.getMessage()` returns `null` for exceptions constructed without a
message (e.g. `new NullPointerException()`). Passing null to the Logger
implementations will either NPE inside the logger or print literal `"null"` —
neither is acceptable.
```suggestion
logger.error(e.getMessage() != null ? e.getMessage() : "",
e.getCause());
```
##########
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java:
##########
@@ -190,52 +201,40 @@ protected int doInvoke(C context) throws Exception {
}
protected InvokerException.ExitException handleException(C context,
Exception e) {
- printErrors(
- context,
- context.options().showErrors().orElse(false),
- List.of(new Logger.Entry(Logger.Level.ERROR, e.getMessage(),
e.getCause())),
- context.logger);
- return new InvokerException.ExitException(2);
- }
-
- protected void printErrors(C context, boolean showStackTrace,
List<Logger.Entry> entries, Logger logger) {
- // if accumulating logger passed, this is "early failure", swap logger
for stdErr and use that to emit log
- if (logger instanceof AccumulatingLogger) {
- logger = new
SystemLogger(context.invokerRequest.stdErr().orElse(null));
- }
- // this is important message; many Maven IT assert for presence of
this message
+ Logger logger = context.logger;
logger.error("Error executing " +
context.invokerRequest.parserRequest().commandName() + ".");
- for (Logger.Entry entry : entries) {
- if (showStackTrace) {
- logger.log(entry.level(), entry.message(), entry.error());
- } else {
- logger.error(entry.message());
- for (Throwable cause = entry.error();
- cause != null && cause != cause.getCause();
- cause = cause.getCause()) {
- logger.log(entry.level(), "Caused by: " +
cause.getMessage());
- }
+ boolean showStackTrace = context.options().showErrors().orElse(false);
+ if (showStackTrace) {
+ logger.error(e.getMessage(), e.getCause());
+ } else {
+ logger.error(e.getMessage());
Review Comment:
⚠️ **Same NPE risk on the non-stacktrace path**
```suggestion
logger.error(e.getMessage() != null ? e.getMessage() : "");
```
##########
api/maven-api-log/src/main/java/org/apache/maven/api/logging/BootstrapLoggerManager.java:
##########
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.api.logging;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * Minimal {@link LoggerManager} active during early bootstrap, before
+ * the real implementation (from {@code maven-logging}) is available.
+ * <p>
+ * Accepts all log levels and buffers events in a lock-free queue.
+ * When the real manager is discovered (via {@link java.util.ServiceLoader}
+ * or {@link LoggerManager#set(LoggerManager)}), buffered events are
+ * drained into the real manager's sink in FIFO order, and any pending
+ * configuration (root log level) is forwarded.
+ */
+final class BootstrapLoggerManager implements LoggerManager {
+
+ private final ConcurrentLinkedQueue<LogEvent> events = new
ConcurrentLinkedQueue<>();
+ private volatile LogLevel pendingRootLevel;
+
+ @Override
+ public Logger getLogger(String name) {
+ return new BootstrapLogger(this, name);
+ }
+
+ @Override
+ public LogSink getLogSink() {
+ return null;
+ }
+
+ @Override
+ public void setLogSink(LogSink sink) {
+ // ignored during bootstrap
+ }
+
+ @Override
+ public boolean isLevelEnabled(String loggerName, LogLevel level) {
+ return true;
+ }
+
+ @Override
+ public void setRootLoggerLevel(LogLevel level) {
+ this.pendingRootLevel = level;
+ }
+
+ @Override
+ public void reconfigure() {
+ // no-op during bootstrap
+ }
+
+ @Override
+ public boolean hasReached(LogLevel level) {
+ return false;
+ }
+
+ void buffer(LogEvent event) {
+ events.add(event);
+ }
+
+ void drainTo(LoggerManager target) {
+ if (pendingRootLevel != null) {
+ target.setRootLoggerLevel(pendingRootLevel);
+ }
+ LogSink sink = target.getLogSink();
+ if (sink != null) {
+ LogEvent event;
+ while ((event = events.poll()) != null) {
+ sink.accept(event);
+ }
+ }
+ }
Review Comment:
⚠️ **Silent event loss when real manager has no `LogSink`**
`drainTo()` only replays events if `target.getLogSink()` returns non-null.
`getLogSink()` has no `@Nonnull` contract, so returning `null` is a valid
implementation choice. If the real manager (e.g. one routing directly through
SLF4J) returns `null`, all buffered bootstrap events are silently discarded.
Any embedder that calls `LoggerManager.set(myManager)` during early startup
will lose those messages with no indication.
Fix: replay through the Logger API as fallback when no sink is available:
```suggestion
void drainTo(LoggerManager target) {
if (pendingRootLevel != null) {
target.setRootLoggerLevel(pendingRootLevel);
}
LogSink sink = target.getLogSink();
LogEvent event;
while ((event = events.poll()) != null) {
if (sink != null) {
sink.accept(event);
} else {
// Fallback: replay via Logger API so no events are silently
lost
target.getLogger(event.loggerName()).at(event.level()).withThrowable(event.throwable()).log(event.message());
}
}
}
```
##########
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java:
##########
@@ -190,52 +201,40 @@ protected int doInvoke(C context) throws Exception {
}
protected InvokerException.ExitException handleException(C context,
Exception e) {
- printErrors(
- context,
- context.options().showErrors().orElse(false),
- List.of(new Logger.Entry(Logger.Level.ERROR, e.getMessage(),
e.getCause())),
- context.logger);
- return new InvokerException.ExitException(2);
- }
-
- protected void printErrors(C context, boolean showStackTrace,
List<Logger.Entry> entries, Logger logger) {
- // if accumulating logger passed, this is "early failure", swap logger
for stdErr and use that to emit log
- if (logger instanceof AccumulatingLogger) {
- logger = new
SystemLogger(context.invokerRequest.stdErr().orElse(null));
- }
- // this is important message; many Maven IT assert for presence of
this message
+ Logger logger = context.logger;
logger.error("Error executing " +
context.invokerRequest.parserRequest().commandName() + ".");
- for (Logger.Entry entry : entries) {
- if (showStackTrace) {
- logger.log(entry.level(), entry.message(), entry.error());
- } else {
- logger.error(entry.message());
- for (Throwable cause = entry.error();
- cause != null && cause != cause.getCause();
- cause = cause.getCause()) {
- logger.log(entry.level(), "Caused by: " +
cause.getMessage());
- }
+ boolean showStackTrace = context.options().showErrors().orElse(false);
+ if (showStackTrace) {
+ logger.error(e.getMessage(), e.getCause());
+ } else {
+ logger.error(e.getMessage());
+ for (Throwable cause = e.getCause(); cause != null && cause !=
cause.getCause(); cause = cause.getCause()) {
+ logger.error("Caused by: " + cause.getMessage());
Review Comment:
⚠️ **`cause.getMessage()` can also be `null`**
```suggestion
logger.error("Caused by: " + (cause.getMessage() != null ?
cause.getMessage() : ""));
```
##########
impl/maven-core/src/main/java/org/apache/maven/internal/build/BuildReportCollector.java:
##########
@@ -0,0 +1,644 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.internal.build;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.maven.api.BuildInvocation;
+import org.apache.maven.api.MonotonicClock;
+import org.apache.maven.api.build.report.BuildReport;
+import org.apache.maven.api.build.report.BuildStatus;
+import org.apache.maven.api.build.report.FailureReport;
+import org.apache.maven.api.build.report.ModuleReport;
+import org.apache.maven.api.build.report.MojoReport;
+import org.apache.maven.api.logging.LogEvent;
+import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.BuildFailure;
+import org.apache.maven.execution.BuildSuccess;
+import org.apache.maven.execution.BuildSummary;
+import org.apache.maven.execution.ExecutionEvent;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.logging.ProjectBuildLogAppender;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
+/**
+ * Collects build lifecycle events and produces a structured {@link
BuildReport}
+ * at the end of the session.
+ * <p>
+ * Registered as an {@link org.apache.maven.eventspy.EventSpy} via {@code
@Named}/{@code @Singleton},
+ * following the same pattern as {@code DefaultPluginValidationManager}.
+ * <p>
+ * Thread-safe: concurrent module builds (with {@code -T}) each write to their
+ * own entry in a {@link ConcurrentHashMap}.
+ * <p>
+ * Log capture: registers a callback on {@link ProjectBuildLogAppender} to
+ * receive the already-formed {@link LogEvent} objects produced by the main
+ * logging pipeline. Uses thread-based tracking to associate events with
+ * the currently-executing mojo or module.
+ *
+ * @since 4.1.0
+ */
+@Singleton
+@Named
+public final class BuildReportCollector extends AbstractEventSpy {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(BuildReportCollector.class);
+
+ static final String REPORT_DIR = "build-reports";
+ static final String REPORT_LATEST = "build-report-latest.json";
+ static final String TRACE_ID_MDC_KEY = "otel.trace_id";
+ static final String SPAN_ID_MDC_KEY = "otel.span_id";
+
+ private static final int MAX_STACKTRACE_LINES = 30;
+
+ /**
+ * Maximum number of log events captured per scope (mojo, module, or
build).
+ * Beyond this, events are silently dropped to prevent unbounded memory
growth.
+ */
+ static final int MAX_LOG_EVENTS_PER_SCOPE = 500;
+
+ // ---- Mutable state, populated during the build ----
+
+ /** Per-project mojo tracking: project key -> list of in-flight/completed
mojos. */
+ private final Map<String, List<MojoTiming>> mojoTimings = new
ConcurrentHashMap<>();
+
+ /** Per-project start instants for duration computation. */
+ private final Map<String, Instant> projectStartTimes = new
ConcurrentHashMap<>();
+
+ /** Per-project trace context captured when the project starts. */
+ private final Map<String, TraceContext> projectTraceContexts = new
ConcurrentHashMap<>();
+
+ /** Per-mojo start instants for duration computation. */
+ private final Map<String, Instant> mojoStartTimes = new
ConcurrentHashMap<>();
+
+ /** Per-mojo trace context captured when the mojo starts. */
+ private final Map<String, TraceContext> mojoTraceContexts = new
ConcurrentHashMap<>();
+
+ /** Session-level state - set once on SessionStarted. */
+ private volatile MavenSession session;
+
+ /** Build environment - captured once at SessionStarted, immutable
thereafter. */
+ private volatile BuildInvocation buildEnvironment;
+
+ // ---- Log capture state ----
+
+ /**
+ * Maps thread ID -> mojo key for the currently-executing mojo on that
thread.
+ * Lifecycle events and mojo execution run on the same thread, so this is
safe
+ * for parallel builds with {@code -T}.
+ */
+ private final Map<Long, String> currentMojoByThread = new
ConcurrentHashMap<>();
+
+ /** Per-mojo log buffers: mojo key -> captured log events. */
+ private final Map<String, List<LogEvent>> mojoLogBuffers = new
ConcurrentHashMap<>();
+
+ /**
+ * Maps thread ID -> project key for the currently-building project on
that thread.
+ * Used to route log events that occur between mojo executions to the
module-level buffer.
+ */
+ private final Map<Long, String> currentProjectByThread = new
ConcurrentHashMap<>();
+
+ /** Per-module log buffers: project key -> events captured outside any
mojo. */
+ private final Map<String, List<LogEvent>> moduleLogBuffers = new
ConcurrentHashMap<>();
+
+ /** Build-level log buffer: events captured outside any module lifecycle.
*/
+ private final List<LogEvent> buildLogBuffer =
Collections.synchronizedList(new ArrayList<>());
+
+ @Override
+ public void onEvent(Object event) {
+ if (event instanceof ExecutionEvent executionEvent) {
+ switch (executionEvent.getType()) {
+ case SessionStarted:
+ onSessionStarted(executionEvent);
+ break;
+ case SessionEnded:
+ onSessionEnded(executionEvent);
+ break;
+ case ProjectStarted:
+ onProjectStarted(executionEvent);
+ break;
+ case ProjectSucceeded:
+ case ProjectFailed:
+ case ProjectSkipped:
+ onProjectFinished(executionEvent);
+ break;
+ case MojoStarted:
+ onMojoStarted(executionEvent);
+ break;
+ case MojoSucceeded:
+ case MojoFailed:
+ onMojoFinished(executionEvent);
+ break;
+ case MojoSkipped:
+ onMojoSkipped(executionEvent);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ // ---- Event handlers ----
+
+ private void onSessionStarted(ExecutionEvent event) {
+ this.session = event.getSession();
+ this.buildEnvironment = DefaultBuildInvocation.from(this.session);
+ installLogCapture();
+ }
+
+ private void onSessionEnded(ExecutionEvent event) {
+ removeLogCapture();
+
+ MavenSession endSession = event.getSession();
+ if (endSession == null) {
+ return;
+ }
+
+ try {
+ BuildReport report = buildReport(endSession);
+ writeReport(report, endSession);
+ } catch (Exception e) {
+ // Never let the report collector crash the build
+ LOGGER.debug("Failed to produce build report: {}", e.getMessage(),
e);
+ }
+ }
+
+ private void onProjectStarted(ExecutionEvent event) {
+ String key = projectKey(event.getProject());
+ projectStartTimes.put(key, MonotonicClock.now());
+ projectTraceContexts.put(key, currentTraceContext());
+ mojoTimings.putIfAbsent(key, Collections.synchronizedList(new
ArrayList<>()));
+ moduleLogBuffers.put(key, Collections.synchronizedList(new
ArrayList<>()));
+ currentProjectByThread.put(Thread.currentThread().getId(), key);
+ }
+
+ private void onProjectFinished(ExecutionEvent event) {
+ // Unregister the project from this thread so subsequent log events
+ // fall through to the build-level buffer
+ currentProjectByThread.remove(Thread.currentThread().getId());
+ }
+
+ private void onMojoStarted(ExecutionEvent event) {
+ String mKey = mojoKey(event.getProject(), event.getMojoExecution());
+ mojoStartTimes.put(mKey, MonotonicClock.now());
+ mojoTraceContexts.put(mKey, currentTraceContext());
+
+ // Register the current mojo for this thread so the log event sink
+ // can associate events with this mojo execution
+ currentMojoByThread.put(Thread.currentThread().getId(), mKey);
+ mojoLogBuffers.put(mKey, Collections.synchronizedList(new
ArrayList<>()));
+ }
+
+ private void onMojoFinished(ExecutionEvent event) {
+ MojoExecution mojo = event.getMojoExecution();
+ MavenProject project = event.getProject();
+ String mKey = mojoKey(project, mojo);
+ String pKey = projectKey(project);
+
+ // Unregister the mojo from this thread
+ currentMojoByThread.remove(Thread.currentThread().getId());
+
+ Instant now = MonotonicClock.now();
+ Instant startInstant = mojoStartTimes.remove(mKey);
+ TraceContext traceContext = mojoTraceContexts.remove(mKey);
+ if (traceContext == null) {
+ traceContext = TraceContext.EMPTY;
+ }
+ if (startInstant == null) {
+ startInstant = now;
+ }
+ Duration duration = Duration.between(startInstant, now);
+
+ BuildStatus status =
+ event.getType() == ExecutionEvent.Type.MojoSucceeded ?
BuildStatus.SUCCESS : BuildStatus.FAILURE;
+
+ // Drain the log buffer for this mojo
+ List<LogEvent> logBuffer = mojoLogBuffers.remove(mKey);
+ List<LogEvent> output = logBuffer != null ? List.copyOf(logBuffer) :
List.of();
+
+ MojoTiming timing = new MojoTiming(
+ mojo.getGroupId(),
+ mojo.getArtifactId(),
+ mojo.getVersion(),
+ mojo.getGoal(),
+ mojo.getExecutionId(),
+ mojo.getLifecyclePhase(),
+ status,
+ startInstant,
+ duration,
+ traceContext.traceId,
+ traceContext.spanId,
+ output);
+
+ mojoTimings
+ .computeIfAbsent(pKey, k -> Collections.synchronizedList(new
ArrayList<>()))
+ .add(timing);
+ }
+
+ private void onMojoSkipped(ExecutionEvent event) {
+ MojoExecution mojo = event.getMojoExecution();
+ MavenProject project = event.getProject();
+ String pKey = projectKey(project);
+
+ Instant now = MonotonicClock.now();
+ TraceContext traceContext = TraceContext.EMPTY;
+
+ MojoTiming timing = new MojoTiming(
+ mojo.getGroupId(),
+ mojo.getArtifactId(),
+ mojo.getVersion(),
+ mojo.getGoal(),
+ mojo.getExecutionId(),
+ mojo.getLifecyclePhase(),
+ BuildStatus.SKIPPED,
+ now,
+ Duration.ZERO,
+ traceContext.traceId,
+ traceContext.spanId,
+ List.of());
+
+ mojoTimings
+ .computeIfAbsent(pKey, k -> Collections.synchronizedList(new
ArrayList<>()))
+ .add(timing);
+ }
+
+ // ---- Structured log capture ----
+
+ /**
+ * Registers a callback on {@link ProjectBuildLogAppender} to receive the
+ * already-formed {@link LogEvent} objects from the main logging pipeline.
+ * This eliminates the need for a separate capture path and ensures the
+ * build report captures the same enriched events (with sequence number,
+ * source metadata) as the console output.
+ */
+ private void installLogCapture() {
+ ProjectBuildLogAppender.setReportCapture(this::captureLogEvent);
+ }
+
+ private void removeLogCapture() {
+ ProjectBuildLogAppender.setReportCapture(null);
+ }
+
+ /**
+ * Routes a pre-formed {@link LogEvent} to the appropriate buffer
+ * (mojo, module, or build-level) based on the current thread's
+ * lifecycle context.
+ */
+ private void captureLogEvent(LogEvent event) {
+ long threadId = Thread.currentThread().getId();
+
+ // 1. Mojo-level: event belongs to the currently-executing mojo on
this thread
+ String mKey = currentMojoByThread.get(threadId);
+ if (mKey != null) {
+ List<LogEvent> buffer = mojoLogBuffers.get(mKey);
+ if (buffer != null && buffer.size() < MAX_LOG_EVENTS_PER_SCOPE) {
+ buffer.add(event);
+ }
+ return;
+ }
+
+ // 2. Module-level: project is active but no mojo is running
+ String pKey = currentProjectByThread.get(threadId);
+ if (pKey != null) {
+ List<LogEvent> buffer = moduleLogBuffers.get(pKey);
+ if (buffer != null && buffer.size() < MAX_LOG_EVENTS_PER_SCOPE) {
+ buffer.add(event);
Review Comment:
⚠️ **Same TOCTOU race on module log buffer** — still not fixed from the
previous review.
Apply the same `synchronized(buffer)` fix as the mojo buffer above.
```suggestion
if (buffer != null) {
synchronized (buffer) {
if (buffer.size() < MAX_LOG_EVENTS_PER_SCOPE) {
buffer.add(event);
}
}
}
```
##########
impl/maven-core/src/main/java/org/apache/maven/internal/build/BuildReportCollector.java:
##########
@@ -0,0 +1,644 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.internal.build;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.maven.api.BuildInvocation;
+import org.apache.maven.api.MonotonicClock;
+import org.apache.maven.api.build.report.BuildReport;
+import org.apache.maven.api.build.report.BuildStatus;
+import org.apache.maven.api.build.report.FailureReport;
+import org.apache.maven.api.build.report.ModuleReport;
+import org.apache.maven.api.build.report.MojoReport;
+import org.apache.maven.api.logging.LogEvent;
+import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.BuildFailure;
+import org.apache.maven.execution.BuildSuccess;
+import org.apache.maven.execution.BuildSummary;
+import org.apache.maven.execution.ExecutionEvent;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.logging.ProjectBuildLogAppender;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
+/**
+ * Collects build lifecycle events and produces a structured {@link
BuildReport}
+ * at the end of the session.
+ * <p>
+ * Registered as an {@link org.apache.maven.eventspy.EventSpy} via {@code
@Named}/{@code @Singleton},
+ * following the same pattern as {@code DefaultPluginValidationManager}.
+ * <p>
+ * Thread-safe: concurrent module builds (with {@code -T}) each write to their
+ * own entry in a {@link ConcurrentHashMap}.
+ * <p>
+ * Log capture: registers a callback on {@link ProjectBuildLogAppender} to
+ * receive the already-formed {@link LogEvent} objects produced by the main
+ * logging pipeline. Uses thread-based tracking to associate events with
+ * the currently-executing mojo or module.
+ *
+ * @since 4.1.0
+ */
+@Singleton
+@Named
+public final class BuildReportCollector extends AbstractEventSpy {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(BuildReportCollector.class);
+
+ static final String REPORT_DIR = "build-reports";
+ static final String REPORT_LATEST = "build-report-latest.json";
+ static final String TRACE_ID_MDC_KEY = "otel.trace_id";
+ static final String SPAN_ID_MDC_KEY = "otel.span_id";
+
+ private static final int MAX_STACKTRACE_LINES = 30;
+
+ /**
+ * Maximum number of log events captured per scope (mojo, module, or
build).
+ * Beyond this, events are silently dropped to prevent unbounded memory
growth.
+ */
+ static final int MAX_LOG_EVENTS_PER_SCOPE = 500;
Review Comment:
⚠️ **Silent log-event truncation — consumers cannot detect incomplete
lists** — still not fixed from the previous review.
Events beyond `MAX_LOG_EVENTS_PER_SCOPE = 500` are silently dropped. The
Javadoc on `MojoReport.output()` says "The list may be truncated" but there is
no programmatic `truncated: boolean` flag. Any consumer relying on log
completeness (CI systems, LLM agents, error reporting tools) receives an
incomplete list with no way to detect it. Add a `truncated` field to
`MojoReport` (and similarly to `ModuleReport`) that the collector sets to
`true` when the cap is hit.
##########
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/LookupInvoker.java:
##########
@@ -418,17 +433,18 @@ protected void
doConfigureWithTerminalWithRawStreamsEnabled(C context) {
* Override this method to add some special handling for "raw streams"
<em>disabled</em> option.
*/
protected void doConfigureWithTerminalWithRawStreamsDisabled(C context) {
- MavenSimpleLogger stdout = (MavenSimpleLogger)
context.loggerFactory.getLogger("stdout");
- MavenSimpleLogger stderr = (MavenSimpleLogger)
context.loggerFactory.getLogger("stderr");
- stdout.setLogLevel(LocationAwareLogger.INFO_INT);
- stderr.setLogLevel(LocationAwareLogger.INFO_INT);
- PrintStream psOut = new LoggingOutputStream(s -> stdout.info("[stdout]
" + s)).printStream();
+ LoggerManager mgr = LoggerManager.get();
+ if (mgr == null) {
Review Comment:
⚠️ **Dead null-check contradicts `@Nonnull` API contract**
`LoggerManager.get()` is annotated `@Nonnull` and documented `@return the
global manager, never null`. The implementation always returns either the real
manager or a `BootstrapLoggerManager` — it never returns `null`. This `if (mgr
== null)` guard is dead code.
The problem: it looks like defensive programming, but it silently swallows a
contract violation. If `get()` ever returned `null`, skipping stdout/stderr
redirection without any message makes the failure invisible. Remove the guard —
it misleads readers and contradicts the declared contract.
```suggestion
protected void doConfigureWithTerminalWithRawStreamsDisabled(C context) {
LoggerManager mgr = LoggerManager.get();
```
##########
impl/maven-core/src/main/java/org/apache/maven/internal/build/BuildReportCollector.java:
##########
@@ -0,0 +1,644 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.internal.build;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.maven.api.BuildInvocation;
+import org.apache.maven.api.MonotonicClock;
+import org.apache.maven.api.build.report.BuildReport;
+import org.apache.maven.api.build.report.BuildStatus;
+import org.apache.maven.api.build.report.FailureReport;
+import org.apache.maven.api.build.report.ModuleReport;
+import org.apache.maven.api.build.report.MojoReport;
+import org.apache.maven.api.logging.LogEvent;
+import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.BuildFailure;
+import org.apache.maven.execution.BuildSuccess;
+import org.apache.maven.execution.BuildSummary;
+import org.apache.maven.execution.ExecutionEvent;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.logging.ProjectBuildLogAppender;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
+/**
+ * Collects build lifecycle events and produces a structured {@link
BuildReport}
+ * at the end of the session.
+ * <p>
+ * Registered as an {@link org.apache.maven.eventspy.EventSpy} via {@code
@Named}/{@code @Singleton},
+ * following the same pattern as {@code DefaultPluginValidationManager}.
+ * <p>
+ * Thread-safe: concurrent module builds (with {@code -T}) each write to their
+ * own entry in a {@link ConcurrentHashMap}.
+ * <p>
+ * Log capture: registers a callback on {@link ProjectBuildLogAppender} to
+ * receive the already-formed {@link LogEvent} objects produced by the main
+ * logging pipeline. Uses thread-based tracking to associate events with
+ * the currently-executing mojo or module.
+ *
+ * @since 4.1.0
+ */
+@Singleton
+@Named
+public final class BuildReportCollector extends AbstractEventSpy {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(BuildReportCollector.class);
+
+ static final String REPORT_DIR = "build-reports";
+ static final String REPORT_LATEST = "build-report-latest.json";
+ static final String TRACE_ID_MDC_KEY = "otel.trace_id";
+ static final String SPAN_ID_MDC_KEY = "otel.span_id";
+
+ private static final int MAX_STACKTRACE_LINES = 30;
+
+ /**
+ * Maximum number of log events captured per scope (mojo, module, or
build).
+ * Beyond this, events are silently dropped to prevent unbounded memory
growth.
+ */
+ static final int MAX_LOG_EVENTS_PER_SCOPE = 500;
+
+ // ---- Mutable state, populated during the build ----
+
+ /** Per-project mojo tracking: project key -> list of in-flight/completed
mojos. */
+ private final Map<String, List<MojoTiming>> mojoTimings = new
ConcurrentHashMap<>();
+
+ /** Per-project start instants for duration computation. */
+ private final Map<String, Instant> projectStartTimes = new
ConcurrentHashMap<>();
+
+ /** Per-project trace context captured when the project starts. */
+ private final Map<String, TraceContext> projectTraceContexts = new
ConcurrentHashMap<>();
+
+ /** Per-mojo start instants for duration computation. */
+ private final Map<String, Instant> mojoStartTimes = new
ConcurrentHashMap<>();
+
+ /** Per-mojo trace context captured when the mojo starts. */
+ private final Map<String, TraceContext> mojoTraceContexts = new
ConcurrentHashMap<>();
+
+ /** Session-level state - set once on SessionStarted. */
+ private volatile MavenSession session;
+
+ /** Build environment - captured once at SessionStarted, immutable
thereafter. */
+ private volatile BuildInvocation buildEnvironment;
+
+ // ---- Log capture state ----
+
+ /**
+ * Maps thread ID -> mojo key for the currently-executing mojo on that
thread.
+ * Lifecycle events and mojo execution run on the same thread, so this is
safe
+ * for parallel builds with {@code -T}.
+ */
+ private final Map<Long, String> currentMojoByThread = new
ConcurrentHashMap<>();
+
+ /** Per-mojo log buffers: mojo key -> captured log events. */
+ private final Map<String, List<LogEvent>> mojoLogBuffers = new
ConcurrentHashMap<>();
+
+ /**
+ * Maps thread ID -> project key for the currently-building project on
that thread.
+ * Used to route log events that occur between mojo executions to the
module-level buffer.
+ */
+ private final Map<Long, String> currentProjectByThread = new
ConcurrentHashMap<>();
+
+ /** Per-module log buffers: project key -> events captured outside any
mojo. */
+ private final Map<String, List<LogEvent>> moduleLogBuffers = new
ConcurrentHashMap<>();
+
+ /** Build-level log buffer: events captured outside any module lifecycle.
*/
+ private final List<LogEvent> buildLogBuffer =
Collections.synchronizedList(new ArrayList<>());
+
+ @Override
+ public void onEvent(Object event) {
+ if (event instanceof ExecutionEvent executionEvent) {
+ switch (executionEvent.getType()) {
+ case SessionStarted:
+ onSessionStarted(executionEvent);
+ break;
+ case SessionEnded:
+ onSessionEnded(executionEvent);
+ break;
+ case ProjectStarted:
+ onProjectStarted(executionEvent);
+ break;
+ case ProjectSucceeded:
+ case ProjectFailed:
+ case ProjectSkipped:
+ onProjectFinished(executionEvent);
+ break;
+ case MojoStarted:
+ onMojoStarted(executionEvent);
+ break;
+ case MojoSucceeded:
+ case MojoFailed:
+ onMojoFinished(executionEvent);
+ break;
+ case MojoSkipped:
+ onMojoSkipped(executionEvent);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ // ---- Event handlers ----
+
+ private void onSessionStarted(ExecutionEvent event) {
+ this.session = event.getSession();
+ this.buildEnvironment = DefaultBuildInvocation.from(this.session);
+ installLogCapture();
+ }
+
+ private void onSessionEnded(ExecutionEvent event) {
+ removeLogCapture();
+
+ MavenSession endSession = event.getSession();
+ if (endSession == null) {
+ return;
+ }
+
+ try {
+ BuildReport report = buildReport(endSession);
+ writeReport(report, endSession);
+ } catch (Exception e) {
+ // Never let the report collector crash the build
+ LOGGER.debug("Failed to produce build report: {}", e.getMessage(),
e);
+ }
+ }
+
+ private void onProjectStarted(ExecutionEvent event) {
+ String key = projectKey(event.getProject());
+ projectStartTimes.put(key, MonotonicClock.now());
+ projectTraceContexts.put(key, currentTraceContext());
+ mojoTimings.putIfAbsent(key, Collections.synchronizedList(new
ArrayList<>()));
+ moduleLogBuffers.put(key, Collections.synchronizedList(new
ArrayList<>()));
+ currentProjectByThread.put(Thread.currentThread().getId(), key);
+ }
+
+ private void onProjectFinished(ExecutionEvent event) {
+ // Unregister the project from this thread so subsequent log events
+ // fall through to the build-level buffer
+ currentProjectByThread.remove(Thread.currentThread().getId());
+ }
+
+ private void onMojoStarted(ExecutionEvent event) {
+ String mKey = mojoKey(event.getProject(), event.getMojoExecution());
+ mojoStartTimes.put(mKey, MonotonicClock.now());
+ mojoTraceContexts.put(mKey, currentTraceContext());
+
+ // Register the current mojo for this thread so the log event sink
+ // can associate events with this mojo execution
+ currentMojoByThread.put(Thread.currentThread().getId(), mKey);
+ mojoLogBuffers.put(mKey, Collections.synchronizedList(new
ArrayList<>()));
+ }
+
+ private void onMojoFinished(ExecutionEvent event) {
+ MojoExecution mojo = event.getMojoExecution();
+ MavenProject project = event.getProject();
+ String mKey = mojoKey(project, mojo);
+ String pKey = projectKey(project);
+
+ // Unregister the mojo from this thread
+ currentMojoByThread.remove(Thread.currentThread().getId());
+
+ Instant now = MonotonicClock.now();
+ Instant startInstant = mojoStartTimes.remove(mKey);
+ TraceContext traceContext = mojoTraceContexts.remove(mKey);
+ if (traceContext == null) {
+ traceContext = TraceContext.EMPTY;
+ }
+ if (startInstant == null) {
+ startInstant = now;
+ }
+ Duration duration = Duration.between(startInstant, now);
+
+ BuildStatus status =
+ event.getType() == ExecutionEvent.Type.MojoSucceeded ?
BuildStatus.SUCCESS : BuildStatus.FAILURE;
+
+ // Drain the log buffer for this mojo
+ List<LogEvent> logBuffer = mojoLogBuffers.remove(mKey);
+ List<LogEvent> output = logBuffer != null ? List.copyOf(logBuffer) :
List.of();
+
+ MojoTiming timing = new MojoTiming(
+ mojo.getGroupId(),
+ mojo.getArtifactId(),
+ mojo.getVersion(),
+ mojo.getGoal(),
+ mojo.getExecutionId(),
+ mojo.getLifecyclePhase(),
+ status,
+ startInstant,
+ duration,
+ traceContext.traceId,
+ traceContext.spanId,
+ output);
+
+ mojoTimings
+ .computeIfAbsent(pKey, k -> Collections.synchronizedList(new
ArrayList<>()))
+ .add(timing);
+ }
+
+ private void onMojoSkipped(ExecutionEvent event) {
+ MojoExecution mojo = event.getMojoExecution();
+ MavenProject project = event.getProject();
+ String pKey = projectKey(project);
+
+ Instant now = MonotonicClock.now();
+ TraceContext traceContext = TraceContext.EMPTY;
+
+ MojoTiming timing = new MojoTiming(
+ mojo.getGroupId(),
+ mojo.getArtifactId(),
+ mojo.getVersion(),
+ mojo.getGoal(),
+ mojo.getExecutionId(),
+ mojo.getLifecyclePhase(),
+ BuildStatus.SKIPPED,
+ now,
+ Duration.ZERO,
+ traceContext.traceId,
+ traceContext.spanId,
+ List.of());
+
+ mojoTimings
+ .computeIfAbsent(pKey, k -> Collections.synchronizedList(new
ArrayList<>()))
+ .add(timing);
+ }
+
+ // ---- Structured log capture ----
+
+ /**
+ * Registers a callback on {@link ProjectBuildLogAppender} to receive the
+ * already-formed {@link LogEvent} objects from the main logging pipeline.
+ * This eliminates the need for a separate capture path and ensures the
+ * build report captures the same enriched events (with sequence number,
+ * source metadata) as the console output.
+ */
+ private void installLogCapture() {
+ ProjectBuildLogAppender.setReportCapture(this::captureLogEvent);
+ }
+
+ private void removeLogCapture() {
+ ProjectBuildLogAppender.setReportCapture(null);
+ }
+
+ /**
+ * Routes a pre-formed {@link LogEvent} to the appropriate buffer
+ * (mojo, module, or build-level) based on the current thread's
+ * lifecycle context.
+ */
+ private void captureLogEvent(LogEvent event) {
+ long threadId = Thread.currentThread().getId();
+
+ // 1. Mojo-level: event belongs to the currently-executing mojo on
this thread
+ String mKey = currentMojoByThread.get(threadId);
+ if (mKey != null) {
+ List<LogEvent> buffer = mojoLogBuffers.get(mKey);
+ if (buffer != null && buffer.size() < MAX_LOG_EVENTS_PER_SCOPE) {
+ buffer.add(event);
Review Comment:
⚠️ **TOCTOU race on mojo log buffer** — still not fixed from the previous
review.
`mojoLogBuffers` entries are `Collections.synchronizedList` wrappers.
`size()` and `add()` are individually synchronized but the compound `size() <
MAX` → `add()` is not atomic. In a parallel build (`-T N`), two threads logging
to the same mojo key can both observe `size() == 499` and both call `add()`,
producing 501 events — exceeding the cap. The comment at line 350 correctly
explains this for the build-level buffer and adds
`synchronized(buildLogBuffer)` there, but the same fix was not applied to the
mojo and module buffers.
```suggestion
if (buffer != null) {
synchronized (buffer) {
if (buffer.size() < MAX_LOG_EVENTS_PER_SCOPE) {
buffer.add(event);
}
}
}
```
##########
impl/maven-core/src/main/java/org/apache/maven/internal/build/BuildReportCollector.java:
##########
@@ -0,0 +1,644 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.internal.build;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.maven.api.BuildInvocation;
+import org.apache.maven.api.MonotonicClock;
+import org.apache.maven.api.build.report.BuildReport;
+import org.apache.maven.api.build.report.BuildStatus;
+import org.apache.maven.api.build.report.FailureReport;
+import org.apache.maven.api.build.report.ModuleReport;
+import org.apache.maven.api.build.report.MojoReport;
+import org.apache.maven.api.logging.LogEvent;
+import org.apache.maven.eventspy.AbstractEventSpy;
+import org.apache.maven.execution.BuildFailure;
+import org.apache.maven.execution.BuildSuccess;
+import org.apache.maven.execution.BuildSummary;
+import org.apache.maven.execution.ExecutionEvent;
+import org.apache.maven.execution.MavenExecutionResult;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.logging.ProjectBuildLogAppender;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+
+/**
+ * Collects build lifecycle events and produces a structured {@link
BuildReport}
+ * at the end of the session.
+ * <p>
+ * Registered as an {@link org.apache.maven.eventspy.EventSpy} via {@code
@Named}/{@code @Singleton},
+ * following the same pattern as {@code DefaultPluginValidationManager}.
+ * <p>
+ * Thread-safe: concurrent module builds (with {@code -T}) each write to their
+ * own entry in a {@link ConcurrentHashMap}.
+ * <p>
+ * Log capture: registers a callback on {@link ProjectBuildLogAppender} to
+ * receive the already-formed {@link LogEvent} objects produced by the main
+ * logging pipeline. Uses thread-based tracking to associate events with
+ * the currently-executing mojo or module.
+ *
+ * @since 4.1.0
+ */
+@Singleton
+@Named
+public final class BuildReportCollector extends AbstractEventSpy {
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(BuildReportCollector.class);
+
+ static final String REPORT_DIR = "build-reports";
+ static final String REPORT_LATEST = "build-report-latest.json";
+ static final String TRACE_ID_MDC_KEY = "otel.trace_id";
+ static final String SPAN_ID_MDC_KEY = "otel.span_id";
+
+ private static final int MAX_STACKTRACE_LINES = 30;
+
+ /**
+ * Maximum number of log events captured per scope (mojo, module, or
build).
+ * Beyond this, events are silently dropped to prevent unbounded memory
growth.
+ */
+ static final int MAX_LOG_EVENTS_PER_SCOPE = 500;
+
+ // ---- Mutable state, populated during the build ----
+
+ /** Per-project mojo tracking: project key -> list of in-flight/completed
mojos. */
+ private final Map<String, List<MojoTiming>> mojoTimings = new
ConcurrentHashMap<>();
+
+ /** Per-project start instants for duration computation. */
+ private final Map<String, Instant> projectStartTimes = new
ConcurrentHashMap<>();
+
+ /** Per-project trace context captured when the project starts. */
+ private final Map<String, TraceContext> projectTraceContexts = new
ConcurrentHashMap<>();
+
+ /** Per-mojo start instants for duration computation. */
+ private final Map<String, Instant> mojoStartTimes = new
ConcurrentHashMap<>();
+
+ /** Per-mojo trace context captured when the mojo starts. */
+ private final Map<String, TraceContext> mojoTraceContexts = new
ConcurrentHashMap<>();
+
+ /** Session-level state - set once on SessionStarted. */
+ private volatile MavenSession session;
+
+ /** Build environment - captured once at SessionStarted, immutable
thereafter. */
+ private volatile BuildInvocation buildEnvironment;
+
+ // ---- Log capture state ----
+
+ /**
+ * Maps thread ID -> mojo key for the currently-executing mojo on that
thread.
+ * Lifecycle events and mojo execution run on the same thread, so this is
safe
+ * for parallel builds with {@code -T}.
+ */
+ private final Map<Long, String> currentMojoByThread = new
ConcurrentHashMap<>();
+
+ /** Per-mojo log buffers: mojo key -> captured log events. */
+ private final Map<String, List<LogEvent>> mojoLogBuffers = new
ConcurrentHashMap<>();
+
+ /**
+ * Maps thread ID -> project key for the currently-building project on
that thread.
+ * Used to route log events that occur between mojo executions to the
module-level buffer.
+ */
+ private final Map<Long, String> currentProjectByThread = new
ConcurrentHashMap<>();
+
+ /** Per-module log buffers: project key -> events captured outside any
mojo. */
+ private final Map<String, List<LogEvent>> moduleLogBuffers = new
ConcurrentHashMap<>();
+
+ /** Build-level log buffer: events captured outside any module lifecycle.
*/
+ private final List<LogEvent> buildLogBuffer =
Collections.synchronizedList(new ArrayList<>());
+
+ @Override
+ public void onEvent(Object event) {
+ if (event instanceof ExecutionEvent executionEvent) {
+ switch (executionEvent.getType()) {
+ case SessionStarted:
+ onSessionStarted(executionEvent);
+ break;
+ case SessionEnded:
+ onSessionEnded(executionEvent);
+ break;
+ case ProjectStarted:
+ onProjectStarted(executionEvent);
+ break;
+ case ProjectSucceeded:
+ case ProjectFailed:
+ case ProjectSkipped:
+ onProjectFinished(executionEvent);
+ break;
+ case MojoStarted:
+ onMojoStarted(executionEvent);
+ break;
+ case MojoSucceeded:
+ case MojoFailed:
+ onMojoFinished(executionEvent);
+ break;
+ case MojoSkipped:
+ onMojoSkipped(executionEvent);
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ // ---- Event handlers ----
+
+ private void onSessionStarted(ExecutionEvent event) {
+ this.session = event.getSession();
+ this.buildEnvironment = DefaultBuildInvocation.from(this.session);
+ installLogCapture();
+ }
+
+ private void onSessionEnded(ExecutionEvent event) {
+ removeLogCapture();
+
+ MavenSession endSession = event.getSession();
+ if (endSession == null) {
+ return;
+ }
+
+ try {
+ BuildReport report = buildReport(endSession);
+ writeReport(report, endSession);
+ } catch (Exception e) {
+ // Never let the report collector crash the build
+ LOGGER.debug("Failed to produce build report: {}", e.getMessage(),
e);
Review Comment:
⚠️ **Report assembly failure is invisible in normal operation** — still not
fixed from the previous review.
The IO write failure at line 477 correctly uses `LOGGER.warn`. But this
outer catch — which covers `buildReport()` assembly failures — still logs at
`DEBUG`. A user relying on `target/build-report.json` who sees no file and runs
with default logging (`INFO`) will get no indication that something went wrong.
```suggestion
LOGGER.warn("Failed to produce build report: {}",
e.getMessage(), e);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
