Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,18 @@ jobs:
- fmt
- check-and-test
- doc
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'

license-check:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Install Cargo nightly
run: rustup toolchain install nightly-2023-05-19
- name: Cargo minimal versions
run: cargo +nightly-2023-05-19 -Z minimal-versions generate-lockfile
- name: Check License Header
uses: apache/skywalking-eyes/header/@d299844e334855087f18ae1fe3c81ae8d22bc282
with:
Expand All @@ -73,15 +69,15 @@ jobs:


fmt:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Install Rust toolchain
run: rustup toolchain install nightly-2023-05-19 --component rustfmt
run: rustup toolchain install nightly-2025-03-24 --component rustfmt
- name: Run format
run: cargo +nightly-2023-05-19 fmt --all -- --check
run: cargo +nightly-2025-03-24 fmt --all -- --check

check-and-test:
strategy:
Expand All @@ -93,7 +89,7 @@ jobs:
- "--features vendored"
- "--features kafka-reporter"
- "--all-features"
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -102,9 +98,7 @@ jobs:
run: sudo apt-get install -y protobuf-compiler
if: ${{ matrix.features != '--features vendored' }}
- name: Install Cargo nightly
run: rustup toolchain install nightly-2023-05-19
- name: Cargo minimal versions
run: cargo +nightly-2023-05-19 -Z minimal-versions generate-lockfile
run: rustup toolchain install nightly-2025-03-24
- name: Run check
run: cargo check --workspace --release ${{ matrix.features }}
- name: Run clippy
Expand All @@ -113,14 +107,14 @@ jobs:
run: cargo test --workspace --release ${{ matrix.features }}

doc:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
submodules: 'recursive'
- name: Install protoc
run: sudo apt-get install -y protobuf-compiler
- name: Install Rust toolchain
run: rustup toolchain install nightly-2023-05-19
run: rustup toolchain install nightly-2025-03-24
- name: Run docs
run: cargo +nightly-2023-05-19 rustdoc --release --all-features -- --cfg docsrs
run: cargo +nightly-2025-03-24 rustdoc --release --all-features -- --cfg docsrs
9 changes: 5 additions & 4 deletions .github/workflows/codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
- 'v*'
jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -37,7 +37,8 @@ jobs:
profile: minimal
toolchain: stable
override: true
- uses: actions-rs/tarpaulin@v0.1
with:
version: 0.22.0
- name: Install and Run Tarpaulin
run: |
cargo install cargo-tarpaulin
cargo tarpaulin --out Xml
- uses: codecov/codecov-action@v2.1.0
21 changes: 13 additions & 8 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,23 @@ on:

jobs:
e2e-rust:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Prepare service container
run: docker-compose -f docker-compose.e2e.yml up --build -d
run: docker compose -f docker-compose.e2e.yml up --build -d --wait
- name: Run e2e
run: |
pip3 install --upgrade pip
pip3 install setuptools
pip3 install -r requirements.txt
python3 e2e/run_e2e.py --expected_file=e2e/data/expected_context.yaml --max_retry_times=3 --target_path=/ping
docker-compose -f docker-compose.e2e.yml logs producer consumer
docker-compose -f docker-compose.e2e.yml exec -T producer /build/target/release/e2e-kafka
curl -LsSf https://astral.sh/uv/install.sh | sh
uv python install 3.12
uv sync
uv run e2e/run_e2e.py --expected_file=e2e/data/expected_context.yaml --max_retry_times=3 --target_path=/ping
sleep 10
docker compose -f docker-compose.e2e.yml exec broker /opt/kafka/bin/kafka-topics.sh --list --bootstrap-server 127.0.0.1:9092
docker compose -f docker-compose.e2e.yml exec -T producer /build/target/release/e2e-kafka
- name: View logs
if: always()
run: |
docker compose -f docker-compose.e2e.yml logs
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/tests/target
/e2e/target
.idea/
/Cargo.lock
/.cargo/config.toml
/vendor
/.venv
/venv
16 changes: 16 additions & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
3.12
Loading
Loading