diff --git a/ecs-dotnet.sln b/ecs-dotnet.sln index 2fb35ef0..4ebb0bac 100644 --- 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/examples/Elastic.CommonSchema.Serilog.Sink.Example/Elastic.CommonSchema.Serilog.Sink.Example.csproj b/examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj similarity index 88% rename from examples/Elastic.CommonSchema.Serilog.Sink.Example/Elastic.CommonSchema.Serilog.Sink.Example.csproj rename to examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj index 6010e2d4..8838c190 100644 --- a/examples/Elastic.CommonSchema.Serilog.Sink.Example/Elastic.CommonSchema.Serilog.Sink.Example.csproj +++ b/examples/Elastic.Serilog.Sinks.Example/Elastic.Serilog.Sinks.Example.csproj @@ -19,7 +19,7 @@ - + diff --git a/examples/Elastic.CommonSchema.Serilog.Sink.Example/HighVolumeWorkSimulation.cs b/examples/Elastic.Serilog.Sinks.Example/HighVolumeWorkSimulation.cs similarity index 95% rename from examples/Elastic.CommonSchema.Serilog.Sink.Example/HighVolumeWorkSimulation.cs rename to examples/Elastic.Serilog.Sinks.Example/HighVolumeWorkSimulation.cs index aa144756..1c8af656 100644 --- a/examples/Elastic.CommonSchema.Serilog.Sink.Example/HighVolumeWorkSimulation.cs +++ b/examples/Elastic.Serilog.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; /// Simulate work that logs in low volume with some time in between each log call public class HighVolumeWorkSimulation : BackgroundService diff --git a/examples/Elastic.CommonSchema.Serilog.Sink.Example/Program.cs b/examples/Elastic.Serilog.Sinks.Example/Program.cs similarity index 90% rename from examples/Elastic.CommonSchema.Serilog.Sink.Example/Program.cs rename to examples/Elastic.Serilog.Sinks.Example/Program.cs index d50370dd..66c16b1b 100644 --- a/examples/Elastic.CommonSchema.Serilog.Sink.Example/Program.cs +++ b/examples/Elastic.Serilog.Sinks.Example/Program.cs @@ -3,12 +3,10 @@ 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; @@ -16,7 +14,6 @@ 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/src/Elastic.CommonSchema.Serilog.Sink/Elastic.CommonSchema.Serilog.Sink.csproj b/src/Elastic.Serilog.Sinks/Elastic.Serilog.Sinks.csproj similarity index 100% rename from src/Elastic.CommonSchema.Serilog.Sink/Elastic.CommonSchema.Serilog.Sink.csproj rename to src/Elastic.Serilog.Sinks/Elastic.Serilog.Sinks.csproj diff --git a/src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSink.cs b/src/Elastic.Serilog.Sinks/ElasticsearchSink.cs similarity index 98% rename from src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSink.cs rename to src/Elastic.Serilog.Sinks/ElasticsearchSink.cs index eef0f503..96d8902a 100644 --- a/src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSink.cs +++ b/src/Elastic.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 { /// /// Provides configuration options to to control how and where data gets written diff --git a/src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSinkExtensions.cs b/src/Elastic.Serilog.Sinks/ElasticsearchSinkExtensions.cs similarity index 99% rename from src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSinkExtensions.cs rename to src/Elastic.Serilog.Sinks/ElasticsearchSinkExtensions.cs index d39a2337..e1cb738c 100644 --- a/src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSinkExtensions.cs +++ b/src/Elastic.Serilog.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 { /// /// Extension methods on to aid with serilog log configuration building diff --git a/src/Elastic.CommonSchema.Serilog.Sink/README.md b/src/Elastic.Serilog.Sinks/README.md similarity index 100% rename from src/Elastic.CommonSchema.Serilog.Sink/README.md rename to src/Elastic.Serilog.Sinks/README.md diff --git a/src/Elastic.CommonSchema.Serilog.Sink/TransportHelper.cs b/src/Elastic.Serilog.Sinks/TransportHelper.cs similarity index 97% rename from src/Elastic.CommonSchema.Serilog.Sink/TransportHelper.cs rename to src/Elastic.Serilog.Sinks/TransportHelper.cs index 602f5ea7..a7abc793 100644 --- a/src/Elastic.CommonSchema.Serilog.Sink/TransportHelper.cs +++ b/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/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/Elastic.CommonSchema.Serilog.Sinks.IntegrationTests.csproj b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/Elastic.Serilog.Sinks.IntegrationTests.csproj similarity index 81% rename from tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/Elastic.CommonSchema.Serilog.Sinks.IntegrationTests.csproj rename to tests-integration/Elastic.Serilog.Sinks.IntegrationTests/Elastic.Serilog.Sinks.IntegrationTests.csproj index a4659b51..9a714e5a 100644 --- a/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/Elastic.CommonSchema.Serilog.Sinks.IntegrationTests.csproj +++ b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/Elastic.Serilog.Sinks.IntegrationTests.csproj @@ -12,7 +12,7 @@ - + diff --git a/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogCluster.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogCluster.cs similarity index 80% rename from tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogCluster.cs rename to tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogCluster.cs index ad0af548..b79f68c2 100644 --- a/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogCluster.cs +++ b/tests-integration/Elastic.Serilog.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/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogOutputTests.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogOutputTests.cs similarity index 95% rename from tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogOutputTests.cs rename to tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogOutputTests.cs index 17a83794..c2c5c125 100644 --- a/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogOutputTests.cs +++ b/tests-integration/Elastic.Serilog.Sinks.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/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogSelfLogTests.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogSelfLogTests.cs similarity index 95% rename from tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogSelfLogTests.cs rename to tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogSelfLogTests.cs index 6d9ec481..5443aea5 100644 --- a/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogSelfLogTests.cs +++ b/tests-integration/Elastic.Serilog.Sinks.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/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogTestBase.cs b/tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogTestBase.cs similarity index 88% rename from tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogTestBase.cs rename to tests-integration/Elastic.Serilog.Sinks.IntegrationTests/SerilogTestBase.cs index 7b6afb5c..b99cbda6 100644 --- a/tests-integration/Elastic.CommonSchema.Serilog.Sink.IntegrationTests/SerilogTestBase.cs +++ b/tests-integration/Elastic.Serilog.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 {