0.4.0 release

.github/workflows/build.yml

@@ -4,12 +4,28 @@ on: [push, pull_request]
 
 jobs:
   build:
-    name: ${{ matrix.os }}
+    name: ${{ matrix.package }} - ${{ matrix.os }} - ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        package: [lib, cli, pprofrs, pyspy, rbspy]
+        os: [ubuntu-latest, macos-latest]
+        target: [x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
+        exclude:
+        - os: ubuntu-latest
+          target: x86_64-apple-darwin
+        - os: ubuntu-latest
+          target: aarch64-apple-darwin
+        - os: macos-latest
+          target: x86_64-unknown-linux-gnu
+        - os: macos-latest
+          target: aarch64-unknown-linux-gnu
     steps:
+      - name: install libunwind (for pprof)
+        if: matrix.os == 'ubuntu-latest'
+        continue-on-error: true
+        run: sudo apt install libunwind8-dev
+
       - name: Checkout sources
         uses: actions/checkout@v2
 
@@ -20,7 +36,36 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Run cargo build
+      - name: Cargo build for pyroscope library 
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'lib'
+        with:
+          command: build
+
+      - name: Cargo build for pyrosocpe-cli 
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'cli'
+        with:
+          args: --manifest-path pyroscope_cli/Cargo.toml
+          command: build
+
+      - name: Cargo build for pprof-rs
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'pprofrs'
+        with:
+          args: --manifest-path pyroscope_backends/pyroscope_pprofrs/Cargo.toml
+          command: build
+
+      - name: Cargo build for pyspy 
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'pyspy'
+        with:
+          args: --manifest-path pyroscope_backends/pyroscope_pyspy/Cargo.toml
+          command: build
+
+      - name: Cargo build for rbspy 
         uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'rbspy'
         with:
+          args: --manifest-path pyroscope_backends/pyroscope_rbspy/Cargo.toml
           command: build

.github/workflows/publish.yml

@@ -7,8 +7,9 @@ on:
 
 jobs:
   publish-pyroscope:
-    name: Publish pyroscope crate
+    name: pyroscope-lib
     runs-on: ubuntu-latest
+    if: "startsWith(github.event.release.tag_name, 'lib-')"
     steps:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
@@ -20,3 +21,18 @@ jobs:
         run: |
           cargo login ${{ secrets.CARGO_TOKEN }}
           cargo publish
+  publish-cli:
+    name: pyroscope-cli
+    runs-on: ubuntu-latest
+    if: "startsWith(github.event.release.tag_name, 'cli-')"
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - name: publish pyroscope crate
+        continue-on-error: true
+        run: |
+          cargo login ${{ secrets.CARGO_TOKEN }}
+          cargo publish --manifest-path pyroscope_cli/Cargo.toml

.github/workflows/release.yml

@@ -3,13 +3,109 @@ name: Pre-Release
 on: [push]
 
 jobs:
-  release:
-    name: Create draft release 
+  lib-release:
+    name: pyroscope-main 
     runs-on: ubuntu-latest
-    if: "startsWith(github.ref, 'refs/tags/')"
+    if: "startsWith(github.ref, 'refs/tags/lib-')"
+    continue-on-error: true
     steps:
       - uses: "marvinpinto/action-automatic-releases@v1.1.1"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ github.ref_name }}"
+          title: "pyroscope-${{ github.ref_name }}"
           draft: true
           prerelease: false
+  cli-release:
+    name: pyroscope-cli 
+    runs-on: ubuntu-latest
+    if: "startsWith(github.ref, 'refs/tags/cli-')"
+    steps:
+      - uses: "marvinpinto/action-automatic-releases@v1.1.1"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ github.ref_name }}"
+          title: "pyroscope-${{ github.ref_name }}"
+          draft: true
+          prerelease: false
+  cli-artifacts:
+    name: pyroscope-cli - build aritifacts
+    needs: ['cli-release']
+    runs-on: ${{ matrix.os }}
+    env:
+      # For some builds, we use cross to test on 32-bit and big-endian
+      # systems.
+      CARGO: cargo
+      # When CARGO is set to CROSS, this is set to `--target matrix.target`.
+      TARGET_FLAGS: ""
+      # When CARGO is set to CROSS, TARGET_DIR includes matrix.target.
+      TARGET_DIR: ./target
+      # Emit backtraces on panics.
+      RUST_BACKTRACE: 1
+    strategy:
+      matrix:
+        build: [linux, linux-arm, macos]
+        include:
+        - build: linux
+          os: ubuntu-18.04
+          rust: stable
+          target: x86_64-unknown-linux-musl
+        - build: linux-arm
+          os: ubuntu-18.04
+          rust: stable
+          target: arm-unknown-linux-gnueabihf
+        - build: macos
+          os: macos-latest
+          rust: stable
+          target: x86_64-apple-darwin
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install Rust
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ matrix.rust }}
+        profile: minimal
+        override: true
+        target: ${{ matrix.target }}
+
+    - name: Use Cross
+      shell: bash
+      run: |
+        cargo install cross
+        echo "CARGO=cross" >> $GITHUB_ENV
+        echo "TARGET_FLAGS=--target ${{ matrix.target }}" >> $GITHUB_ENV
+        echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
+
+    - name: Show command used for Cargo
+      run: |
+        echo "cargo command is: ${{ env.CARGO }}"
+        echo "target flag is: ${{ env.TARGET_FLAGS }}"
+        echo "target dir is: ${{ env.TARGET_DIR }}"
+
+    - name: Build release binary
+      run: ${{ env.CARGO }} build --manifest-path pyroscope_cli/Cargo.toml --verbose --release ${{ env.TARGET_FLAGS }}
+
+    - name: Strip release binary (linux and macos)
+      if: matrix.build == 'linux' || matrix.build == 'macos'
+      run: strip "pyroscope_cli/target/${{ matrix.target }}/release/pyroscope-cli"
+
+    - name: Strip release binary (arm)
+      if: matrix.build == 'linux-arm'
+      run: |
+        docker run --rm -v \
+          "$PWD/target:/target:Z" \
+          rustembedded/cross:arm-unknown-linux-gnueabihf \
+          arm-linux-gnueabihf-strip \
+          /target/arm-unknown-linux-gnueabihf/release/pyroscope-cli
+
+    - name: Upload release archive
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create-release.outputs.upload_url }}
+        asset_path: "pyroscope_cli/target/${{ matrix.target }}/release/pyroscope-cli"
+        asset_name: "pyroscope-cli"
+        asset_content_type: application/octet-stream

