Release musl builds + prepare 0.11.1 release (#396)

* Add musl x86-64 target to releases

* Bump version + changelog (rc)

* Update `opentelemetry-proto` to remove `protoc` dependency

Ref: open-telemetry/opentelemetry-rust#881

* The musl build does not support kafka

* Update changelog for 0.11.1

Author: GeorgeHahn

.github/workflows/release.yml

@@ -28,13 +28,15 @@ jobs:
           # env.
           - target: aarch64-unknown-linux-gnu
             os: ubuntu-latest
+            features: kafka
             cc: 'aarch64-linux-gnu-gcc'
             cxx: 'aarch64-linux-gnu-g++'
 
           # Mac M1 cross build. Uses protobuf compiler on the host. librdkafka
           # needs explicit cross env vars.
           - target: aarch64-apple-darwin
             os: macos-latest
+            features: kafka
             cflags: '-target arm64-apple-macos'
             cxxflags: '-target arm64-apple-macos'
             cc: 'clang'
@@ -43,10 +45,20 @@ jobs:
           # Normal x86-64 Linux build
           - target: x86_64-unknown-linux-gnu
             os: ubuntu-latest
+            features: kafka
+
+          # Musl x86-64 Linux build. Assume librdkafka needs cc/cxx.
+          - target: x86_64-unknown-linux-musl
+            os: ubuntu-latest
+            # the musl build does not support kafka
+            features: ''
+            cc: 'musl-gcc'
+            cxx: 'explicitly-unset'
 
           # Normal Intel Mac build
           - target: x86_64-apple-darwin
             os: macos-latest
+            features: kafka
 
       # Try to complete every job in the matrix, even if one fails.
       fail-fast: false
@@ -71,15 +83,10 @@ jobs:
           target: ${{ matrix.target }}
         if: matrix.target == 'aarch64-unknown-linux-gnu'
 
-      # Install the protobuf compiler for linux builds
-      - name: Install protobuf (Apt)
-        run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
-        if: matrix.os == 'ubuntu-latest'
-
-      # Install the protobuf compiler for mac builds
-      - name: Install protobuf (Brew)
-        run: brew install protobuf
-        if: matrix.os == 'macos-latest'
+      # Install musl tools for musl builds
+      - name: Install musl tools
+        run: sudo apt-get update && sudo apt-get install -y musl-tools
+        if: matrix.target == 'x86_64-unknown-linux-musl'
 
       # Run the build & upload artifacts
       - name: Build and upload lading binaries
@@ -93,6 +100,8 @@ jobs:
 
         with:
           bin: lading
+          no_default_features: true
+          features: ${{ matrix.features || '' }}
           target: ${{ matrix.target }}
           checksum: sha256
           token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.1] - 2022-11-22
+### Added
+- Releases now include x86-64 musl binaries
+- The musl build does not support kafka
+
+### Changed
+- The Protobuf compiler is no longer required to build lading
+
 ## [0.11.0] - 2022-11-16
 ### Added
 - Observer now measures child processes of the target

Cargo.lock

@@ -7,7 +7,7 @@ members = [
 
 [package]
 name = "lading"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Brian L. Troutwine <brian@troutwine.us>"]
 edition = "2021"
 license = "MIT"
@@ -33,10 +33,10 @@ metrics-exporter-prometheus = { version = "0.11.0", default-features = false, fe
 metrics-util = { version = "0.14" }
 nix = { version = "0.25" }
 once_cell = "1.16"
-opentelemetry-proto = { version = "0.1", features = ["traces", "metrics", "logs", "gen-tonic"] }
+opentelemetry-proto = { git = "https://github.com/open-telemetry/opentelemetry-rust/", rev = "6078e32", features = ["traces", "metrics", "logs", "gen-tonic"] }
 prost = "0.11"
 rand = { version = "0.8", default-features = false, features = ["small_rng", "std", "std_rng"] }
-rdkafka = "0.28"
+rdkafka = { version = "0.28", optional = true }
 rmp-serde = { version = "1.1", default-features = false }
 serde = { version = "1.0", features = ["std", "derive"] }
 serde_json = { version = "1.0", features = ["std"] }
@@ -61,6 +61,10 @@ async-pidfd = "0.1"
 proptest = "1.0"
 proptest-derive = "0.3.0"
 
+[features]
+default = ["kafka"]
+kafka = ["rdkafka"]
+
 [[bin]]
 name = "lading"
 

Cargo.toml

@@ -20,11 +20,13 @@ pub mod file_gen;
 pub mod file_tree;
 pub mod grpc;
 pub mod http;
-pub mod kafka;
 pub mod splunk_hec;
 pub mod tcp;
 pub mod udp;
 
+#[cfg(feature = "kafka")]
+pub mod kafka;
+
 #[derive(Debug)]
 /// Errors produced by [`Server`].
 pub enum Error {
@@ -37,6 +39,7 @@ pub enum Error {
     /// See [`crate::generator::splunk_hec::Error`] for details.
     SplunkHec(splunk_hec::Error),
     /// See [`crate::generator::kafka::Error`] for details.
+    #[cfg(feature = "kafka")]
     Kafka(kafka::Error),
     /// See [`crate::generator::file_gen::Error`] for details.
     FileGen(file_gen::Error),
@@ -59,6 +62,7 @@ pub enum Config {
     /// See [`crate::generator::splunk_hec::Config`] for details.
     SplunkHec(splunk_hec::Config),
     /// See [`crate::generator::kafka::Config`] for details.
+    #[cfg(feature = "kafka")]
     Kafka(kafka::Config),
     /// See [`crate::generator::file_gen::Config`] for details.
     FileGen(file_gen::Config),
@@ -83,6 +87,7 @@ pub enum Server {
     /// See [`crate::generator::splunk_hec::SplunkHec`] for details.
     SplunkHec(splunk_hec::SplunkHec),
     /// See [`crate::generator::kafka::Kafka`] for details.
+    #[cfg(feature = "kafka")]
     Kafka(kafka::Kafka),
     /// See [`crate::generator::file_gen::FileGen`] for details.
     FileGen(file_gen::FileGen),
@@ -110,6 +115,7 @@ impl Server {
             Config::SplunkHec(conf) => Self::SplunkHec(
                 splunk_hec::SplunkHec::new(conf, shutdown).map_err(Error::SplunkHec)?,
             ),
+            #[cfg(feature = "kafka")]
             Config::Kafka(conf) => {
                 Self::Kafka(kafka::Kafka::new(conf, shutdown).map_err(Error::Kafka)?)
             }
@@ -147,6 +153,7 @@ impl Server {
             Server::Udp(inner) => inner.spin().await.map_err(Error::Udp),
             Server::Http(inner) => inner.spin().await.map_err(Error::Http),
             Server::SplunkHec(inner) => inner.spin().await.map_err(Error::SplunkHec),
+            #[cfg(feature = "kafka")]
             Server::Kafka(inner) => inner.spin().await.map_err(Error::Kafka),
             Server::FileGen(inner) => inner.spin().await.map_err(Error::FileGen),
             Server::FileTree(inner) => inner.spin().await.map_err(Error::FileTree),