Skip to content

Commit

Permalink
Split project into sub-crates, add capture protobuf (#629)
Browse files Browse the repository at this point in the history
* Split project into sub-crates, add capture protobuf

This commit splits the project into two sub-crates, one 'lading' which is
familiar and one 'lading-capture' which has the traditional JSON form of a
`Line` now exported and a new protobuf based capture payload intended for
network transmission.

REF SMP-631

Signed-off-by: Brian L. Troutwine <[email protected]>

* install protoc in regression flow

Signed-off-by: Brian L. Troutwine <[email protected]>

* fix buf lint ding

Signed-off-by: Brian L. Troutwine <[email protected]>

* install protoc in build container

Signed-off-by: Brian L. Troutwine <[email protected]>

* 1.71 -> 1.70

Signed-off-by: Brian L. Troutwine <[email protected]>

* add conversion for MetricKind

Signed-off-by: Brian L. Troutwine <[email protected]>

* deny ding

Signed-off-by: Brian L. Troutwine <[email protected]>

* 0.17.2-rc1

Signed-off-by: Brian L. Troutwine <[email protected]>

* Install protobuf for release

Signed-off-by: Brian L. Troutwine <[email protected]>

* protobuf on musl

Signed-off-by: Brian L. Troutwine <[email protected]>

* remove musl release build

Signed-off-by: Brian L. Troutwine <[email protected]>

---------

Signed-off-by: Brian L. Troutwine <[email protected]>
  • Loading branch information
blt authored Jul 18, 2023
1 parent 1efa857 commit 1dae2d6
Show file tree
Hide file tree
Showing 75 changed files with 718 additions and 478 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,21 @@ jobs:
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
- run: cargo test -p sheepdog
timeout-minutes: 30

buf:
runs-on: ubuntu-latest
steps:
# Check our protobufs for lint cleanliness and for lack of breaking
# changes
- uses: actions/checkout@v3
- name: buf-setup
uses: bufbuild/[email protected]
- name: buf-lint
uses: bufbuild/[email protected]
# NOTE we will need to actually have protos in main before this has the
# potential of working.
#
# - name: buf-breaking
# uses: bufbuild/[email protected]
# with:
# against: 'https://github.com/datadog/lading.git#branch=main'
19 changes: 8 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ jobs:
- target: x86_64-unknown-linux-gnu
os: ubuntu-20.04

# Musl x86-64 Linux build.
- target: x86_64-unknown-linux-musl
os: ubuntu-latest
cc: 'musl-gcc'
cxx: 'explicitly-unset'

# Normal Intel Mac build
- target: x86_64-apple-darwin
os: macos-latest
Expand All @@ -59,6 +53,14 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Install protobuf (Apt)
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler
if: matrix.os == 'ubuntu-20.04'

- name: Install protobuf (Brew)
run: brew install protobuf
if: matrix.os == 'macos-latest'

# Install cross compilation rust toolchain for Arm64 Mac
- uses: actions-rust-lang/[email protected]
with:
Expand All @@ -72,11 +74,6 @@ jobs:
target: ${{ matrix.target }}
if: matrix.target == 'aarch64-unknown-linux-gnu'

# 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
uses: taiki-e/upload-rust-binary-action@v1
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## [0.17.2-rc1]
### Changed
- We now expose two crates from this project, one for capture payloads and the
other the main lading project.

## [0.17.1]
### Fixed
- Removed a leftover debug print in the Json payload implementation.
Expand Down
Loading

0 comments on commit 1dae2d6

Please sign in to comment.