Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion addOns/callhome/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased

### Added
- Add statistics for the number of fatal/warn/error logged.

## [0.15.0] - 2025-09-02
### Added
Expand Down
2 changes: 2 additions & 0 deletions addOns/callhome/callhome.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ zapAddOn {
}

dependencies {
compileOnly(libs.log4j.core)

testImplementation(project(":testutils"))
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.lang.management.ManagementFactory;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.HashMap;
Expand All @@ -36,8 +37,16 @@
import net.sf.json.JSONObject;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.httpclient.URI;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.Filter.Result;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.config.Property;
import org.apache.logging.log4j.core.filter.LevelRangeFilter;
import org.apache.logging.log4j.core.layout.PatternLayout;
import org.parosproxy.paros.Constant;
import org.parosproxy.paros.control.Control;
import org.parosproxy.paros.control.Control.Mode;
Expand All @@ -59,6 +68,7 @@
import org.zaproxy.zap.extension.stats.ExtensionStats;
import org.zaproxy.zap.extension.stats.InMemoryStats;
import org.zaproxy.zap.network.HttpRequestConfig;
import org.zaproxy.zap.utils.Stats;
import org.zaproxy.zap.utils.ZapXmlConfiguration;

public class ExtensionCallHome extends ExtensionAdaptor
Expand Down Expand Up @@ -101,6 +111,8 @@ public String toString() {
}
}

private final StatsLogHandler statsLogHandler;

private HttpSender httpSender = null;
private CallHomeParam param;

Expand All @@ -121,6 +133,8 @@ public ExtensionCallHome() {
setI18nPrefix(PREFIX);
// Just before the Network extension.
setOrder(Integer.MAX_VALUE - 1);

statsLogHandler = new StatsLogHandler();
}

@Override
Expand All @@ -142,6 +156,8 @@ public void postInit() {
@Override
public void unload() {
this.setAutoUpdateSupplier(null);

statsLogHandler.remove();
}

private OptionsCallHomePanel getOptionsPanel() {
Expand Down Expand Up @@ -301,6 +317,7 @@ public boolean test(Entry<String, Long> t) {
|| key.startsWith("stats.graphql.")
|| key.startsWith("stats.hud.")
|| key.startsWith("stats.llm.")
|| key.startsWith("stats.log.")
|| key.startsWith("stats.network.")
|| key.startsWith("stats.oast.")
|| key.startsWith("stats.openapi.")
Expand Down Expand Up @@ -512,4 +529,54 @@ private static void updateOutput(String message) {
View.getSingleton().getOutputPanel().append(sb.toString());
}
}

private static class StatsLogHandler {

StatsLogHandler() {
LoggerContext.getContext()
.getConfiguration()
.getRootLogger()
.addAppender(new StatsAppender(), null, null);
}

void remove() {
LoggerContext.getContext()
.getConfiguration()
.getRootLogger()
.removeAppender(StatsAppender.NAME);
}

static class StatsAppender extends AbstractAppender {

private static final String NAME = "ZAP-StatsAppender";
private static final Property[] NO_PROPERTIES = {};

StatsAppender() {
super(
NAME,
LevelRangeFilter.createFilter(
Level.FATAL, Level.WARN, Result.NEUTRAL, Result.NEUTRAL),
PatternLayout.newBuilder()
.withDisableAnsi(true)
.withCharset(StandardCharsets.UTF_8)
.withPattern("%m%n")
.build(),
true,
NO_PROPERTIES);
start();
}

@Override
public void append(LogEvent event) {
Level level = event.getLevel();
if (level.isLessSpecificThan(Level.INFO)) {
return;
}

String base = "stats.log." + event.getLevel().name().toLowerCase(Locale.ROOT);
Stats.incCounter(base);
Stats.incCounter(base + "." + event.getLoggerName());
}
}
}
}