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.

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

Update to serilog periodic batching 4.x #168

Merged

Conversation

jpfifer
Copy link
Contributor

@jpfifer jpfifer commented Feb 28, 2024

Updated Serilog and Serilog Periodic Batcher Dependencies to current version

The contract for serilog-periodic-batcher changed from a base class approach to a composition approach which requires changing the EventCollectorSink to support the new interface.
With the upgrade the target framework was matched to the target framework used by serilog-periodic-batcher.

Updated the target framework for the unit tests to match the target framework used by serilog-periodic-batcher

Additionally updated the tests, and sample Docker/compose. I've not been able to get it to run correctly, but it fails under the current dev version as well (at least on Fedora Linux 39)

@jpfifer jpfifer changed the title Update to serilog periodic batch 4.x Update to serilog periodic batching 4.x Feb 28, 2024
@VictorioBerra
Copy link
Member

@jpfifer Thanks for this PR, I am working to get access as a co-maintainer to this project, and then I can start reviewing and getting some of these PRs moving. Would you mind to re-visit this and give it another look?

Regarding the tests, what issues are you having?

@merbla
Copy link
Contributor

merbla commented Mar 16, 2024

@VictorioBerra you should have access now LMK.

@VictorioBerra
Copy link
Member

@merbla Looks good, thank you!

@VictorioBerra VictorioBerra self-assigned this Mar 16, 2024
@EEParker EEParker self-requested a review March 16, 2024 02:31
@EEParker
Copy link
Collaborator

EEParker commented Mar 16, 2024

This looks good, based on some of my own branches I think #166 should be merged in first, and this rebased afterward. There are a few more changes I've have pending for dotnet 8.0 here, but I think both of these can be merged in first.

@EEParker EEParker merged commit 2cfa29b into serilog-contrib:dev Mar 16, 2024
@jpfifer jpfifer deleted the update-to-serilog-periodic-batch-4.x branch March 18, 2024 15:36
@jpfifer
Copy link
Contributor Author

jpfifer commented Mar 18, 2024

Thanks for the help

EEParker added a commit that referenced this pull request Apr 3, 2024
* Bump System.Net.Http from 4.3.3 to 4.3.4 in /sample/Sample

Bumps System.Net.Http from 4.3.3 to 4.3.4.

Signed-off-by: dependabot[bot] <support@github.com>

* Bump System.Net.Http from 4.3.0 to 4.3.4 in /src/Serilog.Sinks.Splunk

Bumps System.Net.Http from 4.3.0 to 4.3.4.

Signed-off-by: dependabot[bot] <support@github.com>

* Bump System.Net.Http in /test/Serilog.Sinks.Splunk.Tests

Bumps System.Net.Http from 4.3.3 to 4.3.4.

Signed-off-by: dependabot[bot] <support@github.com>

* Bump System.Net.Http from 4.3.0 to 4.3.4 in /src/Serilog.Sinks.UDP

Bumps System.Net.Http from 4.3.0 to 4.3.4.

Signed-off-by: dependabot[bot] <support@github.com>

* add default batch config

* Update expired GitHub Key

* add default batch config

* Update expired GitHub Key

* fix bug dispose (#153)

* Regenerate API Key for NuGet

* Splunk 9.1 + .NET 6 (#166)

* Sample: Target net6.0. Added additional logging statements.

* Docker: Splunk 9.1.

* Tests: Target net6.0 and updated nuget packages.

* Added constant for services/collector. Event request trims / from uri. Updated collector URL for Splunk 9.1

* Update to serilog periodic batching 4.x (#168)

* Updated dependencies to Serilog 3.1 and Periodic Batching Sink to 4.0.0

* Update version to 4.0.0 due to the breaking constructor changes on the EventCollectorSink

* Update Dockerfile with net6.0 versions

* Use the latest version of Splunk

The 7.2 label does not appear to be available anymore.

* Add in missing build for net6.0

* Use forward slash for ignore

This should work on Windows as well

* Use the same Framework reference for the sample

Everything else is using at least net6.0 so the Sample should as well

---------

Co-authored-by: Justin Pfifer <justin.pfifer@carvana.com>
Co-authored-by: Jeff Parker, PE <EEParker@users.noreply.github.com>

* dotnet 8.0 updates (#171)

* Feature/161 subsecond decimals (#172)

* Fixes #161 add subsecond decimal configuration

* Fixes #167 Add a flag for RenderedMessage

* Update SubSecondPrecision to use an enum.

Based on 3,6,9 decimals, see
https://docs.splunk.com/Documentation/Splunk/9.2.0/SearchReference/Commontimeformatvariables

* Add unit tests and update documentation

* Invert renderMessage check

* Update sample docker-compose project

- add new tests
- add a docker-compose vscode project
- allow subsecond precision.

* Add comment for configuring splunk

* Fix formatting for nanoseconds

* Enable all tests in sample app

---------

Co-authored-by: Victorio Berra <toryberra@gmail.com>

* Set up GitHub Actions (#174)

* Enable GitHub Actions

* Main branch is called master in this repo

* Ignore .idea

* No need to offset builds by 200

* work on build for new project format

* add automatic release notes

---------

Co-authored-by: EEParker <EEParker@users.noreply.github.com>

* Filter branches that push to nuget (#177)

* Security Policy, scanning and dependency updates (#176)

* Add dependabot configuration

* Add codeql

* Add security policy

* Update dependabot.yml add newline

* update branches

* Update SECURITY.md

* Readme and package license fix

* Update dotnet pack command line

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthew Erbs <matthew.erbs@merbla.com>
Co-authored-by: Mohsen Rajabi <m.kabir8895@gmail.com>
Co-authored-by: Havagan <Havagan@users.noreply.github.com>
Co-authored-by: Justin Pfifer <61801015+jpfifer@users.noreply.github.com>
Co-authored-by: Justin Pfifer <justin.pfifer@carvana.com>
Co-authored-by: Victorio Berra <toryberra@gmail.com>
Co-authored-by: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants