metrics: allow disabling OpenMetrics negotiation (#3944)

* metrics: allow disabling OpenMetrics negotiation

Signed-off-by: Dave Henderson <[email protected]>

* fixup! metrics: allow disabling OpenMetrics negotiation

2 files changed, 69 insertions, 0 deletions

diff --git a/caddytest/integration/caddyfile_adapt/metrics_disable_om.txt b/caddytest/integration/caddyfile_adapt/metrics_disable_om.txt
new file mode 100644
index 000000000..2d7b24f4d
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/metrics_disable_om.txt
@@ -0,0 +1,36 @@
+:80 {
+	metrics /metrics {
+		disable_openmetrics
+	}
+}
+----------
+{
+	"apps": {
+		"http": {
+			"servers": {
+				"srv0": {
+					"listen": [
+						":80"
+					],
+					"routes": [
+						{
+							"match": [
+								{
+									"path": [
+										"/metrics"
+									]
+								}
+							],
+							"handle": [
+								{
+									"disable_openmetrics": true,
+									"handler": "metrics"
+								}
+							]
+						}
+					]
+				}
+			}
+		}
+	}
+}
diff --git a/caddytest/integration/caddyfile_adapt/metrics_syntax.txt b/caddytest/integration/caddyfile_adapt/metrics_syntax.txt
new file mode 100644
index 000000000..ca08cea23
--- /dev/null
+++ b/caddytest/integration/caddyfile_adapt/metrics_syntax.txt
@@ -0,0 +1,33 @@
+:80 {
+	metrics /metrics
+}
+----------
+{
+	"apps": {
+		"http": {
+			"servers": {
+				"srv0": {
+					"listen": [
+						":80"
+					],
+					"routes": [
+						{
+							"match": [
+								{
+									"path": [
+										"/metrics"
+									]
+								}
+							],
+							"handle": [
+								{
+									"handler": "metrics"
+								}
+							]
+						}
+					]
+				}
+			}
+		}
+	}
+}