Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed sequenceToken from PeriodicBatchingSinkImplementationCallback #143

Merged
merged 4 commits into from
Jul 23, 2024
Merged

Removed sequenceToken from PeriodicBatchingSinkImplementationCallback #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8920858
Removed sequenceToken, done related changes in PeriodicBatchingSinkIm…
VadymLevkovskyi Jul 22, 2024
7ddec32
AWSSDK.CloudWatchLogs min version increased to 3.7.102.27
VadymLevkovskyi Jul 23, 2024
900f1bd
DataAlreadyAcceptedException, InvalidSequenceTokenException exception…
VadymLevkovskyi Jul 23, 2024
94d4c8d
Library minor version upd to 4.3
VadymLevkovskyi Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
env:
NUGET_KEY: ${{ secrets.NUGET_KEY }}
run: |
buildNumber="4.2.${GITHUB_RUN_NUMBER}"
buildNumber="4.3.${GITHUB_RUN_NUMBER}"
sed "s/0.0.1/${buildNumber}/g" src/Serilog.Sinks.AwsCloudWatch/*.csproj -i
dotnet pack -c Release -o artifacts || exit 1
dotnet nuget push artifacts/Serilog.Sinks.AwsCloudWatch.${buildNumber}.nupkg -s "https://api.nuget.org/v3/index.json" -k "$NUGET_KEY"
Expand Down
54 changes: 0 additions & 54 deletions src/Serilog.Sinks.AwsCloudWatch/PeriodicBatchingSinkImplementationCallback.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Threading.Tasks;
using Amazon.CloudWatchLogs;
using Amazon.CloudWatchLogs.Model;
using Serilog.Events;
using Serilog.Formatting;
using Serilog.Sinks.PeriodicBatching;
using LogEvent = Serilog.Events.LogEvent;
Expand All @@ -20,7 +19,6 @@ internal class PeriodicBatchingSinkImplementationCallback: IBatchedLogEventSink
private readonly ICloudWatchSinkOptions options;
private bool hasInit;
private string logStreamName;
private string nextSequenceToken;
private readonly ITextFormatter textFormatter;

private readonly SemaphoreSlim syncObject = new SemaphoreSlim(1);
Expand Down Expand Up @@ -108,7 +106,6 @@ private async Task CreateLogGroupAsync()
private void UpdateLogStreamName()
{
logStreamName = options.LogStreamNameProvider.GetLogStreamName();
nextSequenceToken = null; // always reset on a new stream
}

/// <summary>
Expand All @@ -129,19 +126,6 @@ private async Task CreateLogStreamAsync()
};
var createLogStreamResponse = await cloudWatchClient.CreateLogStreamAsync(createLogStreamRequest);
}
else
{
nextSequenceToken = logStream.UploadSequenceToken;
}
}

/// <summary>
/// Updates the log stream sequence token.
/// </summary>
private async Task UpdateLogStreamSequenceTokenAsync()
{
var logStream = await GetLogStreamAsync();
nextSequenceToken = logStream?.UploadSequenceToken;
}

/// <summary>
Expand Down Expand Up @@ -226,16 +210,12 @@ private async Task PublishBatchAsync(List<InputLogEvent> batch)
{
LogGroupName = options.LogGroupName,
LogStreamName = logStreamName,
SequenceToken = nextSequenceToken,
LogEvents = batch
};

// actually upload the event to CloudWatch
var putLogEventsResponse = await cloudWatchClient.PutLogEventsAsync(putLogEventsRequest);

// remember the next sequence token, which is required
nextSequenceToken = putLogEventsResponse.NextSequenceToken;

success = true;
}
catch (ServiceUnavailableException e)
Expand All @@ -254,40 +234,6 @@ private async Task PublishBatchAsync(List<InputLogEvent> batch)
await CreateLogGroupAsync();
await CreateLogStreamAsync();
}
catch (DataAlreadyAcceptedException e)
{
Debugging.SelfLog.WriteLine("Data already accepted. Attempt: {0} Error: {1}", attemptIndex, e);
try
{
await UpdateLogStreamSequenceTokenAsync();
}
catch (Exception ex)
{
Debugging.SelfLog.WriteLine("Unable to update log stream sequence. Attempt: {0} Error: {1}", attemptIndex, ex);

// try again with a different log stream
UpdateLogStreamName();
await CreateLogStreamAsync();
}
attemptIndex++;
}
catch (InvalidSequenceTokenException e)
{
Debugging.SelfLog.WriteLine("Invalid sequence token. Attempt: {0} Error: {1}", attemptIndex, e);
try
{
await UpdateLogStreamSequenceTokenAsync();
}
catch (Exception ex)
{
Debugging.SelfLog.WriteLine("Unable to update log stream sequence. Attempt: {0} Error: {1}", attemptIndex, ex);

// try again with a different log stream
UpdateLogStreamName();
await CreateLogStreamAsync();
}
attemptIndex++;
}
catch (Exception e)
{
Debugging.SelfLog.WriteLine("Unhandled exception. Error: {0}", e);
Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Sinks.AwsCloudWatch/Serilog.Sinks.AwsCloudWatch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A Serilog sink that logs to AWS CloudWatch</Description>
<AssemblyTitle>AWS Cloud Watch Serilog Sink</AssemblyTitle>
Expand Down Expand Up @@ -28,7 +28,7 @@
<None Include="../../readme.md" pack="true" PackagePath="." />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.CloudWatchLogs" Version="[3.7.1,)" />
<PackageReference Include="AWSSDK.CloudWatchLogs" Version="[3.7.102.27,)" />
<!-- This has to be here to prevent breaking Serilog.Formatting.Json.JSonFormatter, see https://github.com/Cimpress-MCP/serilog-sinks-awscloudwatch/issues/131 -->
<PackageReference Include="Serilog" Version="[3.0.0,)" />
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="[3.1.0,)" />
Expand Down
Loading
Loading