-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Logging foundation: structured LogEvent, JUL handler, Log API enhancements #12694
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,167 @@ | ||||||
| /* | ||||||
| * 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.build.report; | ||||||
|
|
||||||
| import java.time.Instant; | ||||||
|
|
||||||
| import org.apache.maven.api.annotations.Experimental; | ||||||
| import org.apache.maven.api.annotations.Nonnull; | ||||||
| import org.apache.maven.api.annotations.Nullable; | ||||||
|
|
||||||
| /** | ||||||
| * A structured log event captured during the build. | ||||||
| * <p> | ||||||
| * Each event carries the log level, timestamp, message, and optionally | ||||||
| * the logger name and a stack trace. This replaces raw log line strings | ||||||
| * in the build report, enabling programmatic filtering by level and | ||||||
| * correlation by timestamp. | ||||||
| * <p> | ||||||
| * Events originating from the Maven Log API or from JUL | ||||||
| * ({@code java.util.logging}) carry additional source metadata: the | ||||||
| * source class name, source method name, and thread identifier. | ||||||
| * For Log API events the source class name is the mojo implementation | ||||||
| * FQCN; for JUL events it comes from {@code LogRecord}. Events from | ||||||
| * direct SLF4J logging have these fields set to {@code null}. | ||||||
| * | ||||||
| * @since 4.1.0 | ||||||
| */ | ||||||
| @Experimental | ||||||
| public interface LogEvent { | ||||||
|
|
||||||
| /** | ||||||
| * When this log event was produced (wall-clock time). | ||||||
| * | ||||||
| * @return the event instant, never {@code null} | ||||||
| */ | ||||||
| @Nonnull | ||||||
| Instant timestamp(); | ||||||
|
|
||||||
| /** | ||||||
| * The severity level of this log event. | ||||||
| * | ||||||
| * @return the log level, never {@code null} | ||||||
| */ | ||||||
| @Nonnull | ||||||
| LogLevel level(); | ||||||
|
|
||||||
| /** | ||||||
| * The log message, without level prefix or timestamp formatting. | ||||||
| * | ||||||
| * @return the formatted message, never {@code null} | ||||||
| */ | ||||||
| @Nonnull | ||||||
| String message(); | ||||||
|
|
||||||
| /** | ||||||
| * The name of the logger that produced this event | ||||||
| * (e.g. {@code "org.apache.maven.plugins.compiler.CompilerMojo"}). | ||||||
| * | ||||||
| * @return the logger name, or {@code null} if unavailable | ||||||
| */ | ||||||
| @Nullable | ||||||
| String loggerName(); | ||||||
|
|
||||||
| /** | ||||||
| * The stack trace associated with this event, if an exception was logged. | ||||||
| * <p> | ||||||
| * The trace is formatted as a multi-line string and may be truncated | ||||||
| * for very deep stack traces. | ||||||
| * | ||||||
| * @return the stack trace string, or {@code null} if no exception was logged | ||||||
| */ | ||||||
| @Nullable | ||||||
| String stackTrace(); | ||||||
|
|
||||||
| /** | ||||||
| * The fully formatted log line as rendered for console output, including | ||||||
| * the level prefix, timestamp, and any ANSI styling applied by the logger. | ||||||
| * <p> | ||||||
| * This is the string that would be printed to the terminal in verbose mode. | ||||||
| * Console renderers that just need pass-through output can use this directly, | ||||||
| * while renderers that apply custom formatting (e.g. rich mode) can use the | ||||||
| * structured fields ({@link #level()}, {@link #message()}) instead. | ||||||
| * <p> | ||||||
| * May be {@code null} if the event was created outside the SLF4J pipeline | ||||||
| * (e.g. in tests or by programmatic construction). | ||||||
| * | ||||||
| * @return the formatted log line, or {@code null} | ||||||
| */ | ||||||
| @Nullable | ||||||
| String formattedMessage(); | ||||||
|
|
||||||
| // ---- Source metadata (populated for Log API and JUL events) ---- | ||||||
|
|
||||||
| /** | ||||||
| * The fully qualified class name of the source that issued the log call. | ||||||
| * <p> | ||||||
| * For Maven Log API events this is the mojo implementation class name. | ||||||
| * For JUL events it is the value from {@code LogRecord.getSourceClassName()}. | ||||||
| * For direct SLF4J logging it is {@code null}. | ||||||
| * | ||||||
| * @return the source class name, or {@code null} | ||||||
| * @since 4.1.0 | ||||||
| */ | ||||||
| @Nullable | ||||||
| default String sourceClassName() { | ||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * The method name of the source that issued the log call. | ||||||
| * <p> | ||||||
| * For Maven Log API events this is resolved via {@link StackWalker}. | ||||||
| * For JUL events it is the value from {@code LogRecord.getSourceMethodName()}. | ||||||
| * For direct SLF4J logging it is {@code null}. | ||||||
| * | ||||||
| * @return the source method name, or {@code null} | ||||||
| * @since 4.1.0 | ||||||
| */ | ||||||
| @Nullable | ||||||
| default String sourceMethodName() { | ||||||
| return null; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * The thread identifier from which this log event originated. | ||||||
| * <p> | ||||||
| * Populated for both Log API and JUL events. Returns {@code -1} | ||||||
| * if the thread ID is not available (i.e. for direct SLF4J events). | ||||||
| * | ||||||
| * @return the thread ID, or {@code -1} if unavailable | ||||||
| * @since 4.1.0 | ||||||
| */ | ||||||
| default long threadId() { | ||||||
| return -1; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * A monotonically increasing sequence number for total ordering of | ||||||
| * log events, useful when multiple events share the same timestamp. | ||||||
| * <p> | ||||||
| * Assigned by the logging pipeline when the event is captured, | ||||||
| * providing a global ordering across all event sources (Log API, | ||||||
| * JUL, and direct SLF4J). | ||||||
| * | ||||||
| * @return the sequence number, always non-negative | ||||||
| * @since 4.1.0 | ||||||
| */ | ||||||
| default long sequenceNumber() { | ||||||
| return -1; | ||||||
| } | ||||||
| } | ||||||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The
Suggested change
|
||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| /** | ||
| * Structured build report data model. | ||
| * <p> | ||
| * This package provides structured representations of build execution | ||
| * data, including log events and (in future) full build reports. | ||
| * {@link org.apache.maven.api.build.report.LogEvent} is the foundational | ||
| * type representing a single structured log entry captured during the build. | ||
| * | ||
| * @since 4.1.0 | ||
| */ | ||
| @Experimental | ||
| package org.apache.maven.api.build.report; | ||
|
|
||
| import org.apache.maven.api.annotations.Experimental; |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,13 +36,62 @@ | |
| @Experimental | ||
| @Provider | ||
| public interface Log { | ||
| /** | ||
| * {@return true if the <b>trace</b> error level is enabled} | ||
| * @since 4.1.0 | ||
| */ | ||
| boolean isTraceEnabled(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The six new |
||
|
|
||
| /** | ||
| * Sends a message to the user in the <b>trace</b> error level. | ||
| * <p> | ||
| * Trace is intended for Maven core internals and low-level framework | ||
| * diagnostics. Plugin authors should normally use {@link #debug} for | ||
| * developer-facing diagnostic output. | ||
| * | ||
| * @param content the message to log | ||
| * @since 4.1.0 | ||
| */ | ||
| void trace(CharSequence content); | ||
|
|
||
| /** | ||
| * Sends a message (and accompanying exception) to the user at the <b>trace</b> error level. | ||
| * | ||
| * @param content the message to log | ||
| * @param error the error that caused this log | ||
| * @since 4.1.0 | ||
| */ | ||
| void trace(CharSequence content, Throwable error); | ||
|
|
||
| /** | ||
| * Sends an exception to the user in the <b>trace</b> error level. | ||
| * | ||
| * @param error the error that caused this log | ||
| * @since 4.1.0 | ||
| */ | ||
| void trace(Throwable error); | ||
|
|
||
| /** | ||
| * @since 4.1.0 | ||
| */ | ||
| void trace(Supplier<String> content); | ||
|
|
||
| /** | ||
| * @since 4.1.0 | ||
| */ | ||
| void trace(Supplier<String> content, Throwable error); | ||
|
|
||
| /** | ||
| * {@return true if the <b>debug</b> error level is enabled} | ||
| */ | ||
| boolean isDebugEnabled(); | ||
|
|
||
| /** | ||
| * Sends a message to the user in the <b>debug</b> error level. | ||
| * <p> | ||
| * Debug is the recommended level for diagnostic output that helps | ||
| * plugin users troubleshoot build problems (e.g. resolved paths, | ||
| * computed values). For Maven core internals, prefer {@link #trace}. | ||
| * | ||
| * @param content the message to log | ||
| */ | ||
|
|
@@ -167,4 +216,21 @@ public interface Log { | |
| void error(Supplier<String> content); | ||
|
|
||
| void error(Supplier<String> content, Throwable error); | ||
|
|
||
| /** | ||
| * Returns a child logger whose name is derived from this logger's name | ||
| * by appending {@code "." + name}. This allows plugins to create | ||
| * sub-loggers for different concerns while keeping hierarchical level | ||
| * control (e.g. setting the level for the parent silences the children). | ||
| * <p> | ||
| * The default implementation returns {@code this} so that existing | ||
| * implementations continue to work without changes. | ||
| * | ||
| * @param name the child logger name segment (must not be {@code null}) | ||
| * @return a child {@code Log}, never {@code null} | ||
| * @since 4.1.0 | ||
| */ | ||
| default Log child(String name) { | ||
| return this; | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sequenceNumber()javadoc says "always non-negative," but the default returns-1andDefaultLogEventpasses-1when unknown. Fix the doc (or the sentinel) so they agree.