diff --git a/Cargo.lock b/Cargo.lock
index 0d7fd93ac115b..c286bc7f60952 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -101,6 +101,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
 [[package]]
 name = "alloc-no-stdlib"
 version = "2.0.4"
@@ -291,24 +297,24 @@ checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
 
 [[package]]
 name = "apache-avro"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36fa98bc79671c7981272d91a8753a928ff6a1cd8e4f20a44c45bd5d313840bf"
+checksum = "312c1ea69e5fe9966e0029fb95aca8790100b85aff4f0d3b00a9337c74069a9c"
 dependencies = [
  "bigdecimal",
  "bon",
- "digest 0.10.7",
+ "digest 0.11.3",
  "log",
- "miniz_oxide",
+ "miniz_oxide 0.9.1",
  "num-bigint",
+ "ouroboros",
  "quad-rand",
- "rand 0.9.4",
+ "rand 0.10.1",
  "regex-lite",
  "serde",
  "serde_bytes",
  "serde_json",
- "strum 0.27.2",
- "strum_macros 0.27.2",
+ "strum 0.28.0",
  "thiserror 2.0.18",
  "uuid",
 ]
@@ -2130,9 +2136,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bigdecimal"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560f42649de9fa436b73517378a147ec21f6c997a546581df4b4b31677828934"
+checksum = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695"
 dependencies = [
  "autocfg",
  "libm",
@@ -2313,9 +2319,9 @@ dependencies = [
 
 [[package]]
 name = "bon"
-version = "3.8.1"
+version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebeb9aaf9329dff6ceb65c689ca3db33dbf15f324909c60e4e5eef5701ce31b1"
+checksum = "a602c73c7b0148ec6d12af6fd5cc7a46e2eacc8878271a999abac56eed12f561"
 dependencies = [
  "bon-macros",
  "rustversion",
@@ -2323,11 +2329,11 @@ dependencies = [
 
 [[package]]
 name = "bon-macros"
-version = "3.8.1"
+version = "3.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e9d642a7e3a318e37c2c9427b5a6a48aa1ad55dcd986f3034ab2239045a645"
+checksum = "6dee98b0db6a962de883bf5d20362dee4d7ca0d12fe39a7c6c73c844e1cd7c1f"
 dependencies = [
- "darling 0.21.3",
+ "darling 0.23.0",
  "ident_case",
  "prettyplease",
  "proc-macro2 1.0.106",
@@ -3483,16 +3489,6 @@ dependencies = [
  "darling_macro 0.20.11",
 ]
 
-[[package]]
-name = "darling"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
-dependencies = [
- "darling_core 0.21.3",
- "darling_macro 0.21.3",
-]
-
 [[package]]
 name = "darling"
 version = "0.23.0"
@@ -3517,20 +3513,6 @@ dependencies = [
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "darling_core"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2 1.0.106",
- "quote 1.0.45",
- "strsim",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "darling_core"
 version = "0.23.0"
@@ -3555,17 +3537,6 @@ dependencies = [
  "syn 2.0.119",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
-dependencies = [
- "darling_core 0.21.3",
- "quote 1.0.45",
- "syn 2.0.119",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.23.0"
@@ -4525,7 +4496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.9",
  "zlib-rs",
 ]
 
@@ -6845,9 +6816,9 @@ checksum = "3a69c0481fc2424cb55795de7da41add33372ea75a94f9b6588ab6a2826dfebc"
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
 
 [[package]]
 name = "loki-logproto"
@@ -7192,6 +7163,15 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "1.2.0"
@@ -7619,9 +7599,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -8112,6 +8092,30 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "ouroboros"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0f050db9c44b97a94723127e6be766ac5c340c48f2c4bb3ffa11713744be59"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c7028bdd3d43083f6d8d4d5187680d0d3560d54df4cc9d752005268b41e64d0"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2 1.0.106",
+ "proc-macro2-diagnostics",
+ "quote 1.0.45",
+ "syn 2.0.119",
+]
+
 [[package]]
 name = "outref"
 version = "0.5.1"
@@ -8771,6 +8775,19 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2 1.0.106",
+ "quote 1.0.45",
+ "syn 2.0.119",
+ "version_check",
+ "yansi",
+]
+
 [[package]]
 name = "procfs"
 version = "0.18.0"
@@ -9781,9 +9798,9 @@ dependencies = [
 
 [[package]]
 name = "regex-lite"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
+checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973"
 
 [[package]]
 name = "regex-syntax"
@@ -13110,9 +13127,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.22.0"
+version = "1.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37"
+checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9"
 dependencies = [
  "getrandom 0.4.2",
  "js-sys",
@@ -14952,6 +14969,12 @@ version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "yoke"
 version = "0.7.4"
diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv
index e3fa1f9f67d90..dc41f7e47ce0a 100644
--- a/LICENSE-3rdparty.csv
+++ b/LICENSE-3rdparty.csv
@@ -5,6 +5,7 @@ aes,https://github.com/RustCrypto/block-ciphers,MIT OR Apache-2.0,RustCrypto Dev
 aes-siv,https://github.com/RustCrypto/AEADs,Apache-2.0 OR MIT,RustCrypto Developers
 ahash,https://github.com/tkaitchuck/ahash,MIT OR Apache-2.0,Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
 aho-corasick,https://github.com/BurntSushi/aho-corasick,Unlicense OR MIT,Andrew Gallant <jamslam@gmail.com>
+aliasable,https://github.com/avitex/rust-aliasable,MIT,avitex <avitex@wfxlabs.com>
 alloc-no-stdlib,https://github.com/dropbox/rust-alloc-no-stdlib,BSD-3-Clause,Daniel Reiter Horn <danielrh@dropbox.com>
 alloc-stdlib,https://github.com/dropbox/rust-alloc-no-stdlib,BSD-3-Clause,Daniel Reiter Horn <danielrh@dropbox.com>
 allocator-api2,https://github.com/zakarumych/allocator-api2,MIT OR Apache-2.0,Zakarum <zaq.dev@icloud.com>
@@ -540,6 +541,8 @@ openssl-macros,https://github.com/sfackler/rust-openssl,MIT OR Apache-2.0,The op
 openssl-probe,https://github.com/alexcrichton/openssl-probe,MIT OR Apache-2.0,Alex Crichton <alex@alexcrichton.com>
 openssl-sys,https://github.com/rust-openssl/rust-openssl,MIT,"Alex Crichton <alex@alexcrichton.com>, Steven Fackler <sfackler@gmail.com>"
 ordered-float,https://github.com/reem/rust-ordered-float,MIT,"Jonathan Reem <jonathan.reem@gmail.com>, Matt Brubeck <mbrubeck@limpet.net>"
+ouroboros,https://github.com/someguynamedjosh/ouroboros,MIT OR Apache-2.0,Josh <someguynamedjosh@github.com>
+ouroboros_macro,https://github.com/someguynamedjosh/ouroboros,MIT OR Apache-2.0,Josh <someguynamedjosh@github.com>
 outref,https://github.com/Nugine/outref,MIT,The outref Authors
 owo-colors,https://github.com/owo-colors/owo-colors,MIT,jam1garner <8260240+jam1garner@users.noreply.github.com>
 p256,https://github.com/RustCrypto/elliptic-curves/tree/master/p256,Apache-2.0 OR MIT,RustCrypto Developers
@@ -592,6 +595,7 @@ proc-macro-error2,https://github.com/GnomedDev/proc-macro-error-2,MIT OR Apache-
 proc-macro-hack,https://github.com/dtolnay/proc-macro-hack,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 proc-macro-nested,https://github.com/dtolnay/proc-macro-hack,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 proc-macro2,https://github.com/dtolnay/proc-macro2,MIT OR Apache-2.0,"David Tolnay <dtolnay@gmail.com>, Alex Crichton <alex@alexcrichton.com>"
+proc-macro2-diagnostics,https://github.com/SergioBenitez/proc-macro2-diagnostics,MIT OR Apache-2.0,Sergio Benitez <sb@sergio.bz>
 procfs,https://github.com/eminence/procfs,MIT OR Apache-2.0,Andrew Chin <achin@eminence32.net>
 procfs-core,https://github.com/eminence/procfs,MIT OR Apache-2.0,Andrew Chin <achin@eminence32.net>
 proptest,https://github.com/proptest-rs/proptest,MIT OR Apache-2.0,Jason Lingle
@@ -937,6 +941,7 @@ writeable,https://github.com/unicode-org/icu4x,Unicode-3.0,The ICU4X Project Dev
 wyz,https://github.com/myrrlyn/wyz,MIT,myrrlyn <self@myrrlyn.dev>
 xmlparser,https://github.com/RazrFalcon/xmlparser,MIT OR Apache-2.0,Yevhenii Reizner <razrfalcon@gmail.com>
 xxhash-rust,https://github.com/DoumanAsh/xxhash-rust,BSL-1.0,Douman <douman@gmx.se>
+yansi,https://github.com/SergioBenitez/yansi,MIT OR Apache-2.0,Sergio Benitez <sb@sergio.bz>
 yoke,https://github.com/unicode-org/icu4x,Unicode-3.0,Manish Goregaokar <manishsmail@gmail.com>
 yoke-derive,https://github.com/unicode-org/icu4x,Unicode-3.0,Manish Goregaokar <manishsmail@gmail.com>
 zerocopy,https://github.com/google/zerocopy,BSD-2-Clause OR Apache-2.0 OR MIT,Joshua Liebow-Feeser <joshlf@google.com>
diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
index e675396cbd12c..0ad44f4c7d2f2 100644
--- a/lib/codecs/Cargo.toml
+++ b/lib/codecs/Cargo.toml
@@ -13,7 +13,7 @@ name = "generate-avro-fixtures"
 path = "tests/bin/generate-avro-fixtures.rs"
 
 [dependencies]
-apache-avro = { version = "0.21.0", default-features = false }
+apache-avro = { version = "0.22.0", default-features = false }
 arrow = { version = "59.1.0", default-features = false, features = ["ipc", "json"], optional = true }
 parquet = { version = "59.1.0", default-features = false, features = [
     "arrow",
diff --git a/lib/codecs/src/decoding/format/avro.rs b/lib/codecs/src/decoding/format/avro.rs
index 73a703b72ca38..51429a3073314 100644
--- a/lib/codecs/src/decoding/format/avro.rs
+++ b/lib/codecs/src/decoding/format/avro.rs
@@ -147,7 +147,9 @@ impl Deserializer for AvroDeserializer {
             bytes
         };
 
-        let value = apache_avro::from_avro_datum(&self.schema, &mut bytes.reader(), None)?;
+        let value = apache_avro::reader::datum::GenericDatumReader::builder(&self.schema)
+            .build()?
+            .read_value(&mut bytes.reader())?;
 
         let apache_avro::types::Value::Record(fields) = value else {
             return Err(vector_common::Error::from("Expected an avro Record"));
@@ -280,7 +282,11 @@ mod tests {
             message: "hello from avro".to_owned(),
         };
         let record_value = apache_avro::to_value(event).unwrap();
-        let record_datum = apache_avro::to_avro_datum(&schema, record_value).unwrap();
+        let record_datum = apache_avro::writer::datum::GenericDatumWriter::builder(&schema)
+            .build()
+            .unwrap()
+            .write_value_to_vec(record_value)
+            .unwrap();
         let record_bytes = Bytes::from(record_datum);
 
         let deserializer = AvroDeserializer::new(schema, false);
@@ -303,7 +309,11 @@ mod tests {
             message: "hello from avro".to_owned(),
         };
         let record_value = apache_avro::to_value(event).unwrap();
-        let record_datum = apache_avro::to_avro_datum(&schema, record_value).unwrap();
+        let record_datum = apache_avro::writer::datum::GenericDatumWriter::builder(&schema)
+            .build()
+            .unwrap()
+            .write_value_to_vec(record_value)
+            .unwrap();
 
         let mut bytes = BytesMut::new();
         bytes.extend([0, 0, 0, 0, 0]); // 0 prefix + 4 byte schema id
@@ -331,7 +341,11 @@ mod tests {
         };
         let value = apache_avro::to_value(event).unwrap();
         // let value = value.resolve(&schema).unwrap();
-        let datum = apache_avro::to_avro_datum(&schema, value).unwrap();
+        let datum = apache_avro::writer::datum::GenericDatumWriter::builder(&schema)
+            .build()
+            .unwrap()
+            .write_value_to_vec(value)
+            .unwrap();
 
         let mut bytes = BytesMut::new();
         bytes.extend([0, 0, 0, 0, 0]); // 0 prefix + 4 byte schema id
diff --git a/lib/codecs/src/encoding/format/avro.rs b/lib/codecs/src/encoding/format/avro.rs
index 304dcc2e7cc90..9de015672a95a 100644
--- a/lib/codecs/src/encoding/format/avro.rs
+++ b/lib/codecs/src/encoding/format/avro.rs
@@ -72,7 +72,9 @@ impl Encoder<Event> for AvroSerializer {
         let log = event.into_log();
         let value = apache_avro::to_value(log)?;
         let value = value.resolve(&self.schema)?;
-        let bytes = apache_avro::to_avro_datum(&self.schema, value)?;
+        let writer = apache_avro::writer::datum::GenericDatumWriter::builder(&self.schema)
+            .build()?;
+        let bytes = writer.write_value_to_vec(value)?;
         buffer.put_slice(&bytes);
         Ok(())
     }
diff --git a/lib/codecs/tests/bin/generate-avro-fixtures.rs b/lib/codecs/tests/bin/generate-avro-fixtures.rs
index 9301cb2840bf9..1ee0c33515e6c 100644
--- a/lib/codecs/tests/bin/generate-avro-fixtures.rs
+++ b/lib/codecs/tests/bin/generate-avro-fixtures.rs
@@ -149,7 +149,7 @@ fn generate_avro_test_case_fixed() -> Result<()> {
         "type": "record",
         "name": "test",
         "fields": [
-            {"name": "fixed_field", "type":"fixed", "size": 16}
+            {"name": "fixed_field", "type": {"type": "fixed", "name": "fixed_field", "size": 16}}
         ]
     }
     "#;
@@ -166,7 +166,7 @@ fn generate_avro_test_case_enum() -> Result<()> {
         "type": "record",
         "name": "test",
         "fields": [
-            {"name": "enum_field", "type": "enum", "symbols" : ["Spades", "Hearts", "Diamonds", "Clubs"]}
+            {"name": "enum_field", "type": {"type": "enum", "name": "Suit", "symbols": ["Spades", "Hearts", "Diamonds", "Clubs"]}}
         ]
     }
     "#;
@@ -217,7 +217,7 @@ fn generate_avro_test_case_array() -> Result<()> {
         "type": "record",
         "name": "test",
         "fields": [
-            {"name": "array_field", "type": "array", "items" : "string"}
+            {"name": "array_field", "type": {"type": "array", "items": "string"}}
         ]
     }
     "#;
@@ -242,7 +242,7 @@ fn generate_avro_test_case_map() -> Result<()> {
         "type": "record",
         "name": "test",
         "fields": [
-            {"name": "map_field", "type": "map", "values" : "long","default": {}}
+            {"name": "map_field", "type": {"type": "map", "values": "long"}, "default": {}}
         ]
     }
     "#;
@@ -472,7 +472,8 @@ fn generate_test_case_from_value(schema: &str, value: Value, filename: &str) ->
     let schema = Schema::parse_str(schema)?;
 
     let value = value.resolve(&schema)?;
-    let bytes = apache_avro::to_avro_datum(&schema, value)?;
+    let writer = apache_avro::writer::datum::GenericDatumWriter::builder(&schema).build()?;
+    let bytes = writer.write_value_to_vec(value)?;
 
     let mut schema_file = File::create(format!("{FIXTURES_PATH}/{filename}.avsc"))?;
     let mut avro_file = File::create(format!("{FIXTURES_PATH}/{filename}.avro"))?;
diff --git a/lib/codecs/tests/data/avro/generated/array.avsc b/lib/codecs/tests/data/avro/generated/array.avsc
index 3ce68e7b38060..631eb9cae6480 100644
--- a/lib/codecs/tests/data/avro/generated/array.avsc
+++ b/lib/codecs/tests/data/avro/generated/array.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"array_field","type":{"type":"array","items":"string"},"items":"string"}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"array_field","type":{"type":"array","items":"string"}}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/enum.avsc b/lib/codecs/tests/data/avro/generated/enum.avsc
index 59d5d0e34dad2..8d1c8758b9c9b 100644
--- a/lib/codecs/tests/data/avro/generated/enum.avsc
+++ b/lib/codecs/tests/data/avro/generated/enum.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"enum_field","type":{"type":"enum","name":"enum_field","symbols":["Spades","Hearts","Diamonds","Clubs"]}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"enum_field","type":{"type":"enum","name":"Suit","symbols":["Spades","Hearts","Diamonds","Clubs"]}}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/local-timestamp_micros.avsc b/lib/codecs/tests/data/avro/generated/local-timestamp_micros.avsc
index 01d0dcf5eca96..a29bd5e927b00 100644
--- a/lib/codecs/tests/data/avro/generated/local-timestamp_micros.avsc
+++ b/lib/codecs/tests/data/avro/generated/local-timestamp_micros.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"local_timestamp_micros_field","type":{"type":"long","logicalType":"local-timestamp-micros"}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"local_timestamp_micros_field","type":"long","logicalType":"local-timestamp-micros"}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/local-timestamp_millis.avsc b/lib/codecs/tests/data/avro/generated/local-timestamp_millis.avsc
index 39722937a5d13..e305a7a1f51e2 100644
--- a/lib/codecs/tests/data/avro/generated/local-timestamp_millis.avsc
+++ b/lib/codecs/tests/data/avro/generated/local-timestamp_millis.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"local_timestamp_millis_field","type":{"type":"long","logicalType":"local-timestamp-millis"}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"local_timestamp_millis_field","type":"long","logicalType":"local-timestamp-millis"}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/map.avsc b/lib/codecs/tests/data/avro/generated/map.avsc
index 69441d98fa538..3bb4e80c93d3e 100644
--- a/lib/codecs/tests/data/avro/generated/map.avsc
+++ b/lib/codecs/tests/data/avro/generated/map.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"map_field","type":{"type":"map","values":"long","default":{}},"default":{},"values":"long"}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"map_field","type":{"type":"map","values":"long"},"default":{}}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/time_micros.avsc b/lib/codecs/tests/data/avro/generated/time_micros.avsc
index 455d3e9cd2ada..21b968b8c961a 100644
--- a/lib/codecs/tests/data/avro/generated/time_micros.avsc
+++ b/lib/codecs/tests/data/avro/generated/time_micros.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"time_micros_field","type":{"type":"long","logicalType":"time-micros"}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"time_micros_field","type":"long","logicalType":"time-micros"}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/timestamp_micros.avsc b/lib/codecs/tests/data/avro/generated/timestamp_micros.avsc
index d51fdda84588b..a7c29575257b7 100644
--- a/lib/codecs/tests/data/avro/generated/timestamp_micros.avsc
+++ b/lib/codecs/tests/data/avro/generated/timestamp_micros.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"timestamp_micros_field","type":{"type":"long","logicalType":"timestamp-micros"}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"timestamp_micros_field","type":"long","logicalType":"timestamp-micros"}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/timestamp_millis.avsc b/lib/codecs/tests/data/avro/generated/timestamp_millis.avsc
index 5a42c53182c7d..e806e48be452e 100644
--- a/lib/codecs/tests/data/avro/generated/timestamp_millis.avsc
+++ b/lib/codecs/tests/data/avro/generated/timestamp_millis.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"timestamp_millis_field","type":{"type":"long","logicalType":"timestamp-millis"}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"timestamp_millis_field","type":"long","logicalType":"timestamp-millis"}]}
\ No newline at end of file
diff --git a/lib/codecs/tests/data/avro/generated/uuid.avsc b/lib/codecs/tests/data/avro/generated/uuid.avsc
index d20f63c4d503a..a93438c313c84 100644
--- a/lib/codecs/tests/data/avro/generated/uuid.avsc
+++ b/lib/codecs/tests/data/avro/generated/uuid.avsc
@@ -1 +1 @@
-{"type":"record","name":"test","fields":[{"name":"uuid_field","type":{"type":"string","logicalType":"uuid"}}]}
\ No newline at end of file
+{"type":"record","name":"test","fields":[{"name":"uuid_field","type":"string","logicalType":"uuid"}]}
\ No newline at end of file