.github/workflows/tests.yml

@@ -4,23 +4,70 @@ on: [push, pull_request]
 
 jobs:
   test:
-    name: ${{ matrix.os }}
+    name: ${{ matrix.package }} - ${{ matrix.os }} - ${{ matrix.target }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        package: [lib, cli, pprofrs, pyspy, rbspy]
+        os: [ubuntu-latest, macos-latest]
+        target: [x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
+        exclude:
+        - os: ubuntu-latest
+          target: x86_64-apple-darwin
+        - os: ubuntu-latest
+          target: aarch64-apple-darwin
+        - os: macos-latest
+          target: x86_64-unknown-linux-gnu
+        - os: macos-latest
+          target: aarch64-unknown-linux-gnu
     steps:
+      - name: install libunwind (for pprof)
+        if: matrix.os == 'ubuntu-latest'
+        continue-on-error: true
+        run: sudo apt install libunwind8-dev
+
       - name: Checkout sources
         uses: actions/checkout@v2
 
       - name: Install stable toolchain
         uses: omarabid-forks/rs-toolchain@v1
         with:
-          profile: minimal
+          profile: default
           toolchain: stable
+          target: ${{ matrix.target }}
           override: true
 
       - name: Run cargo test
         uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'lib'
+        with:
+          command: test
+          args: --all
+
+      - name: Cargo build for pyrosocpe-cli 
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'cli'
+        with:
+          args: --all --manifest-path pyroscope_cli/Cargo.toml
+          command: test
+
+      - name: Cargo build for pprof-rs
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'pprofrs'
+        with:
+          args: --all --manifest-path pyroscope_backends/pyroscope_pprofrs/Cargo.toml
+          command: test
+
+      - name: Cargo build for pyspy 
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'pyspy'
+        with:
+          args: --all --manifest-path pyroscope_backends/pyroscope_pyspy/Cargo.toml
+          command: test
+
+      - name: Cargo build for rbspy 
+        uses: omarabid-forks/rs-cargo@v1
+        if: matrix.package == 'rbspy'
         with:
+          args: --all --manifest-path pyroscope_backends/pyroscope_rbspy/Cargo.toml
           command: test

Cargo.toml

@@ -5,25 +5,63 @@ Pyroscope Profiler
 """
 keywords = ["pyroscope", "profiler"]
 authors = ["Abid Omar <contact@omarabid.com>"]
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://pyroscope.io"
 documentation  = "https://docs.rs/pyroscope"
 repository = "https://github.com/pyroscope-io/pyroscope-rs"
 readme = "README.md"
+autobins = false
+autoexamples = true 
+autotests = true 
+autobenches = true 
+
+[workspace]
+members = [
+]
+exclude = [
+    "pyroscope_backends",
+    "pyroscope_cli",
+]
+
+[[example]]
+name = "internal-backend-void"
+path = "examples/internal/backend-void.rs"
+
+[[example]]
+name = "internal-backend-void-run"
+path = "examples/internal/backend-void-run.rs"
+
+[[example]]
+name = "internal-backend-pprof"
+path = "examples/internal/backend-pprof.rs"
+
+[[example]]
+name = "internal-timer"
+path = "examples/internal/timer.rs"
+
+[[example]]
+name = "internal-pyspy-connect"
+path = "examples/internal/pyspy-connect.rs"
+
+[[example]]
+name = "internal-rbspy-connect"
+path = "examples/internal/rbspy-connect.rs"
 
 [dependencies]
 thiserror ="1.0"
 log = "0.4"
 reqwest = { version = "0.11", features = ["blocking"]}
-pprof = "0.6.2"
 libc = "^0.2.66"
 
 [dev-dependencies]
 tokio = { version = "1.13", features = ["full"] }
 pretty_env_logger = "0.4.0"
 assert_matches = "1"
+pyroscope_pprofrs = { path = "pyroscope_backends/pyroscope_pprofrs" }
+pyroscope_rbspy = { path = "pyroscope_backends/pyroscope_rbspy" }
+pyroscope_pyspy = { path = "pyroscope_backends/pyroscope_pyspy" }
 
 [profile.dev]
 opt-level=0