From c971546f23ebbd00da763a92aca7e673e5b30c88 Mon Sep 17 00:00:00 2001 From: jmjoy Date: Thu, 3 Apr 2025 21:10:40 +0800 Subject: [PATCH 1/2] Release SkyWalking Rust 0.9.0 --- Cargo.lock | 2 +- Cargo.toml | 2 +- e2e/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5202957..ad3e550 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1130,7 +1130,7 @@ dependencies = [ [[package]] name = "skywalking" -version = "0.9.0-dev" +version = "0.9.0" dependencies = [ "base64", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 28e788d..7a9bb86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ members = [ [package] name = "skywalking" -version = "0.9.0-dev" +version = "0.9.0" authors = ["Apache Software Foundation"] edition = "2024" description = "Apache SkyWalking Rust Agent" diff --git a/e2e/Cargo.toml b/e2e/Cargo.toml index fd75c40..8c762f2 100644 --- a/e2e/Cargo.toml +++ b/e2e/Cargo.toml @@ -19,7 +19,7 @@ name = "e2e" version = "0.0.0" authors = ["Apache Software Foundation"] -edition = "2021" +edition = "2024" publish = false license = "Apache-2.0" default-run = "e2e" From 494727d723bb243a689b1b5bb38256dd76b5727e Mon Sep 17 00:00:00 2001 From: jmjoy Date: Thu, 3 Apr 2025 23:35:19 +0800 Subject: [PATCH 2/2] Fmt and License --- dist-material/LICENSE | 2 +- e2e/src/e2e_kafka.rs | 6 +++--- e2e/src/main.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist-material/LICENSE b/dist-material/LICENSE index 883c397..10b2995 100644 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -212,7 +212,7 @@ The text of each license is the standard Apache 2.0 license. https://crates.io/crates/prost-derive/0.13.5 0.13.5 Apache-2.0 https://crates.io/crates/prost-types/0.13.5 0.13.5 Apache-2.0 https://crates.io/crates/protobuf-src/2.1.1+27.1 2.1.1+27.1 Apache-2.0 - https://crates.io/crates/skywalking/0.9.0-dev 0.9.0-dev Apache-2.0 + https://crates.io/crates/skywalking/0.9.0 0.9.0 Apache-2.0 https://crates.io/crates/sync_wrapper/1.0.2 1.0.2 Apache-2.0 ======================================================================== diff --git a/e2e/src/e2e_kafka.rs b/e2e/src/e2e_kafka.rs index f9d3bc0..2596a23 100644 --- a/e2e/src/e2e_kafka.rs +++ b/e2e/src/e2e_kafka.rs @@ -18,12 +18,12 @@ use prost::Message; use rdkafka::{ - consumer::{Consumer, StreamConsumer}, ClientConfig, Message as _, + consumer::{Consumer, StreamConsumer}, }; use skywalking::proto::v3::{ - log_data_body::Content, meter_data::Metric, JsonLog, KeyStringValuePair, LogData, LogTags, - MeterData, RefType, SegmentObject, SpanLayer, SpanType, + JsonLog, KeyStringValuePair, LogData, LogTags, MeterData, RefType, SegmentObject, SpanLayer, + SpanType, log_data_body::Content, meter_data::Metric, }; use std::time::Duration; use tokio::time::timeout; diff --git a/e2e/src/main.rs b/e2e/src/main.rs index d714bc8..a7dcc18 100644 --- a/e2e/src/main.rs +++ b/e2e/src/main.rs @@ -17,10 +17,10 @@ // use http_body_util::{Empty, Full}; use hyper::{ + Method, Request, Response, StatusCode, body::{Bytes, Incoming}, client, server, service::service_fn, - Method, Request, Response, StatusCode, }; use hyper_util::rt::TokioIo; use skywalking::{ @@ -33,9 +33,9 @@ use skywalking::{ metricer::Metricer, }, reporter::{ + CollectItem, Report, grpc::GrpcReporter, kafka::{KafkaReportBuilder, KafkaReporter, RDKafkaClientConfig}, - CollectItem, Report, }, trace::{ propagation::{