Skip to content

Commit ec288ce

Browse files
authored
Rename Elastic.CommonSchema.Serilog.Sink => Elastic.Serilog.Sinks (#299)
1 parent 746aa5c commit ec288ce

File tree

14 files changed

+23
-21
lines changed

14 files changed

+23
-21
lines changed

ecs-dotnet.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.CommonSchema.Genera
7575
EndProject
7676
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}"
7777
EndProject
78-
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}"
78+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Serilog.Sinks", "src\Elastic.Serilog.Sinks\Elastic.Serilog.Sinks.csproj", "{30080079-D3EE-4BDC-9BE9-9D1B3B2BEF8D}"
7979
EndProject
8080
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.CommonSchema.Log4net", "src\Elastic.CommonSchema.Log4net\Elastic.CommonSchema.Log4net.csproj", "{DD7D6E56-58DB-4E13-9DFC-AE031F1C31B3}"
8181
EndProject
8282
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}"
8383
EndProject
84-
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}"
84+
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}"
8585
EndProject
8686
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}"
8787
EndProject
@@ -118,7 +118,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elasticsearch.IntegrationDe
118118
EndProject
119119
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{B268060B-83ED-4944-B135-C362DFCBFC0C}"
120120
EndProject
121-
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}"
121+
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}"
122122
EndProject
123123
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docs", "docs\docs.csproj", "{7FDB3B31-020A-40E3-B564-F06476320C40}"
124124
EndProject
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<ItemGroup>
2121
<ProjectReference Include="..\..\src\Elastic.Apm.SerilogEnricher\Elastic.Apm.SerilogEnricher.csproj" />
22-
<ProjectReference Include="..\..\src\Elastic.CommonSchema.Serilog.Sink\Elastic.CommonSchema.Serilog.Sink.csproj" />
22+
<ProjectReference Include="..\..\src\Elastic.Serilog.Sinks\Elastic.Serilog.Sinks.csproj" />
2323
</ItemGroup>
2424

2525
</Project>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using Elastic.Clients.Elasticsearch;
22
using Elastic.Clients.Elasticsearch.Core.Search;
33
using Elastic.Clients.Elasticsearch.IndexManagement;
4+
using Elastic.CommonSchema;
45
using Microsoft.Extensions.Hosting;
56
using Microsoft.Extensions.Logging;
67

7-
namespace Elastic.CommonSchema.Serilog.Sink.Example;
8+
namespace Elastic.Serilog.Sinks.Example;
89

910
/// <summary> Simulate work that logs in low volume with some time in between each log call </summary>
1011
public class HighVolumeWorkSimulation : BackgroundService

examples/Elastic.CommonSchema.Serilog.Sink.Example/Program.cs renamed to examples/Elastic.Serilog.Sinks.Example/Program.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,17 @@
33
using Elastic.Apm;
44
using Elastic.Apm.SerilogEnricher;
55
using Elastic.Channels;
6-
using Elastic.Channels.Diagnostics;
76
using Elastic.Clients.Elasticsearch;
8-
using Elastic.CommonSchema;
97
using Elastic.CommonSchema.Serilog;
10-
using Elastic.CommonSchema.Serilog.Sink;
11-
using Elastic.CommonSchema.Serilog.Sink.Example;
8+
using Elastic.Serilog.Sinks;
9+
using Elastic.Serilog.Sinks.Example;
1210
using Elastic.Elasticsearch.Ephemeral;
1311
using Elastic.Ingest.Elasticsearch;
1412
using Microsoft.Extensions.Configuration;
1513
using Microsoft.Extensions.DependencyInjection;
1614
using Microsoft.Extensions.Hosting;
1715
using Serilog;
1816
using Serilog.Events;
19-
using BulkResponse = Elastic.Ingest.Elasticsearch.Serialization.BulkResponse;
2017
using DataStreamName = Elastic.Ingest.Elasticsearch.DataStreams.DataStreamName;
2118
using Host = Microsoft.Extensions.Hosting.Host;
2219
using Log = Serilog.Log;
@@ -50,7 +47,7 @@
5047
{
5148
//transport.Authentication();
5249
})
53-
// This is the bit that Elastic.CommonSchema.Serilog.Sink introduces
50+
// This is the bit that Elastic.Serilog.Sinks introduces
5451
.WriteTo.Elasticsearch(new ElasticsearchSinkOptions(client.Transport)
5552
{
5653
BootstrapMethod = BootstrapMethod.Failure,

src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSink.cs renamed to src/Elastic.Serilog.Sinks/ElasticsearchSink.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using System.Linq;
44
using Elastic.Channels.Buffers;
55
using Elastic.Channels.Diagnostics;
6+
using Elastic.CommonSchema;
7+
using Elastic.CommonSchema.Serilog;
68
using Elastic.Ingest.Elasticsearch;
79
using Elastic.Ingest.Elasticsearch.CommonSchema;
810
using Elastic.Ingest.Elasticsearch.DataStreams;
@@ -13,7 +15,7 @@
1315
using Serilog.Debugging;
1416
using Serilog.Events;
1517

16-
namespace Elastic.CommonSchema.Serilog.Sink
18+
namespace Elastic.Serilog.Sinks
1719
{
1820
/// <summary>
1921
/// Provides configuration options to <see cref="ElasticsearchSink"/> to control how and where data gets written

src/Elastic.CommonSchema.Serilog.Sink/ElasticsearchSinkExtensions.cs renamed to src/Elastic.Serilog.Sinks/ElasticsearchSinkExtensions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using System;
22
using System.Collections.Generic;
3+
using Elastic.CommonSchema;
34
using Elastic.Transport;
45
using Serilog;
56
using Serilog.Configuration;
67

7-
namespace Elastic.CommonSchema.Serilog.Sink
8+
namespace Elastic.Serilog.Sinks
89
{
910
/// <summary>
1011
/// Extension methods on <see cref="LoggerSinkConfiguration"/> to aid with serilog log configuration building
File renamed without changes.

src/Elastic.CommonSchema.Serilog.Sink/TransportHelper.cs renamed to src/Elastic.Serilog.Sinks/TransportHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Elastic.Transport.Products;
66
using Elastic.Transport.Products.Elasticsearch;
77

8-
namespace Elastic.CommonSchema.Serilog.Sink
8+
namespace Elastic.Serilog.Sinks
99
{
1010
internal static class TransportHelper
1111
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<ProjectReference Include="..\..\src\Elastic.CommonSchema.Serilog.Sink\Elastic.CommonSchema.Serilog.Sink.csproj" />
15+
<ProjectReference Include="..\..\src\Elastic.Serilog.Sinks\Elastic.Serilog.Sinks.csproj" />
1616
<ProjectReference Include="..\Elasticsearch.IntegrationDefaults\Elasticsearch.IntegrationDefaults.csproj" />
1717
</ItemGroup>
1818

0 commit comments

Comments
 (0)