Rename Elastic.CommonSchema.Serilog.Sink => Elastic.Serilog.Sinks (#299)

elastic · May 2, 2023 · ec288ce · ec288ce
1 parent 746aa5c
commit ec288ce
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 21 deletions.
diff --git a/ecs-dotnet.sln b/ecs-dotnet.sln
@@ -75,13 +75,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.CommonSchema.Genera
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Ingest.Elasticsearch.CommonSchema", "src\Elastic.Ingest.Elasticsearch.CommonSchema\Elastic.Ingest.Elasticsearch.CommonSchema.csproj", "{68128AE4-350C-4FB2-A971-C9272A1F3829}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.CommonSchema.Serilog.Sink", "src\Elastic.CommonSchema.Serilog.Sink\Elastic.CommonSchema.Serilog.Sink.csproj", "{30080079-D3EE-4BDC-9BE9-9D1B3B2BEF8D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Serilog.Sinks", "src\Elastic.Serilog.Sinks\Elastic.Serilog.Sinks.csproj", "{30080079-D3EE-4BDC-9BE9-9D1B3B2BEF8D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.CommonSchema.Log4net", "src\Elastic.CommonSchema.Log4net\Elastic.CommonSchema.Log4net.csproj", "{DD7D6E56-58DB-4E13-9DFC-AE031F1C31B3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.CommonSchema.Log4net.Tests", "tests\Elastic.CommonSchema.Log4net.Tests\Elastic.CommonSchema.Log4net.Tests.csproj", "{14BFAF67-8DB6-48D0-B57E-84767BA2A239}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.CommonSchema.Serilog.Sinks.IntegrationTests", "tests-integration\Elastic.CommonSchema.Serilog.Sink.IntegrationTests\Elastic.CommonSchema.Serilog.Sinks.IntegrationTests.csproj", "{622CC10E-B475-4649-8411-CABC31E7C252}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Serilog.Sinks.IntegrationTests", "tests-integration\Elastic.Serilog.Sinks.IntegrationTests\Elastic.Serilog.Sinks.IntegrationTests.csproj", "{622CC10E-B475-4649-8411-CABC31E7C252}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Apm.Disabled.Serilog.Tests", "tests\Elastic.Apm.Disabled.Serilog.Tests\Elastic.Apm.Disabled.Serilog.Tests.csproj", "{73829D36-DB98-4D8F-8741-F167A787BF7B}"
 EndProject
@@ -118,7 +118,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.IntegrationDe
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B268060B-83ED-4944-B135-C362DFCBFC0C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.CommonSchema.Serilog.Sink.Example", "examples\Elastic.CommonSchema.Serilog.Sink.Example\Elastic.CommonSchema.Serilog.Sink.Example.csproj", "{1CAEFBD7-B800-41C4-81D3-CB6839FA563D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Serilog.Sinks.Example", "examples\Elastic.Serilog.Sinks.Example\Elastic.Serilog.Sinks.Example.csproj", "{1CAEFBD7-B800-41C4-81D3-CB6839FA563D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs", "docs\docs.csproj", "{7FDB3B31-020A-40E3-B564-F06476320C40}"
 EndProject

diff --git a/....CommonSchema.Serilog.Sink.Example.csproj → ...mple/Elastic.Serilog.Sinks.Example.csproj b/....CommonSchema.Serilog.Sink.Example.csproj → ...mple/Elastic.Serilog.Sinks.Example.csproj
@@ -19,7 +19,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\src\Elastic.Apm.SerilogEnricher\Elastic.Apm.SerilogEnricher.csproj" />
-      <ProjectReference Include="..\..\src\Elastic.CommonSchema.Serilog.Sink\Elastic.CommonSchema.Serilog.Sink.csproj" />
+      <ProjectReference Include="..\..\src\Elastic.Serilog.Sinks\Elastic.Serilog.Sinks.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/....Sink.Example/HighVolumeWorkSimulation.cs → ...Sinks.Example/HighVolumeWorkSimulation.cs b/....Sink.Example/HighVolumeWorkSimulation.cs → ...Sinks.Example/HighVolumeWorkSimulation.cs
@@ -1,10 +1,11 @@
 using Elastic.Clients.Elasticsearch;
 using Elastic.Clients.Elasticsearch.Core.Search;
 using Elastic.Clients.Elasticsearch.IndexManagement;
+using Elastic.CommonSchema;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace Elastic.CommonSchema.Serilog.Sink.Example;
+namespace Elastic.Serilog.Sinks.Example;
 
 /// <summary> Simulate work that logs in low volume with some time in between each log call </summary>
 public class HighVolumeWorkSimulation : BackgroundService

diff --git a/...monSchema.Serilog.Sink.Example/Program.cs → .../Elastic.Serilog.Sinks.Example/Program.cs b/...monSchema.Serilog.Sink.Example/Program.cs → .../Elastic.Serilog.Sinks.Example/Program.cs
@@ -3,20 +3,17 @@
 using Elastic.Apm;
 using Elastic.Apm.SerilogEnricher;
 using Elastic.Channels;
-using Elastic.Channels.Diagnostics;
 using Elastic.Clients.Elasticsearch;
-using Elastic.CommonSchema;
 using Elastic.CommonSchema.Serilog;
-using Elastic.CommonSchema.Serilog.Sink;
-using Elastic.CommonSchema.Serilog.Sink.Example;
+using Elastic.Serilog.Sinks;
+using Elastic.Serilog.Sinks.Example;
 using Elastic.Elasticsearch.Ephemeral;
 using Elastic.Ingest.Elasticsearch;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
-using BulkResponse = Elastic.Ingest.Elasticsearch.Serialization.BulkResponse;
 using DataStreamName = Elastic.Ingest.Elasticsearch.DataStreams.DataStreamName;
 using Host = Microsoft.Extensions.Hosting.Host;
 using Log = Serilog.Log;
@@ -50,7 +47,7 @@
 	{
 		//transport.Authentication();
 	})
-	// This is the bit that Elastic.CommonSchema.Serilog.Sink introduces
+	// This is the bit that Elastic.Serilog.Sinks introduces
 	.WriteTo.Elasticsearch(new ElasticsearchSinkOptions(client.Transport)
 	{
 		BootstrapMethod = BootstrapMethod.Failure,

diff --git a/.../Elastic.CommonSchema.Serilog.Sink.csproj → ...erilog.Sinks/Elastic.Serilog.Sinks.csproj b/.../Elastic.CommonSchema.Serilog.Sink.csproj → ...erilog.Sinks/Elastic.Serilog.Sinks.csproj
diff --git a/...nSchema.Serilog.Sink/ElasticsearchSink.cs → ...lastic.Serilog.Sinks/ElasticsearchSink.cs b/...nSchema.Serilog.Sink/ElasticsearchSink.cs → ...lastic.Serilog.Sinks/ElasticsearchSink.cs
@@ -3,6 +3,8 @@
 using System.Linq;
 using Elastic.Channels.Buffers;
 using Elastic.Channels.Diagnostics;
+using Elastic.CommonSchema;
+using Elastic.CommonSchema.Serilog;
 using Elastic.Ingest.Elasticsearch;
 using Elastic.Ingest.Elasticsearch.CommonSchema;
 using Elastic.Ingest.Elasticsearch.DataStreams;
@@ -13,7 +15,7 @@
 using Serilog.Debugging;
 using Serilog.Events;
 
-namespace Elastic.CommonSchema.Serilog.Sink
+namespace Elastic.Serilog.Sinks
 {
 	/// <summary>
 	/// Provides configuration options to <see cref="ElasticsearchSink"/> to control how and where data gets written

diff --git a/...rilog.Sink/ElasticsearchSinkExtensions.cs → ...ilog.Sinks/ElasticsearchSinkExtensions.cs b/...rilog.Sink/ElasticsearchSinkExtensions.cs → ...ilog.Sinks/ElasticsearchSinkExtensions.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
+using Elastic.CommonSchema;
 using Elastic.Transport;
 using Serilog;
 using Serilog.Configuration;
 
-namespace Elastic.CommonSchema.Serilog.Sink
+namespace Elastic.Serilog.Sinks
 {
 	/// <summary>
 	/// Extension methods on <see cref="LoggerSinkConfiguration"/> to aid with serilog log configuration building

diff --git a/...astic.CommonSchema.Serilog.Sink/README.md → src/Elastic.Serilog.Sinks/README.md b/...astic.CommonSchema.Serilog.Sink/README.md → src/Elastic.Serilog.Sinks/README.md
diff --git a/...monSchema.Serilog.Sink/TransportHelper.cs → src/Elastic.Serilog.Sinks/TransportHelper.cs b/...monSchema.Serilog.Sink/TransportHelper.cs → src/Elastic.Serilog.Sinks/TransportHelper.cs
@@ -5,7 +5,7 @@
 using Elastic.Transport.Products;
 using Elastic.Transport.Products.Elasticsearch;
 
-namespace Elastic.CommonSchema.Serilog.Sink
+namespace Elastic.Serilog.Sinks
 {
 	internal static class TransportHelper
 	{

diff --git a/...ema.Serilog.Sinks.IntegrationTests.csproj → ...tic.Serilog.Sinks.IntegrationTests.csproj b/...ema.Serilog.Sinks.IntegrationTests.csproj → ...tic.Serilog.Sinks.IntegrationTests.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Elastic.CommonSchema.Serilog.Sink\Elastic.CommonSchema.Serilog.Sink.csproj" />
+    <ProjectReference Include="..\..\src\Elastic.Serilog.Sinks\Elastic.Serilog.Sinks.csproj" />
     <ProjectReference Include="..\Elasticsearch.IntegrationDefaults\Elasticsearch.IntegrationDefaults.csproj" />
   </ItemGroup>
 

diff --git a/...g.Sink.IntegrationTests/SerilogCluster.cs → ....Sinks.IntegrationTests/SerilogCluster.cs b/...g.Sink.IntegrationTests/SerilogCluster.cs → ....Sinks.IntegrationTests/SerilogCluster.cs
@@ -3,7 +3,7 @@
 
 [assembly: TestFramework("Elastic.Elasticsearch.Xunit.Sdk.ElasticTestFramework", "Elastic.Elasticsearch.Xunit")]
 
-namespace Elastic.CommonSchema.Serilog.Sinks.IntegrationTests;
+namespace Elastic.Serilog.Sinks.IntegrationTests;
 
 public class SerilogCluster : TestClusterBase
 {

diff --git a/...nk.IntegrationTests/SerilogOutputTests.cs → ...ks.IntegrationTests/SerilogOutputTests.cs b/...nk.IntegrationTests/SerilogOutputTests.cs → ...ks.IntegrationTests/SerilogOutputTests.cs
@@ -7,7 +7,8 @@
 using Elastic.Channels.Diagnostics;
 using Elastic.Clients.Elasticsearch;
 using Elastic.Clients.Elasticsearch.IndexManagement;
-using Elastic.CommonSchema.Serilog.Sink;
+using Elastic.CommonSchema;
+using Elastic.Serilog.Sinks;
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Serilog;
@@ -16,7 +17,7 @@
 using DataStreamName = Elastic.Ingest.Elasticsearch.DataStreams.DataStreamName;
 using BulkResponse = Elastic.Ingest.Elasticsearch.Serialization.BulkResponse;
 
-namespace Elastic.CommonSchema.Serilog.Sinks.IntegrationTests
+namespace Elastic.Serilog.Sinks.IntegrationTests
 {
 	public class SerilogOutputTests : SerilogTestBase
 	{

diff --git a/...k.IntegrationTests/SerilogSelfLogTests.cs → ...s.IntegrationTests/SerilogSelfLogTests.cs b/...k.IntegrationTests/SerilogSelfLogTests.cs → ...s.IntegrationTests/SerilogSelfLogTests.cs
@@ -7,7 +7,7 @@
 using Elastic.Channels.Diagnostics;
 using Elastic.Clients.Elasticsearch;
 using Elastic.Clients.Elasticsearch.IndexManagement;
-using Elastic.CommonSchema.Serilog.Sink;
+using Elastic.Serilog.Sinks;
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Serilog;
@@ -16,7 +16,7 @@
 using DataStreamName = Elastic.Ingest.Elasticsearch.DataStreams.DataStreamName;
 using BulkResponse = Elastic.Ingest.Elasticsearch.Serialization.BulkResponse;
 
-namespace Elastic.CommonSchema.Serilog.Sinks.IntegrationTests
+namespace Elastic.Serilog.Sinks.IntegrationTests
 {
 	public class SerilogSelfLogTests : SerilogTestBase
 	{

diff --git a/....Sink.IntegrationTests/SerilogTestBase.cs → ...Sinks.IntegrationTests/SerilogTestBase.cs b/....Sink.IntegrationTests/SerilogTestBase.cs → ...Sinks.IntegrationTests/SerilogTestBase.cs
@@ -4,7 +4,7 @@
 using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using Xunit.Abstractions;
 
-namespace Elastic.CommonSchema.Serilog.Sinks.IntegrationTests
+namespace Elastic.Serilog.Sinks.IntegrationTests
 {
 	public abstract class SerilogTestBase : IClusterFixture<SerilogCluster>
 	{