use Seq.Syntax for expressions

Author: KodrAus

Build.Docker.ps1

@@ -13,13 +13,16 @@ $archs = @(
     @{ rid = "arm64"; platform = "linux/arm64/v8" }
 )
 
+$endToEndVersion = "preview"
+
 function Execute-Tests
 {
     & dotnet test ./test/SeqCli.Tests/SeqCli.Tests.csproj -c Release -f $framework /p:Configuration=Release /p:VersionPrefix=$version
     if ($LASTEXITCODE -ne 0) { exit 1 }
 
     cd ./test/SeqCli.EndToEnd/
-    docker pull datalust/seq:latest
+    docker pull "datalust/seq:$endToEndVersion"
+    docker tag "datalust/seq:$endToEndVersion" latest
     & dotnet run -f $framework -- --docker-server
     if ($LASTEXITCODE -ne 0)
     { 

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100-rc.2.23502.2"
+    "version": "8.0.100"
   }
 }

seqcli.sln

@@ -46,12 +46,6 @@ EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Roastery", "src\Roastery\Roastery.csproj", "{D2CB1112-7CD3-4A1B-A114-25130C96295E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extern", "extern", "{1F375B18-60F7-4505-870D-B2A058B16335}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seq.Syntax", "extern\Seq.Syntax\Seq.Syntax.csproj", "{4ED574CE-AFC6-41B7-88EB-79533DC7111B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seq.Syntax.Tests", "extern\Seq.Syntax.Tests\Seq.Syntax.Tests.csproj", "{2291818D-F0AF-45C5-BEDB-19C47296A0C5}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|AnyCPU = Debug|AnyCPU
@@ -74,14 +68,6 @@ Global
 		{DBC69360-519B-4A9B-829B-2AE1B5412521}.Debug|AnyCPU.Build.0 = Debug|Any CPU
 		{DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|AnyCPU.ActiveCfg = Release|Any CPU
 		{DBC69360-519B-4A9B-829B-2AE1B5412521}.Release|AnyCPU.Build.0 = Release|Any CPU
-		{4ED574CE-AFC6-41B7-88EB-79533DC7111B}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
-		{4ED574CE-AFC6-41B7-88EB-79533DC7111B}.Debug|AnyCPU.Build.0 = Debug|Any CPU
-		{4ED574CE-AFC6-41B7-88EB-79533DC7111B}.Release|AnyCPU.ActiveCfg = Release|Any CPU
-		{4ED574CE-AFC6-41B7-88EB-79533DC7111B}.Release|AnyCPU.Build.0 = Release|Any CPU
-		{2291818D-F0AF-45C5-BEDB-19C47296A0C5}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU
-		{2291818D-F0AF-45C5-BEDB-19C47296A0C5}.Debug|AnyCPU.Build.0 = Debug|Any CPU
-		{2291818D-F0AF-45C5-BEDB-19C47296A0C5}.Release|AnyCPU.ActiveCfg = Release|Any CPU
-		{2291818D-F0AF-45C5-BEDB-19C47296A0C5}.Release|AnyCPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,8 +78,6 @@ Global
 		{B86DEF3C-C461-4126-AD49-986EBB19B487} = {3587B633-0C03-4235-8903-6226900328F1}
 		{7F7CAC3A-1046-4D2B-BF9F-F14525918295} = {0779824B-502D-450B-BB43-036949C911C4}
 		{D2CB1112-7CD3-4A1B-A114-25130C96295E} = {FC0A256C-CC1F-4ECE-AF09-707248D10DC1}
-		{4ED574CE-AFC6-41B7-88EB-79533DC7111B} = {1F375B18-60F7-4505-870D-B2A058B16335}
-		{2291818D-F0AF-45C5-BEDB-19C47296A0C5} = {1F375B18-60F7-4505-870D-B2A058B16335}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6D299713-28D4-4078-9DA7-9033679CD200}

src/SeqCli/SeqCli.csproj

@@ -28,6 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Destructurama.JsonNet" Version="2.0.0" />
     <PackageReference Include="newtonsoft.json" Version="13.0.3" />
+    <PackageReference Include="Seq.Syntax" Version="1.0.0-dev-00060" />
     <PackageReference Include="Serilog" Version="3.1.0-dev-02078" />
     <PackageReference Include="serilog.expressions" Version="4.0.0-dev-00139" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0-dev-00961" />
@@ -43,7 +44,6 @@
     <PackageReference Include="Tavis.UriTemplates" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\extern\Seq.Syntax\Seq.Syntax.csproj" />
     <ProjectReference Include="..\Roastery\Roastery.csproj" />
   </ItemGroup>
 </Project>

test/SeqCli.EndToEnd/Data/spans.clef

@@ -0,0 +1,3 @@
+{"@t":"2023-12-20T00:55:07Z","@st":"2023-12-20T00:50:07Z","@tr":"af2f559d8ac24a288d2aaef55439778b","@sp":"5b08fd4ac3aa42d4","@ps":"44acf182dec544fb","@ra":{"a":1},"@m":"My info log"}
+{"@l":"Warning","@t":"2023-12-20T00:55:07Z","@st":"2023-12-20T00:50:07Z","@tr":"af2f559d8ac24a288d2aaef55439778b","@sp":"5b08fd4ac3aa42d4","@ps":"44acf182dec544fb","@ra":{"a":1},"@m":"My warning log"}
+{"@l":"ERR","@t":"2023-12-20T00:55:07Z","@st":"2023-12-20T00:50:07Z","@tr":"af2f559d8ac24a288d2aaef55439778b","@sp":"5b08fd4ac3aa42d4","@ps":"44acf182dec544fb","@ra":{"a":1},"@m":"My error log"}

test/SeqCli.EndToEnd/Ingest/SpanIngestionTestCase.cs

@@ -0,0 +1,29 @@
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Seq.Api;
+using SeqCli.EndToEnd.Support;
+using Serilog;
+using Xunit;
+
+namespace SeqCli.EndToEnd.Ingest;
+
+public class SpanIngestionTestCase : ICliTestCase
+{
+    public async Task ExecuteAsync(
+        SeqConnection connection,
+        ILogger logger,
+        CliCommandRunner runner)
+    {
+        var inputFile = Path.Combine("Data", "spans.clef");
+        Assert.True(File.Exists(inputFile));
+
+        var exit = runner.Exec("ingest", $"--json -i {inputFile}");
+        Assert.Equal(0, exit);
+
+        var events = await connection.Events.ListAsync();
+        Assert.Equal(3, events.Count);
+        Assert.Equal(3, events.Count(e => e.TraceId == "af2f559d8ac24a288d2aaef55439778b"));
+        Assert.Equal(3, events.Count(e => e.SpanId == "5b08fd4ac3aa42d4"));
+    }
+}

test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj

@@ -13,6 +13,9 @@
     <None Update="Data\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Data\spans.clef">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\SeqCli\SeqCli.csproj" />