Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies. #42

Merged
merged 12 commits into from
Aug 14, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ jobs:
- 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 stable --component clippy
- name: Run check
Expand All @@ -96,6 +98,8 @@ jobs:
- 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 stable
- name: Run docs
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- name: Install protoc
run: sudo apt-get install -y protobuf-compiler
wu-sheng marked this conversation as resolved.
Show resolved Hide resolved
- uses: actions-rs/toolchain@v1
with:
profile: minimal
Expand Down
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@ mock = [] # For internal integration testing only, do not use.
[dependencies]
async-stream = "0.3.3"
base64 = "0.13.0"
bytes = "1.1.0"
bytes = "1.2.1"
cfg-if = "1.0.0"
futures-core = "0.3.21"
futures-util = "0.3.21"
prost = "0.10.4"
prost-derive = "0.10.1"
serde = { version = "1.0.138", features = ["derive"] }
thiserror = "1.0.31"
tokio = { version = "1.18.2", features = ["parking_lot"] }
tonic = { version = "0.7.2", features = ["codegen"] }
tracing = "0.1.35"
uuid = { version = "1.1.0", features = ["serde", "v4"] }
prost = "0.11.0"
prost-derive = "0.11.0"
serde = { version = "1.0.143", features = ["derive"] }
thiserror = "1.0.32"
tokio = { version = "1.20.1", features = ["parking_lot"] }
tonic = { version = "0.8.0", features = ["codegen"] }
tracing = "0.1.36"
uuid = { version = "1.1.2", features = ["serde", "v4"] }

[build-dependencies]
tonic-build = "0.7.2"
tonic-build = "0.8.0"

[dev-dependencies]
tokio = { version = "1.18.2", features = ["rt-multi-thread", "signal"] }
tokio-stream = { version = "0.1.8", features = ["net"] }
tokio = { version = "1.20.1", features = ["rt-multi-thread", "signal"] }
tokio-stream = { version = "0.1.9", features = ["net"] }

[[test]]
name = "trace_context"
Expand Down
2 changes: 1 addition & 1 deletion e2e/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# under the License.
#
FROM rust:1.57
RUN apt-get update && apt-get install -y cmake
RUN apt-get update && apt-get install -y cmake protobuf-compiler
WORKDIR /build
COPY . /build/
RUN cargo build --release --workspace
Expand Down
11 changes: 9 additions & 2 deletions src/reporter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
//

pub mod grpc;
pub mod once_cell;
pub mod print;

use crate::skywalking_proto::v3::{LogData, SegmentObject};
use serde::{Deserialize, Serialize};
use std::{ops::Deref, sync::Arc};
use tokio::sync::OnceCell;

#[derive(Debug)]
#[derive(Debug, Serialize, Deserialize)]
#[non_exhaustive]
pub enum CollectItem {
Trace(SegmentObject),
Expand Down Expand Up @@ -51,3 +52,9 @@ impl<T: Report> Report for Arc<T> {
Report::report(self.deref(), item)
}
}

impl<T: Report> Report for OnceCell<T> {
fn report(&self, item: CollectItem) {
Report::report(self.get().expect("OnceCell is empty"), item)
}
}
38 changes: 0 additions & 38 deletions src/reporter/once_cell.rs

This file was deleted.