merge 2024.1 changes from seq

src/Seq.Api/Model/Diagnostics/ClusterMetricsPart.cs

@@ -0,0 +1,35 @@
+namespace Seq.Api.Model.Diagnostics
+{
+    /// <summary>
+    /// Metrics related to cluster activity.
+    /// </summary>
+    public class ClusterMetricsPart
+    {
+        /// <summary>
+        /// Construct a <see cref="ClusterMetricsPart"/>.
+        /// </summary>
+        public ClusterMetricsPart()
+        {
+        }
+
+        /// <summary>
+        /// A connection to the leader node was accepted.
+        /// </summary>
+        public ulong ConnectionAccepted { get; set; }
+
+        /// <summary>
+        /// A connection to the leader node was rejected due to an invalid authentication key.
+        /// </summary>
+        public ulong ConnectionInvalidKey { get; set; }
+
+        /// <summary>
+        /// A connection to the leader node was successfully authenticated and established.
+        /// </summary>
+        public ulong ConnectionEstablished { get; set; }
+
+        /// <summary>
+        /// A connection to the leader node was could not be established.
+        /// </summary>
+        public ulong ConnectionNotEstablished { get; set; }
+    }
+}

src/Seq.Api/Model/Events/EventEntity.cs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Seq.Api.Model.Shared;
@@ -30,6 +31,12 @@ public class EventEntity : Entity
         /// </summary>
         public string Timestamp { get; set; }
 
+        /// <summary>
+        /// If the event represents a span, the ISO-8601 timestamp at which the span started.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string Start { get; set; }
+
         /// <summary>
         /// Properties associated with the event.
         /// </summary>
@@ -75,11 +82,31 @@ public class EventEntity : Entity
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public string SpanId { get; set; }
 
+        /// <summary>
+        /// The id of the event's parent span, if any.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public string ParentId { get; set; }
+
         /// <summary>
         /// A collection of properties describing the origin of the event, if any. These correspond to resource
-        /// attributes in the OpenTelemetry spec.
+        /// attributes in the OpenTelemetry protocol.
         /// </summary>
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public List<EventPropertyPart> Resource { get; set; }
+
+        /// <summary>
+        /// A collection of properties describing the instrumentation that produced an event, if any. These correspond
+        /// to instrumentation scope attributes in the OpenTelemetry protocol, and may include the OpenTelemetry scope name
+        /// in a well-known <c>name</c> property.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public List<EventPropertyPart> Scope { get; set; }
+
+        /// <summary>
+        /// If the event is a span, the elapsed time between the start and end of the span.
+        /// </summary>
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public TimeSpan? Elapsed { get; set; }
     }
 }

src/Seq.Api/Model/Settings/SettingName.cs

@@ -165,7 +165,7 @@ public enum SettingName
         /// list. For example, <c>openid, profile, email</c>.
         /// </summary>
         OpenIdConnectScopes,
-
+        
         /// <summary>
         /// If using OpenID Connect, overrides the URI of the provider's metadata endpoint.
         /// </summary>

src/Seq.Api/ResourceGroups/DiagnosticsResourceGroup.cs

@@ -101,5 +101,25 @@ public async Task<StorageConsumptionPart> GetStorageConsumptionAsync(
             };
             return await GroupGetAsync<StorageConsumptionPart>("Storage", parameters, cancellationToken);
         }
+
+        /// <summary>
+        /// Retrieve the cluster log.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>The cluster log.</returns>
+        public async Task<string> GetClusterLogAsync(CancellationToken cancellationToken = default)
+        {
+            return await GroupGetStringAsync("ClusterLog", cancellationToken: cancellationToken);
+        }
+
+        /// <summary>
+        /// Retrieve metrics about cluster connections.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> allowing the operation to be canceled.</param>
+        /// <returns>A set of metrics relating to cluster network activity.</returns>
+        public async Task<ClusterMetricsPart> GetClusterMetricsAsync(CancellationToken cancellationToken = default)
+        {
+            return await GroupGetAsync<ClusterMetricsPart>("ClusterMetrics", cancellationToken: cancellationToken);
+        }
     }
 }

src/Seq.Api/Seq.Api.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Client library for the Seq HTTP API.</Description>
-    <VersionPrefix>2023.4.0</VersionPrefix>
+    <VersionPrefix>2024.1.0</VersionPrefix>
     <Authors>Datalust;Contributors</Authors>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>