Merge pull request #143 from datalust/dev

2025.1.0 Release

Author: nblumhardt

appveyor.yml

@@ -9,7 +9,7 @@ artifacts:
 deploy:
 - provider: NuGet
   api_key:
-    secure: uJjVQ3SRUEcaUqdyKuuIvtrpNrO+u9P07aLbUumFiqZhjj3uI+PlZULv8JtgrxR/
+    secure: Jxi/gameJWSW1ncE+SpU6C51kENE7mSxtKYPnM5CrvTYnfpaf8Y5B7PsROv2Oglg
   skip_symbols: true
   on:
     branch: /^(main|dev)$/

example/SeqEnableAAD/SeqEnableAAD.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>seq-enable-aad</AssemblyName>
     <Nullable>enable</Nullable>
   </PropertyGroup>

example/SeqQuery/SeqQuery.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>seq-query</AssemblyName>
     <Nullable>enable</Nullable>

example/SeqTail/Program.cs

@@ -3,10 +3,10 @@
 using DocoptNet;
 using Seq.Api;
 using Serilog;
-using System.Reactive.Linq;
 using Serilog.Formatting.Compact.Reader;
 using System.Threading;
-using Newtonsoft.Json.Linq;
+
+// ReSharper disable AccessToDisposedClosure
 
 const string usage = @"seq-tail: watch a Seq query from your console.
 
@@ -29,17 +29,17 @@
 
 try
 {
-    var arguments = new Docopt().Apply(usage, args, version: "Seq Tail 0.2", exit: true)!;
+    var arguments = new Docopt().Apply(usage, args, version: "Seq Tail 0.3", exit: true)!;
 
     var server = arguments["<server>"].ToString();
     var apiKey = Normalize(arguments["--apikey"]);
     var filter = Normalize(arguments["--filter"]);
 
-    var cancel = new CancellationTokenSource();
+    using var cts = new CancellationTokenSource();
     Console.WriteLine("Tailing, press Ctrl+C to exit.");
-    Console.CancelKeyPress += (_,_) => cancel.Cancel();
+    Console.CancelKeyPress += (_,_) => cts.Cancel();
 
-    var run = Task.Run(() => Run(server, apiKey, filter, cancel), cancel.Token);
+    var run = Task.Run(() => Run(server, apiKey, filter, cts.Token), cts.Token);
 
     run.GetAwaiter().GetResult();
 }
@@ -56,22 +56,20 @@
     return string.IsNullOrWhiteSpace(s) ? null : s;
 }
 
-static async Task Run(string server, string? apiKey, string? filter, CancellationTokenSource cancel)
+static async Task Run(string server, string? apiKey, string? filter, CancellationToken cancel)
 {
     var connection = new SeqConnection(server, apiKey);
 
-    string? strict = null;
+    string? strictFilter = null;
     if (filter != null)
     {
         var converted = await connection.Expressions.ToStrictAsync(filter);
-        strict = converted.StrictExpression;
+        strictFilter = converted.StrictExpression;
     }
 
-    using var stream = await connection.Events.StreamAsync<JObject>(filter: strict);
-    var subscription = stream
-        .Select(LogEventReader.ReadFromJObject)
-        .Subscribe(Log.Write, cancel.Cancel);
-
-    cancel.Token.WaitHandle.WaitOne();
-    subscription.Dispose();
+    await foreach (var evt in connection.Events.StreamDocumentsAsync(filter: strictFilter, clef: true, cancellationToken: cancel))
+    {
+        var logEvent = LogEventReader.ReadFromString(evt);
+        Log.Write(logEvent);
+    }
 }

example/SeqTail/SeqTail.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>seq-tail</AssemblyName>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>

example/SignalCopy/SignalCopy.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <AssemblyName>signal-copy</AssemblyName>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>

src/Seq.Api/Client/SeqApiClient.cs

@@ -15,27 +15,47 @@
 using System;
 using System.Net;
 
-namespace Seq.Api.Client
+#nullable enable
+
+namespace Seq.Api.Client;
+
+/// <summary>
+/// Thrown when an action cannot be performed.
+/// </summary>
+public class SeqApiException : Exception
 {
     /// <summary>
-    /// Thrown when an action cannot be performed.
+    /// Construct a <see cref="SeqApiException"/> with the given message and status code.
     /// </summary>
-    public class SeqApiException : Exception
+    /// <param name="message">A message describing the error.</param>
+    public SeqApiException(string message)
+        : base(message)
     {
-        /// <summary>
-        /// Construct a <see cref="SeqApiException"/> with the given message and status code.
-        /// </summary>
-        /// <param name="message">A message describing the error.</param>
-        /// <param name="statusCode">The corresponding status code returned from Seq, if available.</param>
-        public SeqApiException(string message, HttpStatusCode? statusCode)
-            : base(message)
-        {
-            StatusCode = statusCode;
-        }
-        
-        /// <summary>
-        /// The status code returned from Seq, if available.
-        /// </summary>
-        public HttpStatusCode? StatusCode { get; }
     }
+
+    /// <summary>
+    /// Construct a <see cref="SeqApiException"/> with the given message and status code.
+    /// </summary>
+    /// <param name="message">A message describing the error.</param>
+    /// <param name="statusCode">The corresponding status code returned from Seq, if available.</param>
+    public SeqApiException(string message, HttpStatusCode? statusCode)
+        : this(message)
+    {
+        StatusCode = statusCode;
+    }
+
+    /// <summary>
+    /// Construct a <see cref="SeqApiException"/> with the given message and status code.
+    /// </summary>
+    /// <param name="message">A message describing the error.</param>
+    /// <param name="innerException">The cause of the API failure.</param>
+    public SeqApiException(string message, Exception innerException)
+        : base(message, innerException)
+    {
+    }
+        
+    /// <summary>
+    /// The status code returned from Seq, if available.
+    /// </summary>
+    public HttpStatusCode? StatusCode { get; }
 }

src/Seq.Api/Client/SeqApiException.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Seq.Api.Model.AppInstances;
 using Seq.Api.Model.LogEvents;
 using Seq.Api.Model.Shared;
 

src/Seq.Api/Model/Alerting/AlertOccurrencePart.cs

@@ -1,5 +1,4 @@
-using Seq.Api.Model.LogEvents;
-using Seq.Api.Model.Shared;
+using Seq.Api.Model.Shared;
 
 namespace Seq.Api.Model.Alerting
 {