resolved merge conflict

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id
     strategy:
       matrix:
-        consul: [1.6.10, 1.7.14, 1.8.19, 1.9.17, 1.10.12, 1.11.11, 1.12.9, 1.13.9, 1.14.10, 1.15.6, 1.16.2]
+        consul: [1.6.10, 1.7.14, 1.8.19, 1.9.17, 1.10.12, 1.11.11, 1.12.9, 1.13.9, 1.14.11, 1.15.7, 1.16.3]
         framework: [net461, net5.0, net6.0, net7.0]
         os: [ubuntu-latest, windows-latest, macos-latest]
       fail-fast: false

Consul.Test/AgentTest.cs

@@ -1001,5 +1001,16 @@ public async Task Agent_Version()
             Assert.NotNull(agentVersion.Response.HumanVersion);
             Assert.NotNull(agentVersion.Response.SHA);
         }
+
+        [Fact]
+        public async Task Agent_Metrics()
+        {
+            var agentMetrics = await _client.Agent.GetAgentMetrics();
+            Assert.NotNull(agentMetrics.Response.Timestamp);
+            Assert.NotNull(agentMetrics.Response.Counters);
+            Assert.NotNull(agentMetrics.Response.Gauges);
+            Assert.NotNull(agentMetrics.Response.Points);
+            Assert.NotNull(agentMetrics.Response.Samples);
+        }
     }
 }

Consul/Agent.cs

@@ -440,6 +440,68 @@ public enum LogLevel
         Err
     }
 
+    /// <summary>
+    /// Metrics represents the metrics returned by the Agent API
+    /// </summary>
+    public class Metrics
+    {
+        public string Timestamp { get; set; }
+        public List<Gauge> Gauges { get; set; }
+        public List<Point> Points { get; set; }
+        public List<Counter> Counters { get; set; }
+        public List<Sample> Samples { get; set; }
+    }
+
+    /// <summary>
+    /// Guage represents a Guage metric
+    /// </summary>
+    public class Gauge
+    {
+        public string Name { get; set; }
+        public double Value { get; set; }
+        public Dictionary<string, string> Labels { get; set; }
+    }
+
+    /// <summary>
+    /// Point represents a Point metric
+    /// </summary>
+    public class Point
+    {
+        public string Name { get; set; }
+        public double Value { get; set; }
+        public Dictionary<string, string> Labels { get; set; }
+    }
+
+    /// <summary>
+    /// Counter represents a Counter metric
+    /// </summary>
+    public class Counter
+    {
+        public string Name { get; set; }
+        public long Count { get; set; }
+        public double Sum { get; set; }
+        public double Min { get; set; }
+        public double Max { get; set; }
+        public double Mean { get; set; }
+        public double Stddev { get; set; }
+        public Dictionary<string, string> Labels { get; set; }
+    }
+
+    /// <summary>
+    /// Sample represents a Sample metric
+    /// </summary>
+    public class Sample
+    {
+        public string Name { get; set; }
+        public long Count { get; set; }
+        public double Sum { get; set; }
+        public double Min { get; set; }
+        public double Max { get; set; }
+        public double Mean { get; set; }
+        public double Stddev { get; set; }
+        public Dictionary<string, string> Labels { get; set; }
+    }
+
     /// <summary>
     /// Agent can be used to query the Agent endpoints
     /// </summary>
@@ -898,6 +960,16 @@ IEnumerator IEnumerable.GetEnumerator()
                 return GetEnumerator();
             }
         }
+
+        /// <summary>
+        /// GetAgentMetrics returns the metrics of the local agent
+        /// </summary>
+        /// <param name="ct"></param>
+        /// <returns>Metrics of the local agent</returns>
+        public async Task<QueryResult<Metrics>> GetAgentMetrics(CancellationToken ct = default)
+        {
+            return await _client.Get<Metrics>("/v1/agent/metrics").Execute(ct).ConfigureAwait(false);
+        }
     }
 
     public partial class ConsulClient : IConsulClient

Consul/Interfaces/IAgentEndpoint.cs

@@ -62,6 +62,7 @@ public interface IAgentEndpoint
         Task<QueryResult<string>> GetWorstLocalServiceHealth(string serviceName, CancellationToken ct = default);
         Task<QueryResult<LocalServiceHealth>> GetLocalServiceHealthByID(string serviceID, QueryOptions q, CancellationToken ct = default);
         Task<QueryResult<LocalServiceHealth>> GetLocalServiceHealthByID(string serviceID, CancellationToken ct = default);
+        Task<QueryResult<Metrics>> GetAgentMetrics(CancellationToken ct = default);
         Task<QueryResult<AgentVersion>> GetAgentVersion(CancellationToken ct = default);
         Task<WriteResult> Leave(string node, CancellationToken ct = default);
         Task<WriteResult> Reload(string node, CancellationToken ct = default);