chore(deps): Switch to apache_avro (#15603)

Replaces apache_rs. Closes: #15597 Signed-off-by: Jesse Szwedko <[email protected]> Signed-off-by: Jesse Szwedko <[email protected]>
vectordotdev · Dec 21, 2022 · a7001a7 · a7001a7
1 parent 72ce41d
commit a7001a7
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -242,7 +242,7 @@ vrl-stdlib = { path = "lib/vrl/stdlib" }
 # External libs
 arc-swap = { version = "1.5", default-features = false, optional = true }
 async-compression = { version = "0.3.15", default-features = false, features = ["tokio", "gzip", "zstd"], optional = true }
-avro-rs = { version = "0.13.0", default-features = false, optional = true }
+apache-avro = { version = "0.14.0", default-features = false, optional = true }
 axum = { version = "0.6.1", default-features = false }
 base64 = { version = "0.13.1", default-features = false, optional = true }
 bloom = { version = "0.3.2", default-features = false, optional = true }
@@ -696,7 +696,7 @@ sinks-new_relic_logs = ["sinks-http"]
 sinks-new_relic = []
 sinks-papertrail = ["dep:syslog"]
 sinks-prometheus = ["aws-core", "dep:base64", "dep:prometheus-parser", "dep:snap", "dep:serde_with"]
-sinks-pulsar = ["dep:avro-rs", "dep:pulsar"]
+sinks-pulsar = ["dep:apache-avro", "dep:pulsar"]
 sinks-redis = ["dep:redis"]
 sinks-sematext = ["sinks-elasticsearch", "sinks-influxdb"]
 sinks-socket = ["sinks-utils-udp"]

diff --git a/lib/codecs/Cargo.toml b/lib/codecs/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-avro-rs = { version = "0.13.0", default-features = false }
+apache-avro = { version = "0.14.0", default-features = false }
 bytes = { version = "1", default-features = false }
 chrono = { version = "0.4", default-features = false }
 derivative = { version = "2", default-features = false }

diff --git a/lib/codecs/src/encoding/format/avro.rs b/lib/codecs/src/encoding/format/avro.rs
@@ -22,7 +22,7 @@ impl AvroSerializerConfig {
 
     /// Build the `AvroSerializer` from this configuration.
     pub fn build(&self) -> Result<AvroSerializer, BuildError> {
-        let schema = avro_rs::Schema::parse_str(&self.avro.schema)
+        let schema = apache_avro::Schema::parse_str(&self.avro.schema)
             .map_err(|error| format!("Failed building Avro serializer: {}", error))?;
         Ok(AvroSerializer { schema })
     }
@@ -53,12 +53,12 @@ pub struct AvroSerializerOptions {
 /// Serializer that converts an `Event` to bytes using the Apache Avro format.
 #[derive(Debug, Clone)]
 pub struct AvroSerializer {
-    schema: avro_rs::Schema,
+    schema: apache_avro::Schema,
 }
 
 impl AvroSerializer {
     /// Creates a new `AvroSerializer`.
-    pub const fn new(schema: avro_rs::Schema) -> Self {
+    pub const fn new(schema: apache_avro::Schema) -> Self {
         Self { schema }
     }
 }
@@ -68,9 +68,9 @@ impl Encoder<Event> for AvroSerializer {
 
     fn encode(&mut self, event: Event, buffer: &mut BytesMut) -> Result<(), Self::Error> {
         let log = event.into_log();
-        let value = avro_rs::to_value(log)?;
+        let value = apache_avro::to_value(log)?;
         let value = value.resolve(&self.schema)?;
-        let bytes = avro_rs::to_avro_datum(&self.schema, value)?;
+        let bytes = apache_avro::to_avro_datum(&self.schema, value)?;
         buffer.put_slice(&bytes);
         Ok(())
     }