Name log fields, metrics and the Core Rule Set package for what they are (closes #192)

Log field, metric, action and event names now say what they count
and, for timings, the unit. Package internal/waf is internal/coreruleset.

Model: opus-5-5

internal/discriminator/discriminator.go

@@ -89,12 +89,12 @@ var (
 //
 //nolint:tagliatelle // docs/request-log.md names the fields in snake_case
 type Report struct {
-	RequestID             string  `json:"request_id"`
-	Status                int     `json:"status"`
-	RequestBytes          int64   `json:"request_bytes"`
-	ResponseBytes         int64   `json:"response_bytes"`
-	DurationTotal         float64 `json:"duration_total"`
-	DurationUpstreamTotal float64 `json:"duration_upstream_total"`
+	RequestID               string  `json:"request_id"`
+	Status                  int     `json:"status"`
+	RequestBytes            int64   `json:"request_bytes"`
+	ResponseBytes           int64   `json:"response_bytes"`
+	DurationTotalMS         float64 `json:"duration_total_ms"`
+	DurationUpstreamTotalMS float64 `json:"duration_upstream_total_ms"`
 }
 
 // New returns the server `sww discriminator` runs. It answers
@@ -208,7 +208,7 @@ func (h *handler) answerQuestion(w http.ResponseWriter, r *http.Request) {
 
 	// The app never sees this prefix. discriminator's own endpoints are at its
 	// own address, so this answers as a path with no endpoint does.
-	rq.line.Action = requestlog.ActionAdmin
+	rq.line.Action = requestlog.ActionOwnEndpoint
 	rq.out.Header().Set(DispositionHeader, DispositionDeny)
 	http.Error(rq.out, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 }
@@ -405,7 +405,7 @@ func readReport(w http.ResponseWriter, r *http.Request) (Report, error) {
 
 	for _, name := range []string{
 		"request_id", "status", "request_bytes", "response_bytes",
-		"duration_total", "duration_upstream_total",
+		"duration_total_ms", "duration_upstream_total_ms",
 	} {
 		value, there := fields[name]
 		if !there || string(value) == "null" {
@@ -431,11 +431,11 @@ func (report *Report) checkRanges() error {
 		return fmt.Errorf("%w: request_bytes", errReportValue)
 	case report.ResponseBytes < 0 || report.ResponseBytes > maxReportedBytes:
 		return fmt.Errorf("%w: response_bytes", errReportValue)
-	case report.DurationTotal < 0 || report.DurationTotal > maxReportedMilliseconds:
-		return fmt.Errorf("%w: duration_total", errReportValue)
-	case report.DurationUpstreamTotal < 0 ||
-		report.DurationUpstreamTotal > maxReportedMilliseconds:
-		return fmt.Errorf("%w: duration_upstream_total", errReportValue)
+	case report.DurationTotalMS < 0 || report.DurationTotalMS > maxReportedMilliseconds:
+		return fmt.Errorf("%w: duration_total_ms", errReportValue)
+	case report.DurationUpstreamTotalMS < 0 ||
+		report.DurationUpstreamTotalMS > maxReportedMilliseconds:
+		return fmt.Errorf("%w: duration_upstream_total_ms", errReportValue)
 	}
 
 	return nil
@@ -459,18 +459,18 @@ func (h *handler) finishWith(ctx context.Context, held *decision, report Report)
 	rq.line.Status = report.Status
 	rq.line.RequestBytes = report.RequestBytes
 	rq.line.ResponseBytes = report.ResponseBytes
-	rq.line.DurationTotal = report.DurationTotal
+	rq.line.DurationTotalMS = report.DurationTotalMS
 
 	if rq.allowed {
-		rq.line.DurationUpstreamTotal = &report.DurationUpstreamTotal
+		rq.line.DurationUpstreamTotalMS = &report.DurationUpstreamTotalMS
 
 		rq.runBanningHeuristics(ctx, onReport())
 		rq.countAnomalies()
 		rq.addToHistory()
 
 		rq.h.metrics.RequestReported(&rq.line,
-			time.Duration(report.DurationTotal*float64(time.Millisecond)),
-			time.Duration(report.DurationUpstreamTotal*float64(time.Millisecond)))
+			time.Duration(report.DurationTotalMS*float64(time.Millisecond)),
+			time.Duration(report.DurationUpstreamTotalMS*float64(time.Millisecond)))
 	}
 
 	rq.writeLine()