From b1095d43bd54b93d6008e35698e86f175a83204c Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Wed, 26 Feb 2020 09:44:06 -0800 Subject: [PATCH] include some of actix-net packages to workspace --- Cargo.toml | 14 ++ actix-net/CODE_OF_CONDUCT.md | 46 ----- actix-net/Cargo.toml | 30 --- actix-net/actix-codec/Cargo.toml | 1 - actix-net/actix-macros/Cargo.toml | 1 - actix-net/actix-server/Cargo.toml | 1 - actix-net/actix-testing/Cargo.toml | 1 - actix-net/actix-threadpool/Cargo.toml | 1 - actix-net/actix-tls/Cargo.toml | 1 - actix-net/actix-tracing/CHANGES.md | 5 - actix-net/actix-tracing/Cargo.toml | 26 --- actix-net/actix-tracing/LICENSE-APACHE | 1 - actix-net/actix-tracing/LICENSE-MIT | 1 - actix-net/actix-tracing/src/lib.rs | 261 ------------------------- codecov.yml | 1 + 15 files changed, 15 insertions(+), 376 deletions(-) delete mode 100644 actix-net/CODE_OF_CONDUCT.md delete mode 100644 actix-net/Cargo.toml delete mode 100644 actix-net/actix-tracing/CHANGES.md delete mode 100644 actix-net/actix-tracing/Cargo.toml delete mode 120000 actix-net/actix-tracing/LICENSE-APACHE delete mode 120000 actix-net/actix-tracing/LICENSE-MIT delete mode 100644 actix-net/actix-tracing/src/lib.rs diff --git a/Cargo.toml b/Cargo.toml index 1cf9579c..3e8939fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,8 +2,22 @@ members = [ "ntex", "ntex-web-macros", + + "actix-net/actix-server", + "actix-net/actix-service", + "actix-net/router", ] [patch.crates-io] actix-server = { path = "actix-net/actix-server" } actix-service = { path = "actix-net/actix-service" } +actix-router = { path = "actix-net/router" } + +actix-codec = { path = "actix-net/actix-codec" } +actix-connect = { path = "actix-net/actix-connect" } +actix-rt = { path = "actix-net/actix-rt" } +actix-macros = { path = "actix-net/actix-macros" } +actix-testing = { path = "actix-net/actix-testing" } +actix-threadpool = { path = "actix-net/actix-threadpool" } +actix-tls = { path = "actix-net/actix-tls" } +bytestring = { path = "actix-net/string" } diff --git a/actix-net/CODE_OF_CONDUCT.md b/actix-net/CODE_OF_CONDUCT.md deleted file mode 100644 index 599b28c0..00000000 --- a/actix-net/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. - -## Our Standards - -Examples of behavior that contributes to creating a positive environment include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a professional setting - -## Our Responsibilities - -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. - -## Scope - -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at fafhrd91@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ diff --git a/actix-net/Cargo.toml b/actix-net/Cargo.toml deleted file mode 100644 index 7e483dc3..00000000 --- a/actix-net/Cargo.toml +++ /dev/null @@ -1,30 +0,0 @@ -[workspace] -members = [ - "actix-codec", - "actix-connect", - "actix-rt", - "actix-macros", - "actix-service", - "actix-server", - "actix-testing", - "actix-threadpool", - "actix-tls", - "actix-tracing", - "router", - "string", -] - -[patch.crates-io] -actix-codec = { path = "actix-codec" } -actix-connect = { path = "actix-connect" } -actix-rt = { path = "actix-rt" } -actix-macros = { path = "actix-macros" } -actix-server = { path = "actix-server" } -actix-service = { path = "actix-service" } -actix-testing = { path = "actix-testing" } -actix-threadpool = { path = "actix-threadpool" } -actix-tls = { path = "actix-tls" } -actix-tracing = { path = "actix-tracing" } -actix-utils = { path = "actix-utils" } -actix-router = { path = "router" } -bytestring = { path = "string" } diff --git a/actix-net/actix-codec/Cargo.toml b/actix-net/actix-codec/Cargo.toml index 9decfdc1..5a6b918e 100644 --- a/actix-net/actix-codec/Cargo.toml +++ b/actix-net/actix-codec/Cargo.toml @@ -10,7 +10,6 @@ documentation = "https://docs.rs/actix-codec/" categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" edition = "2018" -workspace = ".." [lib] name = "actix_codec" diff --git a/actix-net/actix-macros/Cargo.toml b/actix-net/actix-macros/Cargo.toml index e1a961bc..48915510 100644 --- a/actix-net/actix-macros/Cargo.toml +++ b/actix-net/actix-macros/Cargo.toml @@ -8,7 +8,6 @@ documentation = "https://docs.rs/actix-macros/" categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" edition = "2018" -workspace = ".." [lib] proc-macro = true diff --git a/actix-net/actix-server/Cargo.toml b/actix-net/actix-server/Cargo.toml index e18fa615..c04cb7a5 100644 --- a/actix-net/actix-server/Cargo.toml +++ b/actix-net/actix-server/Cargo.toml @@ -11,7 +11,6 @@ categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] edition = "2018" -workspace = ".." [lib] name = "actix_server" diff --git a/actix-net/actix-testing/Cargo.toml b/actix-net/actix-testing/Cargo.toml index 6c0f96c7..ed970265 100644 --- a/actix-net/actix-testing/Cargo.toml +++ b/actix-net/actix-testing/Cargo.toml @@ -10,7 +10,6 @@ documentation = "https://docs.rs/actix-testing/" categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" edition = "2018" -workspace = ".." [lib] name = "actix_testing" diff --git a/actix-net/actix-threadpool/Cargo.toml b/actix-net/actix-threadpool/Cargo.toml index 36f9acfb..4a984c9e 100644 --- a/actix-net/actix-threadpool/Cargo.toml +++ b/actix-net/actix-threadpool/Cargo.toml @@ -11,7 +11,6 @@ categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] edition = "2018" -workspace = ".." [lib] name = "actix_threadpool" diff --git a/actix-net/actix-tls/Cargo.toml b/actix-net/actix-tls/Cargo.toml index 8381ba75..47d8078f 100644 --- a/actix-net/actix-tls/Cargo.toml +++ b/actix-net/actix-tls/Cargo.toml @@ -10,7 +10,6 @@ documentation = "https://docs.rs/actix-tls/" categories = ["network-programming", "asynchronous"] license = "MIT/Apache-2.0" edition = "2018" -workspace = ".." [package.metadata.docs.rs] features = ["openssl", "rustls", "nativetls"] diff --git a/actix-net/actix-tracing/CHANGES.md b/actix-net/actix-tracing/CHANGES.md deleted file mode 100644 index e2f7d7c4..00000000 --- a/actix-net/actix-tracing/CHANGES.md +++ /dev/null @@ -1,5 +0,0 @@ -# Changes - -## [0.1.0] - 2020-01-15 - -* Initial release diff --git a/actix-net/actix-tracing/Cargo.toml b/actix-net/actix-tracing/Cargo.toml deleted file mode 100644 index 055cd11c..00000000 --- a/actix-net/actix-tracing/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -name = "actix-tracing" -version = "0.1.0" -authors = ["Rajasekharan Vengalil "] -description = "Support for tokio tracing with Actix services" -keywords = ["network", "framework", "tracing"] -homepage = "https://actix.rs" -repository = "https://github.com/actix/actix-net.git" -documentation = "https://docs.rs/actix-tracing/" -categories = ["network-programming", "asynchronous"] -license = "MIT/Apache-2.0" -edition = "2018" - -[lib] -name = "actix_tracing" -path = "src/lib.rs" - -[dependencies] -actix-service = "1.0.4" -futures-util = "0.3.1" -tracing = "0.1" -tracing-futures = "0.2" - -[dev_dependencies] -actix-rt = "1.0" -slab = "0.4" \ No newline at end of file diff --git a/actix-net/actix-tracing/LICENSE-APACHE b/actix-net/actix-tracing/LICENSE-APACHE deleted file mode 120000 index 965b606f..00000000 --- a/actix-net/actix-tracing/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-APACHE \ No newline at end of file diff --git a/actix-net/actix-tracing/LICENSE-MIT b/actix-net/actix-tracing/LICENSE-MIT deleted file mode 120000 index 76219eb7..00000000 --- a/actix-net/actix-tracing/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-MIT \ No newline at end of file diff --git a/actix-net/actix-tracing/src/lib.rs b/actix-net/actix-tracing/src/lib.rs deleted file mode 100644 index 35c85286..00000000 --- a/actix-net/actix-tracing/src/lib.rs +++ /dev/null @@ -1,261 +0,0 @@ -//! Actix tracing - support for tokio tracing with Actix services. -#![deny(rust_2018_idioms, warnings)] - -use std::marker::PhantomData; -use std::task::{Context, Poll}; - -use actix_service::{ - apply, dev::ApplyTransform, IntoServiceFactory, Service, ServiceFactory, Transform, -}; -use futures_util::future::{ok, Either, Ready}; -use tracing_futures::{Instrument, Instrumented}; - -/// A `Service` implementation that automatically enters/exits tracing spans -/// for the wrapped inner service. -#[derive(Clone)] -pub struct TracingService { - inner: S, - make_span: F, -} - -impl TracingService { - pub fn new(inner: S, make_span: F) -> Self { - TracingService { inner, make_span } - } -} - -impl Service for TracingService -where - S: Service, - F: Fn(&S::Request) -> Option, -{ - type Request = S::Request; - type Response = S::Response; - type Error = S::Error; - type Future = Either>; - - fn poll_ready(&mut self, ctx: &mut Context<'_>) -> Poll> { - self.inner.poll_ready(ctx) - } - - fn call(&mut self, req: Self::Request) -> Self::Future { - let span = (self.make_span)(&req); - let _enter = span.as_ref().map(|s| s.enter()); - - let fut = self.inner.call(req); - - // make a child span to track the future's execution - if let Some(span) = span - .clone() - .map(|span| tracing::span!(parent: &span, tracing::Level::INFO, "future")) - { - Either::Right(fut.instrument(span)) - } else { - Either::Left(fut) - } - } -} - -/// A `Transform` implementation that wraps services with a [`TracingService`]. -/// -/// [`TracingService`]: struct.TracingService.html -pub struct TracingTransform { - make_span: F, - _p: PhantomData, -} - -impl TracingTransform { - pub fn new(make_span: F) -> Self { - TracingTransform { - make_span, - _p: PhantomData, - } - } -} - -impl Transform for TracingTransform -where - S: Service, - U: ServiceFactory< - Request = S::Request, - Response = S::Response, - Error = S::Error, - Service = S, - >, - F: Fn(&S::Request) -> Option + Clone, -{ - type Request = S::Request; - type Response = S::Response; - type Error = S::Error; - type Transform = TracingService; - type InitError = U::InitError; - type Future = Ready>; - - fn new_transform(&self, service: S) -> Self::Future { - ok(TracingService::new(service, self.make_span.clone())) - } -} - -/// Wraps the provided service factory with a transform that automatically -/// enters/exits the given span. -/// -/// The span to be entered/exited can be provided via a closure. The closure -/// is passed in a reference to the request being handled by the service. -/// -/// For example: -/// ```rust,ignore -/// let traced_service = trace( -/// web_service, -/// |req: &Request| Some(span!(Level::INFO, "request", req.id)) -/// ); -/// ``` -pub fn trace( - service_factory: U, - make_span: F, -) -> ApplyTransform, S> -where - S: ServiceFactory, - F: Fn(&S::Request) -> Option + Clone, - U: IntoServiceFactory, -{ - apply( - TracingTransform::new(make_span), - service_factory.into_factory(), - ) -} - -#[cfg(test)] -mod test { - use super::*; - - use std::cell::RefCell; - use std::collections::{BTreeMap, BTreeSet}; - use std::sync::{Arc, RwLock}; - - use actix_service::{fn_factory, fn_service}; - use slab::Slab; - use tracing::{span, Event, Level, Metadata, Subscriber}; - - thread_local! { - static SPAN: RefCell> = RefCell::new(Vec::new()); - } - - #[derive(Default)] - struct Stats { - entered_spans: BTreeSet, - exited_spans: BTreeSet, - events_count: BTreeMap, - } - - #[derive(Default)] - struct Inner { - spans: Slab<&'static Metadata<'static>>, - stats: Stats, - } - - #[derive(Clone, Default)] - struct TestSubscriber { - inner: Arc>, - } - - impl Subscriber for TestSubscriber { - fn enabled(&self, _metadata: &Metadata<'_>) -> bool { - true - } - - fn new_span(&self, span: &span::Attributes<'_>) -> span::Id { - let id = self.inner.write().unwrap().spans.insert(span.metadata()); - span::Id::from_u64(id as u64 + 1) - } - - fn record(&self, _span: &span::Id, _values: &span::Record<'_>) {} - - fn record_follows_from(&self, _span: &span::Id, _follows: &span::Id) {} - - fn event(&self, event: &Event<'_>) { - let id = event - .parent() - .cloned() - .or_else(|| SPAN.with(|current_span| current_span.borrow().last().cloned())) - .unwrap(); - - *self - .inner - .write() - .unwrap() - .stats - .events_count - .entry(id.into_u64()) - .or_insert(0) += 1; - } - - fn enter(&self, span: &span::Id) { - self.inner - .write() - .unwrap() - .stats - .entered_spans - .insert(span.into_u64()); - - SPAN.with(|current_span| { - current_span.borrow_mut().push(span.clone()); - }); - } - - fn exit(&self, span: &span::Id) { - self.inner - .write() - .unwrap() - .stats - .exited_spans - .insert(span.into_u64()); - - // we are guaranteed that on any given thread, spans are exited in reverse order - SPAN.with(|current_span| { - let leaving = current_span - .borrow_mut() - .pop() - .expect("told to exit span when not in span"); - assert_eq!( - &leaving, span, - "told to exit span that was not most recently entered" - ); - }); - } - } - - #[actix_rt::test] - async fn service_call() { - let service_factory = fn_factory(|| { - ok::<_, ()>(fn_service(|req: &'static str| { - tracing::event!(Level::TRACE, "It's happening - {}!", req); - ok::<_, ()>(()) - })) - }); - - let subscriber = TestSubscriber::default(); - let _guard = tracing::subscriber::set_default(subscriber.clone()); - - let span_svc = span!(Level::TRACE, "span_svc"); - let trace_service_factory = trace(service_factory, |_: &&str| Some(span_svc.clone())); - let mut service = trace_service_factory.new_service(()).await.unwrap(); - service.call("boo").await.unwrap(); - - let id = span_svc.id().unwrap().into_u64(); - assert!(subscriber - .inner - .read() - .unwrap() - .stats - .entered_spans - .contains(&id)); - assert!(subscriber - .inner - .read() - .unwrap() - .stats - .exited_spans - .contains(&id)); - assert_eq!(subscriber.inner.read().unwrap().stats.events_count[&id], 1); - } -} diff --git a/codecov.yml b/codecov.yml index cbc2876b..274c1334 100644 --- a/codecov.yml +++ b/codecov.yml @@ -2,3 +2,4 @@ ignore: # ignore codecoverage on following paths - "**/tests" - "**/benches" - "**/examples" + - "**/actix-net"