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/rproxy/request.go

@@ -371,8 +371,8 @@ func (rq *request) finish(ctx context.Context) {
 		Status:             rq.out.status,
 		RequestBytes:       requestBytes,
 		ResponseBytes:      responseBytes,
-		DurationRequest:    requestlog.Milliseconds(requestEnd.Sub(rq.start)),
-		DurationResponse:   requestlog.Milliseconds(end.Sub(requestEnd)),
+		DurationRequestMS:  requestlog.Milliseconds(requestEnd.Sub(rq.start)),
+		DurationResponseMS: requestlog.Milliseconds(end.Sub(requestEnd)),
 		Disposition:        rq.disposition,
 		DefaultDisposition: rq.byDefault,
 	})
@@ -385,14 +385,14 @@ func (rq *request) finish(ctx context.Context) {
 	}
 
 	report := &discriminator.Report{
-		RequestID:     rq.id,
-		Status:        min(rq.out.status, reportStatusMax),
-		RequestBytes:  requestBytes,
-		ResponseBytes: responseBytes,
-		DurationTotal: requestlog.Milliseconds(end.Sub(rq.start)),
+		RequestID:       rq.id,
+		Status:          min(rq.out.status, reportStatusMax),
+		RequestBytes:    requestBytes,
+		ResponseBytes:   responseBytes,
+		DurationTotalMS: requestlog.Milliseconds(end.Sub(rq.start)),
 	}
 	if !rq.upstreamStart.IsZero() {
-		report.DurationUpstreamTotal = requestlog.Milliseconds(end.Sub(rq.upstreamStart))
+		report.DurationUpstreamTotalMS = requestlog.Milliseconds(end.Sub(rq.upstreamStart))
 	}
 
 	rq.h.sendReport(ctx, report)

internal/rproxy/rproxy.go

@@ -45,9 +45,9 @@ const (
 	idleTimeout = 120 * time.Second
 )
 
-// adminPrefix starts the path of every request for sww itself, which
+// ownEndpointPrefix starts the path of every request for sww itself, which
 // never reaches the app.
-const adminPrefix = "/_sww/"
+const ownEndpointPrefix = "/_sww/"
 
 // allowedMethods lists the methods rproxy passes on, as an Allow header gives
 // them. It answers any other method 405 itself.
@@ -211,8 +211,8 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 // passToApp passes the request on to the app, unless a limit or its path keeps
-// it from the app. discriminator answers a path under adminPrefix itself, so such a
-// request gets here only when SWRP_DEFAULT_DISPOSITION allowed it. ctx is the
+// it from the app. discriminator answers a path under ownEndpointPrefix itself, so
+// such a request gets here only when SWRP_DEFAULT_DISPOSITION allowed it. ctx is the
 // request's own context.
 func (rq *request) passToApp(ctx context.Context) {
 	maxBytes := rq.h.config.MaxRequestSize
@@ -220,7 +220,7 @@ func (rq *request) passToApp(ctx context.Context) {
 	switch {
 	case rq.refused.Load() != 0 || (maxBytes > 0 && rq.in.ContentLength > maxBytes):
 		rq.answer(http.StatusRequestEntityTooLarge)
-	case strings.HasPrefix(rq.in.URL.Path, adminPrefix):
+	case strings.HasPrefix(rq.in.URL.Path, ownEndpointPrefix):
 		rq.answer(http.StatusNotFound)
 	default:
 		rq.forward(ctx)

internal/rproxy/rproxy_test.go

@@ -727,7 +727,7 @@ func TestDenyGivesTheVisitorDiscriminatorsAnswer(t *testing.T) {
 	report := standIn.report(t)
 	if report.Status != http.StatusForbidden ||
 		report.ResponseBytes != int64(len(deniedBody)) ||
-		report.DurationUpstreamTotal != 0 {
+		report.DurationUpstreamTotalMS != 0 {
 		t.Errorf("report %+v, of a request denied", report)
 	}
 
@@ -871,9 +871,9 @@ func TestALineForARequestClosedWithoutAnAnswerHasNoNegativeTime(t *testing.T) {
 
 		line := out.requestLine(t)
 
-		duration, ok := line["duration_response"].(float64)
+		duration, ok := line["duration_response_ms"].(float64)
 		if !ok || duration < 0 {
-			t.Errorf("line %v, want a duration_response that is not negative", line)
+			t.Errorf("line %v, want a duration_response_ms that is not negative", line)
 		}
 	}
 }
@@ -1428,8 +1428,8 @@ func TestReportGivesWhatHappened(t *testing.T) {
 	if report.RequestID == "" || report.Status != http.StatusOK ||
 		report.RequestBytes != int64(len(body)) ||
 		report.ResponseBytes != int64(len(greeting)) ||
-		report.DurationTotal <= 0 || report.DurationUpstreamTotal <= 0 ||
-		report.DurationUpstreamTotal > report.DurationTotal {
+		report.DurationTotalMS <= 0 || report.DurationUpstreamTotalMS <= 0 ||
+		report.DurationUpstreamTotalMS > report.DurationTotalMS {
 		t.Errorf("report %+v, of %d bytes up and %d back", report, len(body), len(greeting))
 	}
 
@@ -1748,7 +1748,7 @@ func TestLogLineGivesTheRequestAsSent(t *testing.T) {
 		t.Errorf("default_disposition is %v, want it left out", line["default_disposition"])
 	}
 
-	for _, name := range []string{"duration_request", "duration_response"} {
+	for _, name := range []string{"duration_request_ms", "duration_response_ms"} {
 		duration, ok := line[name].(float64)
 		if !ok || duration <= 0 {
 			t.Errorf("%s is %v, want a time", name, line[name])