-
Notifications
You must be signed in to change notification settings - Fork 431
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into chore/add-wasm-build
- Loading branch information
Showing
242 changed files
with
11,833 additions
and
11,675 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Log of local changes | ||
|
||
Maintainers are expected to maintain this log. This is required as per | ||
[OpenTelemetry Community | ||
guidelines](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#collaborators-and-teams). | ||
|
||
## May 6th 2024 | ||
|
||
Modified branch protection for main branch to require the following CI checks as | ||
we now added Windows to CI. | ||
test (ubuntu-latest, stable) | ||
test (stable, windows-latest) | ||
|
||
## April 30th 2024 | ||
|
||
Modified branch protection for main branch to require the following CI checks: | ||
docs | ||
test (stable) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,10 +12,19 @@ jobs: | |
test: | ||
strategy: | ||
matrix: | ||
# test both stable and beta versions of Rust on ubuntu-latest | ||
os: [ubuntu-latest] | ||
rust: [stable, beta] | ||
runs-on: ubuntu-latest | ||
# test only stable version of Rust on Windows and MacOS | ||
include: | ||
- rust: stable | ||
os: windows-latest | ||
- rust: stable | ||
os: macos-latest | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- name: Free disk space | ||
if: ${{ matrix.os == 'ubuntu-latest'}} | ||
run: | | ||
df -h | ||
sudo rm -rf /usr/local/lib/android | ||
|
@@ -24,44 +33,46 @@ jobs: | |
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- uses: actions-rs/toolchain@v1 | ||
- uses: dtolnay/rust-toolchain@master | ||
with: | ||
toolchain: ${{ matrix.rust }} | ||
components: rustfmt | ||
profile: minimal | ||
- name: "Set rustup profile" | ||
run: rustup set profile minimal | ||
- uses: arduino/setup-protoc@v3 | ||
with: | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
- name: Test | ||
run: ./scripts/test.sh | ||
run: bash ./scripts/test.sh | ||
lint: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- uses: actions-rs/toolchain@v1 | ||
- uses: dtolnay/rust-toolchain@stable | ||
with: | ||
toolchain: stable | ||
components: rustfmt | ||
profile: minimal | ||
- uses: arduino/setup-protoc@v3 | ||
with: | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
- uses: actions-rs/cargo@v1 | ||
with: | ||
command: fmt | ||
args: --all -- --check | ||
- name: Lint | ||
run: ./scripts/lint.sh | ||
run: bash ./scripts/lint.sh | ||
external-types: | ||
strategy: | ||
matrix: | ||
example: [opentelemetry, opentelemetry-sdk] | ||
runs-on: ubuntu-latest | ||
example: [opentelemetry, opentelemetry-sdk, opentelemetry-otlp, opentelemetry-zipkin] | ||
runs-on: ubuntu-latest # TODO: Check if this could be covered for Windows. The step used currently fails on Windows. | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: actions-rs/toolchain@v1 | ||
- uses: dtolnay/rust-toolchain@nightly | ||
with: | ||
toolchain: nightly-2024-02-07 | ||
components: rustfmt | ||
override: true | ||
- name: external-type-check | ||
run: | | ||
cargo install cargo-check-external-types | ||
|
@@ -70,42 +81,41 @@ jobs: | |
non-default-examples: | ||
strategy: | ||
matrix: | ||
os: [ windows-latest, ubuntu-latest ] | ||
example: [opentelemetry-otlp/examples/basic-otlp] | ||
runs-on: ubuntu-latest | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- uses: actions-rs/toolchain@v1 | ||
- uses: dtolnay/rust-toolchain@stable | ||
with: | ||
toolchain: stable | ||
components: rustfmt | ||
profile: minimal | ||
- uses: arduino/setup-protoc@v3 | ||
with: | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
- name: Build | ||
run: | | ||
cd ${{ matrix.example }} | ||
cargo build --verbose | ||
msrv: | ||
runs-on: ubuntu-latest | ||
strategy: | ||
matrix: | ||
os: [ windows-latest, ubuntu-latest ] | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- uses: actions-rs/toolchain@v1 | ||
with: | ||
profile: minimal | ||
toolchain: 1.65.0 | ||
override: true | ||
- uses: dtolnay/[email protected] | ||
- name: Patch dependencies versions # some dependencies bump MSRV without major version bump | ||
run: ./scripts/patch_dependencies.sh | ||
run: bash ./scripts/patch_dependencies.sh | ||
- name: Run tests | ||
run: cargo --version && | ||
cargo test --manifest-path=opentelemetry/Cargo.toml --features trace,metrics,testing && | ||
cargo test --manifest-path=opentelemetry-jaeger/Cargo.toml --features rt-tokio && | ||
cargo test --manifest-path=opentelemetry-zipkin/Cargo.toml | ||
cargo-deny: | ||
runs-on: ubuntu-latest | ||
runs-on: ubuntu-latest # This uses the step `EmbarkStudios/cargo-deny-action@v1` which is only supported on Linux | ||
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci | ||
steps: | ||
- uses: actions/checkout@v4 | ||
|
@@ -117,12 +127,12 @@ jobs: | |
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: actions-rs/toolchain@v1 | ||
- uses: dtolnay/rust-toolchain@nightly | ||
with: | ||
toolchain: nightly | ||
components: rustfmt | ||
override: true | ||
- uses: arduino/setup-protoc@v3 | ||
with: | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
- name: doc | ||
run: cargo doc --no-deps --all-features | ||
env: | ||
|
@@ -131,16 +141,18 @@ jobs: | |
coverage: | ||
continue-on-error: true | ||
runs-on: ubuntu-latest | ||
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'dependencies') }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: true | ||
- uses: actions-rs/toolchain@v1 | ||
- uses: dtolnay/rust-toolchain@stable | ||
with: | ||
toolchain: stable | ||
components: rustfmt,llvm-tools-preview | ||
override: true | ||
- uses: arduino/setup-protoc@v3 | ||
with: | ||
repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
- name: cargo install cargo-llvm-cov | ||
uses: taiki-e/install-action@cargo-llvm-cov | ||
- name: cargo generate-lockfile | ||
|
@@ -149,6 +161,8 @@ jobs: | |
- name: cargo llvm-cov | ||
run: cargo llvm-cov --locked --all-features --workspace --lcov --output-path lcov.info | ||
- name: Upload to codecov.io | ||
uses: codecov/codecov-action@v3 | ||
uses: codecov/codecov-action@v4 | ||
env: | ||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} | ||
with: | ||
fail_ci_if_error: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.