fixup! metrics: allow disabling OpenMetrics negotiation

caddyserver · Dec 30, 2020 · 134ca8a · 134ca8a
1 parent 3ad5c33
commit 134ca8a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/modules/metrics/metrics.go b/modules/metrics/metrics.go
@@ -75,7 +75,7 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
 
 // UnmarshalCaddyfile sets up the handler from Caddyfile tokens. Syntax:
 //
-//     metrics <matcher> {
+//     metrics [<matcher>] {
 //         disable_openmetrics
 //     }
 //
@@ -90,6 +90,8 @@ func (m *Metrics) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 			switch d.Val() {
 			case "disable_openmetrics":
 				m.DisableOpenMetrics = true
+			default:
+				return d.Errf("unrecognized subdirective %q", d.Val())
 			}
 		}
 	}

diff --git a/modules/metrics/metrics_test.go b/modules/metrics/metrics_test.go
@@ -35,4 +35,11 @@ func TestMetricsUnmarshalCaddyfile(t *testing.T) {
 	if m.DisableOpenMetrics != true {
 		t.Errorf("DisableOpenMetrics should've been true: %v", m.DisableOpenMetrics)
 	}
+
+	m = &Metrics{}
+	d = caddyfile.NewTestDispenser(`metrics { bogus }`)
+	err = m.UnmarshalCaddyfile(d)
+	if err == nil {
+		t.Errorf("expected error: %v", err)
+	}
 }