From 8a3033bdc2df86aa64327d9d00b21a24fa7b2aa5 Mon Sep 17 00:00:00 2001 From: Martin Emrich Date: Tue, 29 Aug 2023 11:00:44 +0200 Subject: [PATCH 1/4] default to nullbyte delimiter for GELF --- src/codecs/encoding/config.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/codecs/encoding/config.rs b/src/codecs/encoding/config.rs index cdae762bf6484..f0239f9ebf20b 100644 --- a/src/codecs/encoding/config.rs +++ b/src/codecs/encoding/config.rs @@ -107,10 +107,12 @@ impl EncodingConfigWithFraming { (None, Serializer::Avro(_) | Serializer::Native(_)) => { LengthDelimitedEncoder::new().into() } + (None, Serializer::Gelf(_)) => { + CharacterDelimitedEncoder::new(0).into() + } ( None, Serializer::Csv(_) - | Serializer::Gelf(_) | Serializer::Logfmt(_) | Serializer::NativeJson(_) | Serializer::RawMessage(_) From d10f15b4483617e54359818709c80832655a1f59 Mon Sep 17 00:00:00 2001 From: Martin Emrich Date: Thu, 31 Aug 2023 08:42:31 +0200 Subject: [PATCH 2/4] Comment/Link to graylog issue regarding null-byte delimiter --- src/codecs/encoding/config.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/codecs/encoding/config.rs b/src/codecs/encoding/config.rs index f0239f9ebf20b..8b74c2e3c46a9 100644 --- a/src/codecs/encoding/config.rs +++ b/src/codecs/encoding/config.rs @@ -108,6 +108,8 @@ impl EncodingConfigWithFraming { LengthDelimitedEncoder::new().into() } (None, Serializer::Gelf(_)) => { + /// Graylog/GELF always uses null byte delimiter on TCP, see + /// https://github.com/Graylog2/graylog2-server/issues/1240 CharacterDelimitedEncoder::new(0).into() } ( From ecc454b743472fd6b9d9c652f3006c76092848a6 Mon Sep 17 00:00:00 2001 From: Martin Emrich Date: Thu, 31 Aug 2023 17:27:01 +0200 Subject: [PATCH 3/4] non-doc comment --- src/codecs/encoding/config.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/codecs/encoding/config.rs b/src/codecs/encoding/config.rs index 8b74c2e3c46a9..336d38fde9f5e 100644 --- a/src/codecs/encoding/config.rs +++ b/src/codecs/encoding/config.rs @@ -108,8 +108,8 @@ impl EncodingConfigWithFraming { LengthDelimitedEncoder::new().into() } (None, Serializer::Gelf(_)) => { - /// Graylog/GELF always uses null byte delimiter on TCP, see - /// https://github.com/Graylog2/graylog2-server/issues/1240 + // Graylog/GELF always uses null byte delimiter on TCP, see + // https://github.com/Graylog2/graylog2-server/issues/1240 CharacterDelimitedEncoder::new(0).into() } ( From c284e39f7b1a2b14a510c177d1377c91f4609fba Mon Sep 17 00:00:00 2001 From: Martin Emrich Date: Thu, 31 Aug 2023 17:29:26 +0200 Subject: [PATCH 4/4] remove trailing spaces --- src/codecs/encoding/config.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/codecs/encoding/config.rs b/src/codecs/encoding/config.rs index 336d38fde9f5e..5e24db0a9b162 100644 --- a/src/codecs/encoding/config.rs +++ b/src/codecs/encoding/config.rs @@ -107,10 +107,10 @@ impl EncodingConfigWithFraming { (None, Serializer::Avro(_) | Serializer::Native(_)) => { LengthDelimitedEncoder::new().into() } - (None, Serializer::Gelf(_)) => { + (None, Serializer::Gelf(_)) => { // Graylog/GELF always uses null byte delimiter on TCP, see // https://github.com/Graylog2/graylog2-server/issues/1240 - CharacterDelimitedEncoder::new(0).into() + CharacterDelimitedEncoder::new(0).into() } ( None,