Merge branch 'main' into migrate-docs

Mpdreamz · Mpdreamz · commit 45bed1639b62 · 2025-02-26T15:48:44.000+01:00
diff --git a/.github/workflows/comment-on-asciidoc-changes.yml b/.github/workflows/comment-on-asciidoc-changes.yml
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
@@ -0,0 +1,19 @@
+name: docs-build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request_target: ~
+  merge_group: ~
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
+    with:
+      path-pattern: docs/**
+    permissions:
+      deployments: write
+      id-token: write
+      contents: read
+      pull-requests: read
diff --git a/.github/workflows/docs-cleanup.yml b/.github/workflows/docs-cleanup.yml
@@ -0,0 +1,14 @@
+name: docs-cleanup
+
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
+    permissions:
+      contents: none
+      id-token: write
+      deployments: write
diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
@@ -6,7 +6,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Argu" Version="6.0.0" />
+    <PackageReference Include="Argu" Version="6.2.5" />
     <PackageReference Include="Bullseye" Version="3.3.0" />
     <PackageReference Include="Proc" Version="0.6.2" />
     <PackageReference Include="Fake.Tools.Git" Version="5.15.0" />
diff --git a/src/Elastic.CommonSchema.Serilog/LogEventConverter.cs b/src/Elastic.CommonSchema.Serilog/LogEventConverter.cs
@@ -21,10 +21,10 @@ public static class LogEventConverter
 		/// <summary>
 		/// Converts a <see cref="LogEvent"/> to an <typeparamref name="TEcsDocument"/>
 		/// </summary>
-		public static TEcsDocument ConvertToEcs<TEcsDocument>(LogEvent logEvent, IEcsTextFormatterConfiguration<TEcsDocument> configuration)
+		public static TEcsDocument ConvertToEcs<TEcsDocument>(LogEvent logEvent, IEcsTextFormatterConfiguration<TEcsDocument> configuration, EcsDocumentCreationCache? initialCache = null)
 			where TEcsDocument : EcsDocument, new()
 		{
-			var ecsEvent = EcsDocument.CreateNewWithDefaults<TEcsDocument>(logEvent.Timestamp, logEvent.Exception, configuration);
+			var ecsEvent = EcsDocument.CreateNewWithDefaults<TEcsDocument>(logEvent.Timestamp, logEvent.Exception, configuration, initialCache);
 
 			if (logEvent.TryGetScalarString(SpecialKeys.MachineName, out var machineName))
 			{

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ public static class LogEventConverter`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Converts a <see cref="LogEvent"/> to an <typeparamref name="TEcsDocument"/>`
`23`	`23`	`/// </summary>`
`24`		`- public static TEcsDocument ConvertToEcs<TEcsDocument>(LogEvent logEvent, IEcsTextFormatterConfiguration<TEcsDocument> configuration)`
	`24`	`+ public static TEcsDocument ConvertToEcs<TEcsDocument>(LogEvent logEvent, IEcsTextFormatterConfiguration<TEcsDocument> configuration, EcsDocumentCreationCache? initialCache = null)`
`25`	`25`	`where TEcsDocument : EcsDocument, new()`
`26`	`26`	`{`
`27`		`- var ecsEvent = EcsDocument.CreateNewWithDefaults<TEcsDocument>(logEvent.Timestamp, logEvent.Exception, configuration);`
	`27`	`+ var ecsEvent = EcsDocument.CreateNewWithDefaults<TEcsDocument>(logEvent.Timestamp, logEvent.Exception, configuration, initialCache);`
`28`	`28`
`29`	`29`	`if (logEvent.TryGetScalarString(SpecialKeys.MachineName, out var machineName))`
`30`	`30`	`{`