From 178103d2ee6ca06064798893162ee60d02c1cc88 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Mon, 13 May 2024 11:55:58 -0700
Subject: [PATCH] Change all prometheus #includes to use angle brackets

---
 src/telemetry/Counter.h   | 5 ++---
 src/telemetry/Gauge.h     | 5 ++---
 src/telemetry/Histogram.h | 5 ++---
 src/telemetry/Manager.h   | 5 ++---
 src/telemetry/Opaques.h   | 6 +++---
 src/telemetry/Utils.h     | 5 ++---
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/telemetry/Counter.h b/src/telemetry/Counter.h
index 0165dd2ff5..49404147c5 100644
--- a/src/telemetry/Counter.h
+++ b/src/telemetry/Counter.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <prometheus/counter.h>
+#include <prometheus/family.h>
 #include <cstdint>
 #include <initializer_list>
 #include <memory>
@@ -11,9 +13,6 @@
 #include "zeek/telemetry/Utils.h"
 #include "zeek/telemetry/telemetry.bif.h"
 
-#include "prometheus/counter.h"
-#include "prometheus/family.h"
-
 namespace zeek::telemetry {
 
 template<typename BaseType>
diff --git a/src/telemetry/Gauge.h b/src/telemetry/Gauge.h
index 74e79ed051..17daccffea 100644
--- a/src/telemetry/Gauge.h
+++ b/src/telemetry/Gauge.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <prometheus/family.h>
+#include <prometheus/gauge.h>
 #include <cstdint>
 #include <initializer_list>
 #include <memory>
@@ -11,9 +13,6 @@
 #include "zeek/telemetry/Utils.h"
 #include "zeek/telemetry/telemetry.bif.h"
 
-#include "prometheus/family.h"
-#include "prometheus/gauge.h"
-
 namespace zeek::telemetry {
 
 template<typename BaseType>
diff --git a/src/telemetry/Histogram.h b/src/telemetry/Histogram.h
index eddd216a09..c875b51779 100644
--- a/src/telemetry/Histogram.h
+++ b/src/telemetry/Histogram.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <prometheus/family.h>
+#include <prometheus/histogram.h>
 #include <cstdint>
 #include <initializer_list>
 #include <memory>
@@ -11,9 +13,6 @@
 #include "zeek/telemetry/Utils.h"
 #include "zeek/telemetry/telemetry.bif.h"
 
-#include "prometheus/family.h"
-#include "prometheus/histogram.h"
-
 namespace zeek::telemetry {
 
 template<typename BaseType>
diff --git a/src/telemetry/Manager.h b/src/telemetry/Manager.h
index 717dfd55a0..dc12e15d5b 100644
--- a/src/telemetry/Manager.h
+++ b/src/telemetry/Manager.h
@@ -2,6 +2,8 @@
 
 #pragma once
 
+#include <prometheus/exposer.h>
+#include <prometheus/registry.h>
 #include <condition_variable>
 #include <cstdint>
 #include <initializer_list>
@@ -17,9 +19,6 @@
 #include "zeek/telemetry/ProcessStats.h"
 #include "zeek/telemetry/Utils.h"
 
-#include "prometheus/exposer.h"
-#include "prometheus/registry.h"
-
 namespace zeek {
 class RecordVal;
 using RecordValPtr = IntrusivePtr<RecordVal>;
diff --git a/src/telemetry/Opaques.h b/src/telemetry/Opaques.h
index 5540012838..324c11348f 100644
--- a/src/telemetry/Opaques.h
+++ b/src/telemetry/Opaques.h
@@ -2,12 +2,12 @@
 
 #pragma once
 
+#include <prometheus/counter.h>
+#include <prometheus/family.h>
+
 #include "zeek/OpaqueVal.h"
 #include "zeek/broker/Data.h"
 
-#include "prometheus/counter.h"
-#include "prometheus/family.h"
-
 namespace zeek {
 
 /**
diff --git a/src/telemetry/Utils.h b/src/telemetry/Utils.h
index dbccd54565..8eb0f98d99 100644
--- a/src/telemetry/Utils.h
+++ b/src/telemetry/Utils.h
@@ -1,13 +1,12 @@
 #pragma once
 
+#include <prometheus/family.h>
+#include <prometheus/labels.h>
 #include <string_view>
 
 #include "zeek/Span.h"
 #include "zeek/Val.h"
 
-#include "prometheus/family.h"
-#include "prometheus/labels.h"
-
 namespace zeek::telemetry {
 
 using LabelView = std::pair<std::string_view, std::string_view>;