From 15822a0c67ae8d7cbd5684fdd1a8d82758dfd78d Mon Sep 17 00:00:00 2001 From: Gary Pennington Date: Tue, 18 Apr 2023 10:07:29 +0100 Subject: [PATCH 01/11] linux: replace default allocator with jemalloc (#2882) Router execution results in a heavily fragmented heap, that is hard to manage for the default allocator. jemallocator handles it better, which results in performance improvements, in latency and memory usage --- .changesets/maint_garypen_jemalloc.md | 9 +++++++++ Cargo.lock | 21 +++++++++++++++++++++ apollo-router/Cargo.toml | 2 ++ apollo-router/src/main.rs | 10 ++++++++++ 4 files changed, 42 insertions(+) create mode 100644 .changesets/maint_garypen_jemalloc.md diff --git a/.changesets/maint_garypen_jemalloc.md b/.changesets/maint_garypen_jemalloc.md new file mode 100644 index 0000000000..d166fb95ea --- /dev/null +++ b/.changesets/maint_garypen_jemalloc.md @@ -0,0 +1,9 @@ +### use jemalloc on linux + +Detailed memory investigations of the router in use have revealed that there is a significant amount of memory fragmentation when using the default allocator, glibc, on linux. Performance testing and flamegraph analysis suggests that jemalloc on linux can yield significant performance improvements. In our tests, this figure shows performance to be about 35% faster than the default allocator. The improvement in performance being due to less time spent managing memory fragmentation. + +Not everyone will see a 35% performance improvement in this release of the router. Depending on your usage pattern, you may see more or less than this. If you see a regression, please file an issue with details. + +We have no reason to believe that there are allocation problems on other platforms, so this change is confined to linux. + +By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/2882 diff --git a/Cargo.lock b/Cargo.lock index 5b4a1d983a..3bc1369513 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -377,6 +377,7 @@ dependencies = [ "test-log", "test-span", "thiserror", + "tikv-jemallocator", "tokio", "tokio-rustls", "tokio-stream", @@ -5880,6 +5881,26 @@ dependencies = [ "tower", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.3+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + [[package]] name = "time" version = "0.3.20" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 4b7c34a917..5e91404e1e 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -209,6 +209,7 @@ uname = "0.1.1" [target.'cfg(unix)'.dependencies] uname = "0.1.1" +tikv-jemallocator = "0.5" [dev-dependencies] ecdsa = { version = "0.15.1", features = ["signing", "pem", "pkcs8"] } @@ -256,3 +257,4 @@ tonic-build = "0.8.4" [[test]] name = "integration_tests" path = "tests/integration_tests.rs" + diff --git a/apollo-router/src/main.rs b/apollo-router/src/main.rs index 9e5ad32e50..413189a753 100644 --- a/apollo-router/src/main.rs +++ b/apollo-router/src/main.rs @@ -1,4 +1,14 @@ //! Main entry point for CLI command to start server. +// Note: We want to use jemalloc on linux, but we don't enable it if dhat-heap is in use because we +// can only have one global allocator +#[cfg(target_os = "linux")] +#[cfg(not(feature = "dhat-heap"))] +use tikv_jemallocator::Jemalloc; + +#[cfg(target_os = "linux")] +#[cfg(not(feature = "dhat-heap"))] +#[global_allocator] +static GLOBAL: Jemalloc = Jemalloc; fn main() { match apollo_router::main() { From 9b080a35b2f29cdc788a2af40f1cbe21ac6e91e1 Mon Sep 17 00:00:00 2001 From: Geoffroy Couprie Date: Tue, 18 Apr 2023 11:45:00 +0200 Subject: [PATCH 02/11] Add a private part to the Context structure (#2802) There's a cost in using the `Context` structure throughout a request's lifecycle, due to the JSON serialization and deserialization, so it should be reserved from inter plugin communication between rhai, coprocessor and Rust. But for internal router usage, we can have a more efficient structure that avoids serialization costs, and does not expose data that should not be modified by plugins. That structure is based on a map indexed by type id, which means that if some part of the code can see that type, then it can access it in the map. This means that some context data that was accessible from rhai and all plugins, is now inaccessible --- .changesets/maint_geal_private_context.md | 7 + Cargo.lock | 1 + apollo-router/Cargo.toml | 1 + apollo-router/src/context/extensions.rs | 153 ++++++++++++++++++ .../src/{context.rs => context/mod.rs} | 7 + apollo-router/src/plugins/telemetry/mod.rs | 98 ++++++----- .../src/query_planner/bridge_query_planner.rs | 31 +--- .../query_planner/caching_query_planner.rs | 68 +++----- apollo-router/src/services/layers/apq.rs | 8 +- .../services/layers/content_negociation.rs | 39 ++--- apollo-router/src/services/router.rs | 7 + apollo-router/src/services/router_service.rs | 24 ++- .../src/services/supergraph_service.rs | 19 ++- 13 files changed, 314 insertions(+), 149 deletions(-) create mode 100644 .changesets/maint_geal_private_context.md create mode 100644 apollo-router/src/context/extensions.rs rename apollo-router/src/{context.rs => context/mod.rs} (97%) diff --git a/.changesets/maint_geal_private_context.md b/.changesets/maint_geal_private_context.md new file mode 100644 index 0000000000..467b376182 --- /dev/null +++ b/.changesets/maint_geal_private_context.md @@ -0,0 +1,7 @@ +### Add a private part to the Context structure ([Issue #2800](https://github.com/apollographql/router/issues/2800)) + +There's a cost in using the `Context` structure throughout a request's lifecycle, due to the JSON serialization and deserialization, so it should be reserved from inter plugin communication between rhai, coprocessor and Rust. But for internal router usage, we can have a more efficient structure that avoids serialization costs, and does not expose data that should not be modified by plugins. + +That structure is based on a map indexed by type id, which means that if some part of the code can see that type, then it can access it in the map. + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/2802 \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 3bc1369513..7275eeee95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,6 +344,7 @@ dependencies = [ "opentelemetry-semantic-conventions", "opentelemetry-zipkin", "p256 0.12.0", + "parking_lot 0.12.1", "paste", "pin-project-lite", "prometheus", diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 5e91404e1e..90fb975469 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -203,6 +203,7 @@ yaml-rust = "0.4.5" wsl = "0.1.0" tokio-rustls = "0.23.4" http-serde = "1.1.2" +parking_lot = "0.12.1" [target.'cfg(macos)'.dependencies] uname = "0.1.1" diff --git a/apollo-router/src/context/extensions.rs b/apollo-router/src/context/extensions.rs new file mode 100644 index 0000000000..c868d4f73f --- /dev/null +++ b/apollo-router/src/context/extensions.rs @@ -0,0 +1,153 @@ +// NOTE: this module is taken from tokio's tracing span's extensions +// which is taken from https://github.com/hyperium/http/blob/master/src/extensions.rs + +use std::any::Any; +use std::any::TypeId; +use std::collections::HashMap; +use std::fmt; +use std::hash::BuildHasherDefault; +use std::hash::Hasher; + +type AnyMap = HashMap, BuildHasherDefault>; + +// With TypeIds as keys, there's no need to hash them. They are already hashes +// themselves, coming from the compiler. The IdHasher just holds the u64 of +// the TypeId, and then returns it, instead of doing any bit fiddling. +#[derive(Default)] +struct IdHasher(u64); + +impl Hasher for IdHasher { + fn write(&mut self, _: &[u8]) { + unreachable!("TypeId calls write_u64"); + } + + #[inline] + fn write_u64(&mut self, id: u64) { + self.0 = id; + } + + #[inline] + fn finish(&self) -> u64 { + self.0 + } +} + +/// A type map of protocol extensions. +/// +/// `Extensions` can be used by `Request` and `Response` to store +/// extra data derived from the underlying protocol. +#[derive(Default)] +pub(crate) struct Extensions { + // If extensions are never used, no need to carry around an empty HashMap. + // That's 3 words. Instead, this is only 1 word. + map: Option>, +} + +#[allow(unused)] +impl Extensions { + /// Create an empty `Extensions`. + #[inline] + pub(crate) fn new() -> Extensions { + Extensions { map: None } + } + + /// Insert a type into this `Extensions`. + /// + /// If a extension of this type already existed, it will + /// be returned. + pub(crate) fn insert(&mut self, val: T) -> Option { + self.map + .get_or_insert_with(Box::default) + .insert(TypeId::of::(), Box::new(val)) + .and_then(|boxed| { + (boxed as Box) + .downcast() + .ok() + .map(|boxed| *boxed) + }) + } + + /// Get a reference to a type previously inserted on this `Extensions`. + pub(crate) fn get(&self) -> Option<&T> { + self.map + .as_ref() + .and_then(|map| map.get(&TypeId::of::())) + .and_then(|boxed| (&**boxed as &(dyn Any + 'static)).downcast_ref()) + } + + /// Get a mutable reference to a type previously inserted on this `Extensions`. + pub(crate) fn get_mut(&mut self) -> Option<&mut T> { + self.map + .as_mut() + .and_then(|map| map.get_mut(&TypeId::of::())) + .and_then(|boxed| (&mut **boxed as &mut (dyn Any + 'static)).downcast_mut()) + } + + pub(crate) fn contains_key(&self) -> bool { + self.map + .as_ref() + .map(|map| map.contains_key(&TypeId::of::())) + .unwrap_or_default() + } + + /// Remove a type from this `Extensions`. + /// + /// If a extension of this type existed, it will be returned. + pub(crate) fn remove(&mut self) -> Option { + self.map + .as_mut() + .and_then(|map| map.remove(&TypeId::of::())) + .and_then(|boxed| { + (boxed as Box) + .downcast() + .ok() + .map(|boxed| *boxed) + }) + } + + /// Clear the `Extensions` of all inserted extensions. + #[inline] + pub(crate) fn clear(&mut self) { + if let Some(ref mut map) = self.map { + map.clear(); + } + } + + /// Check whether the extension set is empty or not. + #[inline] + pub(crate) fn is_empty(&self) -> bool { + self.map.as_ref().map_or(true, |map| map.is_empty()) + } + + /// Get the numer of extensions available. + #[inline] + pub(crate) fn len(&self) -> usize { + self.map.as_ref().map_or(0, |map| map.len()) + } +} + +impl fmt::Debug for Extensions { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("Extensions").finish() + } +} + +#[test] +fn test_extensions() { + #[derive(Debug, PartialEq)] + struct MyType(i32); + + let mut extensions = Extensions::new(); + + extensions.insert(5i32); + extensions.insert(MyType(10)); + + assert_eq!(extensions.get(), Some(&5i32)); + assert_eq!(extensions.get_mut(), Some(&mut 5i32)); + + assert_eq!(extensions.remove::(), Some(5i32)); + assert!(extensions.get::().is_none()); + + assert_eq!(extensions.get::(), None); + assert_eq!(extensions.get(), Some(&MyType(10))); +} diff --git a/apollo-router/src/context.rs b/apollo-router/src/context/mod.rs similarity index 97% rename from apollo-router/src/context.rs rename to apollo-router/src/context/mod.rs index e4f670d93e..5a1bc7b86b 100644 --- a/apollo-router/src/context.rs +++ b/apollo-router/src/context/mod.rs @@ -15,8 +15,11 @@ use serde::Deserialize; use serde::Serialize; use tower::BoxError; +use self::extensions::Extensions; use crate::json_ext::Value; +pub(crate) mod extensions; + /// Holds [`Context`] entries. pub(crate) type Entries = Arc>; @@ -36,6 +39,9 @@ pub struct Context { // Allows adding custom entries to the context. entries: Entries, + #[serde(skip, default)] + pub(crate) private_entries: Arc>, + /// Creation time #[serde(skip)] #[serde(default = "Instant::now")] @@ -50,6 +56,7 @@ impl Context { pub fn new() -> Self { Context { entries: Default::default(), + private_entries: Arc::new(parking_lot::Mutex::new(Extensions::default())), created_at: Instant::now(), busy_timer: Arc::new(Mutex::new(BusyTimer::new())), } diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs index b05d3adb97..c3f65980bd 100644 --- a/apollo-router/src/plugins/telemetry/mod.rs +++ b/apollo-router/src/plugins/telemetry/mod.rs @@ -93,7 +93,6 @@ use crate::plugins::telemetry::tracing::apollo_telemetry::decode_ftv1_trace; use crate::plugins::telemetry::tracing::apollo_telemetry::APOLLO_PRIVATE_OPERATION_SIGNATURE; use crate::plugins::telemetry::tracing::TracingConfigurator; use crate::query_planner::OperationKind; -use crate::query_planner::USAGE_REPORTING; use crate::register_plugin; use crate::router_factory::Endpoint; use crate::services::execution; @@ -126,9 +125,6 @@ pub(crate) const ROUTER_SPAN_NAME: &str = "router"; pub(crate) const EXECUTION_SPAN_NAME: &str = "execution"; const CLIENT_NAME: &str = "apollo_telemetry::client_name"; const CLIENT_VERSION: &str = "apollo_telemetry::client_version"; -const ATTRIBUTES: &str = "apollo_telemetry::metrics_attributes"; -const SUBGRAPH_ATTRIBUTES: &str = "apollo_telemetry::subgraph_metrics_attributes"; -const ENABLE_SUBGRAPH_FTV1: &str = "apollo_telemetry::enable_subgraph_ftv1"; const SUBGRAPH_FTV1: &str = "apollo_telemetry::subgraph_ftv1"; const OPERATION_KIND: &str = "apollo_telemetry::operation_kind"; pub(crate) const STUDIO_EXCLUDE: &str = "apollo_telemetry::studio::exclude"; @@ -320,8 +316,8 @@ impl Plugin for Telemetry { )) .map_response(move |mut resp: SupergraphResponse| { let config = config_map_res_first.clone(); - if let Ok(Some(usage_reporting)) = - resp.context.get::<_, UsageReporting>(USAGE_REPORTING) + if let Some(usage_reporting) = + resp.context.private_entries.lock().get::() { // Record the operation signature on the router span Span::current().record( @@ -739,17 +735,21 @@ impl Telemetry { result: Result, request_duration: Duration, ) -> Result { - let mut metric_attrs = context - .get::<_, HashMap>(ATTRIBUTES) - .ok() - .flatten() - .map(|attrs| { - attrs - .into_iter() - .map(|(attr_name, attr_value)| KeyValue::new(attr_name, attr_value)) - .collect::>() - }) - .unwrap_or_default(); + let mut metric_attrs = { + context + .private_entries + .lock() + .get::() + .cloned() + } + .map(|attrs| { + attrs + .0 + .into_iter() + .map(|(attr_name, attr_value)| KeyValue::new(attr_name, attr_value)) + .collect::>() + }) + .unwrap_or_default(); let res = match result { Ok(response) => { metric_attrs.push(KeyValue::new( @@ -878,10 +878,13 @@ impl Telemetry { attributes.extend(router_attributes_conf.get_attributes_from_context(context)); } - let _ = context.insert(ATTRIBUTES, attributes); + let _ = context + .private_entries + .lock() + .insert(MetricsAttributes(attributes)); } if rand::thread_rng().gen_bool(field_level_instrumentation_ratio) { - context.insert_json_value(ENABLE_SUBGRAPH_FTV1, json!(true)); + context.private_entries.lock().insert(EnableSubgraphFtv1); } } @@ -967,8 +970,9 @@ impl Telemetry { } sub_request .context - .insert(SUBGRAPH_ATTRIBUTES, attributes) - .unwrap(); + .private_entries + .lock() + .insert(SubgraphMetricsAttributes(attributes)); //.unwrap(); } fn store_subgraph_response_attributes( @@ -979,17 +983,21 @@ impl Telemetry { now: Instant, result: &Result, ) { - let mut metric_attrs = context - .get::<_, HashMap>(SUBGRAPH_ATTRIBUTES) - .ok() - .flatten() - .map(|attrs| { - attrs - .into_iter() - .map(|(attr_name, attr_value)| KeyValue::new(attr_name, attr_value)) - .collect::>() - }) - .unwrap_or_default(); + let mut metric_attrs = { + context + .private_entries + .lock() + .get::() + .cloned() + } + .map(|attrs| { + attrs + .0 + .into_iter() + .map(|(attr_name, attr_value)| KeyValue::new(attr_name, attr_value)) + .collect::>() + }) + .unwrap_or_default(); metric_attrs.push(subgraph_attribute); // Fill attributes from context if let Some(subgraph_attributes_conf) = &*attribute_forward_config { @@ -1149,8 +1157,10 @@ impl Telemetry { operation_subtype: Option, ) { let metrics = if let Some(usage_reporting) = context - .get::<_, UsageReporting>(USAGE_REPORTING) - .unwrap_or_default() + .private_entries + .lock() + .get::() + .cloned() { let operation_count = operation_count(&usage_reporting.stats_report_key); let persisted_query_hit = context @@ -1480,7 +1490,11 @@ fn handle_error>(err: T) { register_plugin!("apollo", "telemetry", Telemetry); fn request_ftv1(mut req: SubgraphRequest) -> SubgraphRequest { - if req.context.contains_key(ENABLE_SUBGRAPH_FTV1) + if req + .context + .private_entries + .lock() + .contains_key::() && Span::current().context().span().span_context().is_sampled() { req.subgraph_request.headers_mut().insert( @@ -1493,7 +1507,12 @@ fn request_ftv1(mut req: SubgraphRequest) -> SubgraphRequest { fn store_ftv1(subgraph_name: &ByteString, resp: SubgraphResponse) -> SubgraphResponse { // Stash the FTV1 data - if resp.context.contains_key(ENABLE_SUBGRAPH_FTV1) { + if resp + .context + .private_entries + .lock() + .contains_key::() + { if let Some(serde_json_bytes::Value::String(ftv1)) = resp.response.body().extensions.get("ftv1") { @@ -1580,6 +1599,13 @@ impl TextMapPropagator for CustomTraceIdPropagator { } } +#[derive(Clone)] +struct MetricsAttributes(HashMap); + +#[derive(Clone)] +struct SubgraphMetricsAttributes(HashMap); + +struct EnableSubgraphFtv1; // // Please ensure that any tests added to the tests module use the tokio multi-threaded test executor. // diff --git a/apollo-router/src/query_planner/bridge_query_planner.rs b/apollo-router/src/query_planner/bridge_query_planner.rs index 4fdec23c12..016e8071d6 100644 --- a/apollo-router/src/query_planner/bridge_query_planner.rs +++ b/apollo-router/src/query_planner/bridge_query_planner.rs @@ -29,8 +29,6 @@ use crate::spec::Query; use crate::spec::Schema; use crate::Configuration; -pub(crate) static USAGE_REPORTING: &str = "apollo_telemetry::usage_reporting"; - #[derive(Clone)] /// A query planner that calls out to the nodejs router-bridge query planner. /// @@ -236,29 +234,16 @@ impl Service for BridgeQueryPlanner { Err(e) => { match &e { QueryPlannerError::PlanningErrors(pe) => { - if let Err(inner_e) = req - .context - .insert(USAGE_REPORTING, pe.usage_reporting.clone()) - { - tracing::error!( - "usage reporting was not serializable to context, {}", - inner_e - ); - } + req.context + .private_entries + .lock() + .insert(pe.usage_reporting.clone()); } QueryPlannerError::SpecError(e) => { - if let Err(inner_e) = req.context.insert( - USAGE_REPORTING, - UsageReporting { - stats_report_key: e.get_error_key().to_string(), - referenced_fields_by_type: HashMap::new(), - }, - ) { - tracing::error!( - "usage reporting was not serializable to context, {}", - inner_e - ); - } + req.context.private_entries.lock().insert(UsageReporting { + stats_report_key: e.get_error_key().to_string(), + referenced_fields_by_type: HashMap::new(), + }); } _ => (), } diff --git a/apollo-router/src/query_planner/caching_query_planner.rs b/apollo-router/src/query_planner/caching_query_planner.rs index c0e4a00fc5..a1d6392021 100644 --- a/apollo-router/src/query_planner/caching_query_planner.rs +++ b/apollo-router/src/query_planner/caching_query_planner.rs @@ -8,12 +8,9 @@ use std::task; use futures::future::BoxFuture; use router_bridge::planner::Planner; use router_bridge::planner::UsageReporting; -use serde::Serialize; -use serde_json_bytes::value::Serializer; use tower::ServiceExt; use tracing::Instrument; -use super::USAGE_REPORTING; use crate::cache::DeduplicatingCache; use crate::error::CacheResolverError; use crate::error::QueryPlannerError; @@ -169,17 +166,10 @@ where } if let Some(QueryPlannerContent::Plan { plan, .. }) = &content { - match (plan.usage_reporting).serialize(Serializer) { - Ok(v) => { - context.insert_json_value(USAGE_REPORTING, v); - } - Err(e) => { - tracing::error!( - "usage reporting was not serializable to context, {}", - e - ); - } - } + context + .private_entries + .lock() + .insert(plan.usage_reporting.clone()); } Ok(QueryPlannerResponse { content, @@ -211,17 +201,10 @@ where match res { Ok(content) => { if let QueryPlannerContent::Plan { plan, .. } = &content { - match (plan.usage_reporting).serialize(Serializer) { - Ok(v) => { - context.insert_json_value(USAGE_REPORTING, v); - } - Err(e) => { - tracing::error!( - "usage reporting was not serializable to context, {}", - e - ); - } - } + context + .private_entries + .lock() + .insert(plan.usage_reporting.clone()); } Ok(QueryPlannerResponse::builder() @@ -232,29 +215,21 @@ where Err(error) => { match error.deref() { QueryPlannerError::PlanningErrors(pe) => { - if let Err(inner_e) = request + request .context - .insert(USAGE_REPORTING, pe.usage_reporting.clone()) - { - tracing::error!( - "usage reporting was not serializable to context, {}", - inner_e - ); - } + .private_entries + .lock() + .insert(pe.usage_reporting.clone()); } QueryPlannerError::SpecError(e) => { - if let Err(inner_e) = request.context.insert( - USAGE_REPORTING, - UsageReporting { + request + .context + .private_entries + .lock() + .insert(UsageReporting { stats_report_key: e.get_error_key().to_string(), referenced_fields_by_type: HashMap::new(), - }, - ) { - tracing::error!( - "usage reporting was not serializable to context, {}", - inner_e - ); - } + }); } _ => {} } @@ -427,10 +402,9 @@ mod tests { .await .unwrap() .context - .get::<_, UsageReporting>(USAGE_REPORTING) - .ok() - .flatten() - .is_some()); + .private_entries + .lock() + .contains_key::()); } } } diff --git a/apollo-router/src/services/layers/apq.rs b/apollo-router/src/services/layers/apq.rs index 44ed17a71d..b9c61c6227 100644 --- a/apollo-router/src/services/layers/apq.rs +++ b/apollo-router/src/services/layers/apq.rs @@ -192,7 +192,7 @@ mod apq_tests { use crate::configuration::Apq; use crate::error::Error; use crate::graphql::Response; - use crate::services::layers::content_negociation::ACCEPTS_JSON_CONTEXT_KEY; + use crate::services::router::ClientRequestAccepts; use crate::services::router_service::from_supergraph_mock_callback; use crate::services::router_service::from_supergraph_mock_callback_and_configuration; use crate::Configuration; @@ -521,7 +521,11 @@ mod apq_tests { fn new_context() -> Context { let context = Context::new(); - context.insert(ACCEPTS_JSON_CONTEXT_KEY, true).unwrap(); + context.private_entries.lock().insert(ClientRequestAccepts { + json: true, + ..Default::default() + }); + context } } diff --git a/apollo-router/src/services/layers/content_negociation.rs b/apollo-router/src/services/layers/content_negociation.rs index 3a651a3b28..5a7972aac5 100644 --- a/apollo-router/src/services/layers/content_negociation.rs +++ b/apollo-router/src/services/layers/content_negociation.rs @@ -23,15 +23,13 @@ use crate::graphql; use crate::layers::sync_checkpoint::CheckpointService; use crate::layers::ServiceExt as _; use crate::services::router; +use crate::services::router::ClientRequestAccepts; use crate::services::supergraph; use crate::services::MULTIPART_DEFER_CONTENT_TYPE; use crate::services::MULTIPART_DEFER_SPEC_PARAMETER; use crate::services::MULTIPART_DEFER_SPEC_VALUE; pub(crate) const GRAPHQL_JSON_RESPONSE_HEADER_VALUE: &str = "application/graphql-response+json"; -pub(crate) const ACCEPTS_WILDCARD_CONTEXT_KEY: &str = "content-negociation:accepts-wildcard"; -pub(crate) const ACCEPTS_MULTIPART_CONTEXT_KEY: &str = "content-negociation:accepts-multipart"; -pub(crate) const ACCEPTS_JSON_CONTEXT_KEY: &str = "content-negociation:accepts-json"; /// [`Layer`] for Content-Type checks implementation. #[derive(Clone, Default)] @@ -78,14 +76,13 @@ where if accepts_wildcard || accepts_multipart || accepts_json { req.context - .insert(ACCEPTS_WILDCARD_CONTEXT_KEY, accepts_wildcard) - .unwrap(); - req.context - .insert(ACCEPTS_MULTIPART_CONTEXT_KEY, accepts_multipart) - .unwrap(); - req.context - .insert(ACCEPTS_JSON_CONTEXT_KEY, accepts_json) - .unwrap(); + .private_entries + .lock() + .insert(ClientRequestAccepts { + wildcard: accepts_wildcard, + multipart: accepts_multipart, + json: accepts_json, + }); Ok(ControlFlow::Continue(req)) } else { @@ -129,17 +126,15 @@ where fn layer(&self, service: S) -> Self::Service { service .map_first_graphql_response(|context, mut parts, res| { - let accepts_wildcard: bool = context - .get(ACCEPTS_WILDCARD_CONTEXT_KEY) - .unwrap_or_default() - .unwrap_or_default(); - let accepts_json: bool = context - .get(ACCEPTS_JSON_CONTEXT_KEY) - .unwrap_or_default() - .unwrap_or_default(); - let accepts_multipart: bool = context - .get(ACCEPTS_MULTIPART_CONTEXT_KEY) - .unwrap_or_default() + let ClientRequestAccepts { + wildcard: accepts_wildcard, + json: accepts_json, + multipart: accepts_multipart, + } = context + .private_entries + .lock() + .get() + .cloned() .unwrap_or_default(); if !res.has_next.unwrap_or_default() && (accepts_json || accepts_wildcard) { diff --git a/apollo-router/src/services/router.rs b/apollo-router/src/services/router.rs index 486d1b329b..ec0b123aa4 100644 --- a/apollo-router/src/services/router.rs +++ b/apollo-router/src/services/router.rs @@ -246,3 +246,10 @@ impl Response { ) } } + +#[derive(Clone, Default)] +pub(crate) struct ClientRequestAccepts { + pub(crate) multipart: bool, + pub(crate) json: bool, + pub(crate) wildcard: bool, +} diff --git a/apollo-router/src/services/router_service.rs b/apollo-router/src/services/router_service.rs index 70df7bf7cc..8af3ea2b34 100644 --- a/apollo-router/src/services/router_service.rs +++ b/apollo-router/src/services/router_service.rs @@ -34,12 +34,10 @@ use tracing::Instrument; use super::layers::apq::APQLayer; use super::layers::content_negociation; -use super::layers::content_negociation::ACCEPTS_JSON_CONTEXT_KEY; -use super::layers::content_negociation::ACCEPTS_MULTIPART_CONTEXT_KEY; -use super::layers::content_negociation::ACCEPTS_WILDCARD_CONTEXT_KEY; use super::layers::static_page::StaticPageLayer; use super::new_service::ServiceFactory; use super::router; +use super::router::ClientRequestAccepts; use super::supergraph; use super::HasPlugins; #[cfg(test)] @@ -257,17 +255,15 @@ where Ok(request) => supergraph_creator.create().oneshot(request).await?, }; - let accepts_wildcard: bool = context - .get(ACCEPTS_WILDCARD_CONTEXT_KEY) - .unwrap_or_default() - .unwrap_or_default(); - let accepts_json: bool = context - .get(ACCEPTS_JSON_CONTEXT_KEY) - .unwrap_or_default() - .unwrap_or_default(); - let accepts_multipart: bool = context - .get(ACCEPTS_MULTIPART_CONTEXT_KEY) - .unwrap_or_default() + let ClientRequestAccepts { + wildcard: accepts_wildcard, + json: accepts_json, + multipart: accepts_multipart, + } = context + .private_entries + .lock() + .get() + .cloned() .unwrap_or_default(); let (mut parts, mut body) = response.into_parts(); diff --git a/apollo-router/src/services/supergraph_service.rs b/apollo-router/src/services/supergraph_service.rs index 920120473e..14b1ab354a 100644 --- a/apollo-router/src/services/supergraph_service.rs +++ b/apollo-router/src/services/supergraph_service.rs @@ -20,8 +20,8 @@ use tower_service::Service; use tracing_futures::Instrument; use super::layers::content_negociation; -use super::layers::content_negociation::ACCEPTS_MULTIPART_CONTEXT_KEY; use super::new_service::ServiceFactory; +use super::router::ClientRequestAccepts; use super::subgraph_service::MakeSubgraphService; use super::subgraph_service::SubgraphServiceFactory; use super::ExecutionServiceFactory; @@ -189,9 +189,14 @@ where let operation_name = body.operation_name.clone(); let is_deferred = plan.is_deferred(operation_name.as_deref(), &variables); - let accepts_multipart: bool = context - .get(ACCEPTS_MULTIPART_CONTEXT_KEY) - .unwrap_or_default() + let ClientRequestAccepts { + multipart: accepts_multipart, + .. + } = context + .private_entries + .lock() + .get() + .cloned() .unwrap_or_default(); if is_deferred && !accepts_multipart { @@ -1535,7 +1540,11 @@ mod tests { fn defer_context() -> Context { let context = Context::new(); - context.insert(ACCEPTS_MULTIPART_CONTEXT_KEY, true).unwrap(); + context.private_entries.lock().insert(ClientRequestAccepts { + multipart: true, + ..Default::default() + }); + context } From 5e8a00e11e6d7499f1672e8bd2feb526c4eec56e Mon Sep 17 00:00:00 2001 From: Geoffroy Couprie Date: Tue, 18 Apr 2023 12:27:29 +0200 Subject: [PATCH 03/11] lighter path manipulation in response formatting (#2854) Response formatting generates a lot of temporary allocations to create response paths that end up unused. By making a reference based type to hold these paths, we can prevent those allocations and improve performance. --- .changesets/maint_geal_path_manipulation.md | 5 ++ apollo-router/src/json_ext.rs | 20 ++++++++ apollo-router/src/query_planner/execution.rs | 6 ++- apollo-router/src/spec/query.rs | 54 ++++++++++---------- 4 files changed, 57 insertions(+), 28 deletions(-) create mode 100644 .changesets/maint_geal_path_manipulation.md diff --git a/.changesets/maint_geal_path_manipulation.md b/.changesets/maint_geal_path_manipulation.md new file mode 100644 index 0000000000..1c25d82355 --- /dev/null +++ b/.changesets/maint_geal_path_manipulation.md @@ -0,0 +1,5 @@ +### lighter path manipulation in response formatting + +Response formatting generates a lot of temporary allocations to create response paths that end up unused. By making a reference based type to hold these paths, we can prevent those allocations and improve performance. + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/2854 \ No newline at end of file diff --git a/apollo-router/src/json_ext.rs b/apollo-router/src/json_ext.rs index 66135d2a30..e05b010550 100644 --- a/apollo-router/src/json_ext.rs +++ b/apollo-router/src/json_ext.rs @@ -577,6 +577,15 @@ pub enum PathElement { Key(String), } +#[derive(Clone, Debug, Eq, PartialEq)] +pub enum ResponsePathElement<'a> { + /// An index path element. + Index(usize), + + /// A key path element. + Key(&'a str), +} + fn deserialize_flatten<'de, D>(deserializer: D) -> Result<(), D::Error> where D: serde::Deserializer<'de>, @@ -676,6 +685,17 @@ impl Path { ) } + pub fn from_response_slice(s: &[ResponsePathElement]) -> Self { + Self( + s.iter() + .map(|x| match x { + ResponsePathElement::Index(index) => PathElement::Index(*index), + ResponsePathElement::Key(s) => PathElement::Key(s.to_string()), + }) + .collect(), + ) + } + pub fn iter(&self) -> impl Iterator { self.0.iter() } diff --git a/apollo-router/src/query_planner/execution.rs b/apollo-router/src/query_planner/execution.rs index 61e8c4f1f6..85fba06537 100644 --- a/apollo-router/src/query_planner/execution.rs +++ b/apollo-router/src/query_planner/execution.rs @@ -167,7 +167,11 @@ impl PlanNode { parent_value, sender, ) - .instrument(tracing::info_span!(FLATTEN_SPAN_NAME, "graphql.path" = %current_dir, "otel.kind" = "INTERNAL")) + .instrument(tracing::info_span!( + FLATTEN_SPAN_NAME, + "graphql.path" = %current_dir, + "otel.kind" = "INTERNAL" + )) .await; value = v; diff --git a/apollo-router/src/spec/query.rs b/apollo-router/src/spec/query.rs index c4974ab86c..b1e45c3716 100644 --- a/apollo-router/src/spec/query.rs +++ b/apollo-router/src/spec/query.rs @@ -26,7 +26,7 @@ use crate::graphql::Request; use crate::graphql::Response; use crate::json_ext::Object; use crate::json_ext::Path; -use crate::json_ext::PathElement; +use crate::json_ext::ResponsePathElement; use crate::json_ext::Value; use crate::query_planner::fetch::OperationKind; use crate::spec::FieldType; @@ -158,7 +158,7 @@ impl Query { &mut parameters, &mut input, &mut output, - &mut Path::default(), + &mut Vec::new(), ) { Ok(()) => output.into(), Err(InvalidValue) => Value::Null, @@ -214,7 +214,7 @@ impl Query { &mut parameters, &mut input, &mut output, - &mut Path::default(), + &mut Vec::new(), ) { Ok(()) => output.into(), Err(InvalidValue) => Value::Null, @@ -327,15 +327,15 @@ impl Query { } #[allow(clippy::too_many_arguments)] - fn format_value( - &self, + fn format_value<'a: 'b, 'b>( + &'a self, parameters: &mut FormatParameters, field_type: &FieldType, input: &mut Value, output: &mut Value, - path: &mut Path, + path: &mut Vec>, parent_type: &FieldType, - selection_set: &[Selection], + selection_set: &'a [Selection], ) -> Result<(), InvalidValue> { // for every type, if we have an invalid value, we will replace it with null // and return Ok(()), because values are optional by default @@ -357,17 +357,17 @@ impl Query { Ok(_) => { if output.is_null() { let message = match path.last() { - Some(PathElement::Key(k)) => format!( + Some(ResponsePathElement::Key(k)) => format!( "Cannot return null for non-nullable field {parent_type}.{k}" ), - Some(PathElement::Index(i)) => format!( + Some(ResponsePathElement::Index(i)) => format!( "Cannot return null for non-nullable array element of type {inner_type} at index {i}" ), _ => todo!(), }; parameters.errors.push(Error { message, - path: Some(path.clone()), + path: Some(Path::from_response_slice(path)), ..Error::default() }); @@ -397,7 +397,7 @@ impl Query { .iter_mut() .enumerate() .try_for_each(|(i, element)| { - path.push(PathElement::Index(i)); + path.push(ResponsePathElement::Index(i)); let res = self.format_value( parameters, inner_type, @@ -411,7 +411,7 @@ impl Query { res }) { Err(InvalidValue) => { - parameters.nullified.push(path.clone()); + parameters.nullified.push(Path::from_response_slice(path)); *output = Value::Null; Ok(()) } @@ -457,7 +457,7 @@ impl Query { if !parameters.schema.object_types.contains_key(input_type) && !parameters.schema.interfaces.contains_key(input_type) { - parameters.nullified.push(path.clone()); + parameters.nullified.push(Path::from_response_slice(path)); *output = Value::Null; return Ok(()); } @@ -479,14 +479,14 @@ impl Query { ) .is_err() { - parameters.nullified.push(path.clone()); + parameters.nullified.push(Path::from_response_slice(path)); *output = Value::Null; } Ok(()) } _ => { - parameters.nullified.push(path.clone()); + parameters.nullified.push(Path::from_response_slice(path)); *output = Value::Null; Ok(()) } @@ -547,13 +547,13 @@ impl Query { } } - fn apply_selection_set( - &self, - selection_set: &[Selection], + fn apply_selection_set<'a: 'b, 'b>( + &'a self, + selection_set: &'a [Selection], parameters: &mut FormatParameters, input: &mut Object, output: &mut Object, - path: &mut Path, + path: &mut Vec>, parent_type: &FieldType, ) -> Result<(), InvalidValue> { // For skip and include, using .unwrap_or is legit here because @@ -596,7 +596,7 @@ impl Query { } } } else { - path.push(PathElement::Key(field_name.as_str().to_string())); + path.push(ResponsePathElement::Key(field_name.as_str())); let res = self.format_value( parameters, field_type, @@ -619,7 +619,7 @@ impl Query { "Cannot return null for non-nullable field {parent_type}.{}", field_name.as_str() ), - path: Some(path.clone()), + path: Some(Path::from_response_slice(path)), ..Error::default() }); @@ -721,13 +721,13 @@ impl Query { Ok(()) } - fn apply_root_selection_set( - &self, - operation: &Operation, + fn apply_root_selection_set<'a: 'b, 'b>( + &'a self, + operation: &'a Operation, parameters: &mut FormatParameters, input: &mut Object, output: &mut Object, - path: &mut Path, + path: &mut Vec>, ) -> Result<(), InvalidValue> { for selection in &operation.selection_set { match selection { @@ -758,7 +758,7 @@ impl Query { let selection_set = selection_set.as_deref().unwrap_or_default(); let output_value = output.entry((*field_name).clone()).or_insert(Value::Null); - path.push(PathElement::Key(field_name_str.to_string())); + path.push(ResponsePathElement::Key(field_name_str)); let res = self.format_value( parameters, field_type, @@ -783,7 +783,7 @@ impl Query { "Cannot return null for non-nullable field {}.{field_name_str}", operation.kind ), - path: Some(path.clone()), + path: Some(Path::from_response_slice(path)), ..Error::default() }); return Err(InvalidValue); From 7afc6d2e5f5c3d0ffd884466a0be1ffc05da0890 Mon Sep 17 00:00:00 2001 From: Geoffroy Couprie Date: Tue, 18 Apr 2023 14:31:54 +0200 Subject: [PATCH 04/11] prevent span attributes from being formatted to write logs (#2890) we do not show span attributes in our logs, but the log formatter still spends some time formatting them to a string, even when there will be no logs written for the trace. This adds the `NullFieldFormatter` that entirely avoids formatting the attributes --- .changesets/fix_geal_null_field_formatter.md | 5 +++++ apollo-router/src/plugins/telemetry/mod.rs | 3 +++ apollo-router/src/plugins/telemetry/reload.rs | 16 ++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 .changesets/fix_geal_null_field_formatter.md diff --git a/.changesets/fix_geal_null_field_formatter.md b/.changesets/fix_geal_null_field_formatter.md new file mode 100644 index 0000000000..33c36c79dc --- /dev/null +++ b/.changesets/fix_geal_null_field_formatter.md @@ -0,0 +1,5 @@ +### prevent span attributes from being formatted to write logs + +we do not show span attributes in our logs, but the log formatter still spends some time formatting them to a string, even when there will be no logs written for the trace. This adds the `NullFieldFormatter` that entirely avoids formatting the attributes + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/2890 \ No newline at end of file diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs index c3f65980bd..7c1b658ead 100644 --- a/apollo-router/src/plugins/telemetry/mod.rs +++ b/apollo-router/src/plugins/telemetry/mod.rs @@ -65,6 +65,7 @@ use self::metrics::AttributesForwardConf; use self::metrics::MetricsAttributesConf; use self::reload::reload_fmt; use self::reload::reload_metrics; +use self::reload::NullFieldFormatter; use self::reload::OPENTELEMETRY_TRACER_HANDLE; use self::tracing::reload::ReloadTracer; use crate::layers::ServiceBuilderExt; @@ -637,6 +638,7 @@ impl Telemetry { .with_target(logging.display_target), filter_metric_events, )) + .fmt_fields(NullFieldFormatter) .boxed(), config::LoggingFormat::Json => tracing_subscriber::fmt::layer() .json() @@ -652,6 +654,7 @@ impl Telemetry { filter_metric_events, ) }) + .fmt_fields(NullFieldFormatter) .map_fmt_fields(|_f| JsonFields::default()) .boxed(), }; diff --git a/apollo-router/src/plugins/telemetry/reload.rs b/apollo-router/src/plugins/telemetry/reload.rs index 8db539a173..1c66ccf4ef 100644 --- a/apollo-router/src/plugins/telemetry/reload.rs +++ b/apollo-router/src/plugins/telemetry/reload.rs @@ -6,6 +6,7 @@ use opentelemetry::sdk::trace::Tracer; use opentelemetry::trace::TracerProvider; use tower::BoxError; use tracing_opentelemetry::OpenTelemetryLayer; +use tracing_subscriber::fmt::FormatFields; use tracing_subscriber::layer::Layer; use tracing_subscriber::layer::Layered; use tracing_subscriber::layer::SubscriberExt; @@ -63,6 +64,7 @@ pub(crate) fn init_telemetry(log_level: &str) -> Result<()> { .with_target(false), filter_metric_events, )) + .fmt_fields(NullFieldFormatter) .boxed() } else { tracing_subscriber::fmt::Layer::new() @@ -76,6 +78,7 @@ pub(crate) fn init_telemetry(log_level: &str) -> Result<()> { filter_metric_events, ) }) + .fmt_fields(NullFieldFormatter) .boxed() }; @@ -134,3 +137,16 @@ pub(super) fn reload_fmt( handle.reload(layer).expect("fmt layer reload must succeed"); } } + +/// prevents span fields from being formatted to a string when writing logs +pub(crate) struct NullFieldFormatter; + +impl<'writer> FormatFields<'writer> for NullFieldFormatter { + fn format_fields( + &self, + _writer: tracing_subscriber::fmt::format::Writer<'writer>, + _fields: R, + ) -> std::fmt::Result { + Ok(()) + } +} From f5eedcf8bcbca69a3f5c961f5a57a2d6f7facd11 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Tue, 18 Apr 2023 15:22:30 +0200 Subject: [PATCH 05/11] Parse `Accept` headers once instead of three times (#2847) This is a small performance improvement. When the `Accept` is not present, the previous code would still traverse the header map three times. --- .../services/layers/content_negociation.rs | 139 +++++++----------- 1 file changed, 53 insertions(+), 86 deletions(-) diff --git a/apollo-router/src/services/layers/content_negociation.rs b/apollo-router/src/services/layers/content_negociation.rs index 5a7972aac5..bd3c418d8e 100644 --- a/apollo-router/src/services/layers/content_negociation.rs +++ b/apollo-router/src/services/layers/content_negociation.rs @@ -70,19 +70,10 @@ where return Ok(ControlFlow::Break(response.into())); } - let accepts_multipart = accepts_multipart(req.router_request.headers()); - let accepts_json = accepts_json(req.router_request.headers()); - let accepts_wildcard = accepts_wildcard(req.router_request.headers()); + let accepts = parse_accept(req.router_request.headers()); - if accepts_wildcard || accepts_multipart || accepts_json { - req.context - .private_entries - .lock() - .insert(ClientRequestAccepts { - wildcard: accepts_wildcard, - multipart: accepts_multipart, - json: accepts_json, - }); + if accepts.wildcard || accepts.multipart || accepts.json { + req.context.private_entries.lock().insert(accepts); Ok(ControlFlow::Continue(req)) } else { @@ -177,75 +168,46 @@ fn content_type_is_json(headers: &HeaderMap) -> bool { }) } -/// Returns true if the headers contain `accept: application/json` or `accept: application/graphql-response+json`, -/// or if there is no `accept` header -fn accepts_json(headers: &HeaderMap) -> bool { - !headers.contains_key(ACCEPT) - || headers.get_all(ACCEPT).iter().any(|value| { - value - .to_str() - .map(|accept_str| { - let mut list = MediaTypeList::new(accept_str); - - list.any(|mime| { - mime.as_ref() - .map(|mime| { - (mime.ty == APPLICATION && mime.subty == JSON) - || (mime.ty == APPLICATION - && mime.subty.as_str() == "graphql-response" - && mime.suffix == Some(JSON)) - }) - .unwrap_or(false) - }) - }) - .unwrap_or(false) - }) -} - -/// Returns true if the headers contain header `accept: */*` -fn accepts_wildcard(headers: &HeaderMap) -> bool { - headers.get_all(ACCEPT).iter().any(|value| { - value - .to_str() - .map(|accept_str| { - let mut list = MediaTypeList::new(accept_str); - - list.any(|mime| { - mime.as_ref() - .map(|mime| (mime.ty == _STAR && mime.subty == _STAR)) - .unwrap_or(false) - }) - }) - .unwrap_or(false) - }) -} - -/// Returns true if the headers contain accept header to enable defer -fn accepts_multipart(headers: &HeaderMap) -> bool { - headers.get_all(ACCEPT).iter().any(|value| { - value - .to_str() - .map(|accept_str| { - let mut list = MediaTypeList::new(accept_str); - - list.any(|mime| { - mime.as_ref() - .map(|mime| { - mime.ty == MULTIPART - && mime.subty == MIXED - && mime.get_param( - mediatype::Name::new(MULTIPART_DEFER_SPEC_PARAMETER) - .expect("valid name"), - ) == Some( - mediatype::Value::new(MULTIPART_DEFER_SPEC_VALUE) - .expect("valid value"), - ) - }) - .unwrap_or(false) - }) - }) - .unwrap_or(false) - }) +// Clippy suggests `for mime in MediaTypeList::new(str).flatten()` but less indentation +// does not seem worth making it invisible that Result is involved. +#[allow(clippy::manual_flatten)] +/// Returns (accepts_json, accepts_wildcard, accepts_multipart) +fn parse_accept(headers: &HeaderMap) -> ClientRequestAccepts { + let mut header_present = false; + let mut accepts = ClientRequestAccepts::default(); + for value in headers.get_all(ACCEPT) { + header_present = true; + if let Ok(str) = value.to_str() { + for result in MediaTypeList::new(str) { + if let Ok(mime) = result { + if !accepts.json + && ((mime.ty == APPLICATION && mime.subty == JSON) + || (mime.ty == APPLICATION + && mime.subty.as_str() == "graphql-response" + && mime.suffix == Some(JSON))) + { + accepts.json = true + } + if !accepts.wildcard && (mime.ty == _STAR && mime.subty == _STAR) { + accepts.wildcard = true + } + if !accepts.multipart && (mime.ty == MULTIPART && mime.subty == MIXED) { + let parameter = mediatype::Name::new(MULTIPART_DEFER_SPEC_PARAMETER) + .expect("valid name"); + let value = + mediatype::Value::new(MULTIPART_DEFER_SPEC_VALUE).expect("valid value"); + if mime.get_param(parameter) == Some(value) { + accepts.multipart = true + } + } + } + } + } + } + if !header_present { + accepts.json = true + } + accepts } #[cfg(test)] @@ -260,17 +222,20 @@ mod tests { HeaderValue::from_static(APPLICATION_JSON.essence_str()), ); default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar")); - assert!(accepts_json(&default_headers)); + let accepts = parse_accept(&default_headers); + assert!(accepts.json); let mut default_headers = HeaderMap::new(); default_headers.insert(ACCEPT, HeaderValue::from_static("*/*")); default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar")); - assert!(accepts_wildcard(&default_headers)); + let accepts = parse_accept(&default_headers); + assert!(accepts.wildcard); let mut default_headers = HeaderMap::new(); // real life browser example default_headers.insert(ACCEPT, HeaderValue::from_static("text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8")); - assert!(accepts_wildcard(&default_headers)); + let accepts = parse_accept(&default_headers); + assert!(accepts.wildcard); let mut default_headers = HeaderMap::new(); default_headers.insert( @@ -278,7 +243,8 @@ mod tests { HeaderValue::from_static(GRAPHQL_JSON_RESPONSE_HEADER_VALUE), ); default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar")); - assert!(accepts_json(&default_headers)); + let accepts = parse_accept(&default_headers); + assert!(accepts.json); let mut default_headers = HeaderMap::new(); default_headers.insert( @@ -289,6 +255,7 @@ mod tests { ACCEPT, HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE), ); - assert!(accepts_multipart(&default_headers)); + let accepts = parse_accept(&default_headers); + assert!(accepts.multipart); } } From 3741cf914a87eea96c48613174b58e3952cc82a6 Mon Sep 17 00:00:00 2001 From: Geoffroy Couprie Date: Thu, 20 Apr 2023 11:25:31 +0200 Subject: [PATCH 06/11] use a parking-lot mutex in Context (#2885) The context requires synchronized access to the busy timer, and precedently we used a futures aware mutex for that, but those are susceptible to contention. This replaces that mutex with a parking-lot synchronous mutex that is much faster. --- .changesets/fix_geal_context_mutex.md | 5 +++++ .../axum_factory/axum_http_server_factory.rs | 2 +- apollo-router/src/context/mod.rs | 19 +++++++++++-------- apollo-router/src/plugins/coprocessor.rs | 16 ++++++++-------- .../src/services/subgraph_service.rs | 10 +++++----- 5 files changed, 30 insertions(+), 22 deletions(-) create mode 100644 .changesets/fix_geal_context_mutex.md diff --git a/.changesets/fix_geal_context_mutex.md b/.changesets/fix_geal_context_mutex.md new file mode 100644 index 0000000000..be40b646a7 --- /dev/null +++ b/.changesets/fix_geal_context_mutex.md @@ -0,0 +1,5 @@ +### use a parking-lot mutex in Context ([Issue #2751](https://github.com/apollographql/router/issues/2751)) + +The context requires synchronized access to the busy timer, and precedently we used a futures aware mutex for that, but those are susceptible to contention. This replaces that mutex with a parking-lot synchronous mutex that is much faster. + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/2885 diff --git a/apollo-router/src/axum_factory/axum_http_server_factory.rs b/apollo-router/src/axum_factory/axum_http_server_factory.rs index 74c0ac1601..7e5b3c4011 100644 --- a/apollo-router/src/axum_factory/axum_http_server_factory.rs +++ b/apollo-router/src/axum_factory/axum_http_server_factory.rs @@ -436,7 +436,7 @@ async fn handle_graphql( let context = request.context.clone(); let res = service.oneshot(request).await; - let dur = context.busy_time().await; + let dur = context.busy_time(); let processing_seconds = dur.as_secs_f64(); tracing::info!(histogram.apollo_router_processing_time = processing_seconds,); diff --git a/apollo-router/src/context/mod.rs b/apollo-router/src/context/mod.rs index 5a1bc7b86b..0705c7e470 100644 --- a/apollo-router/src/context/mod.rs +++ b/apollo-router/src/context/mod.rs @@ -10,7 +10,8 @@ use std::time::Instant; use dashmap::mapref::multiple::RefMulti; use dashmap::mapref::multiple::RefMutMulti; use dashmap::DashMap; -use futures::lock::Mutex; +use derivative::Derivative; +use parking_lot::Mutex; use serde::Deserialize; use serde::Serialize; use tower::BoxError; @@ -34,7 +35,8 @@ pub(crate) type Entries = Arc>; /// [`crate::services::SubgraphResponse`] processing. At such times, /// plugins should restrict themselves to the [`Context::get`] and [`Context::upsert`] /// functions to minimise the possibility of mis-sequenced updates. -#[derive(Clone, Debug, Deserialize, Serialize)] +#[derive(Clone, Deserialize, Serialize, Derivative)] +#[derivative(Debug)] pub struct Context { // Allows adding custom entries to the context. entries: Entries, @@ -48,6 +50,7 @@ pub struct Context { pub(crate) created_at: Instant, #[serde(skip)] + #[derivative(Debug = "ignore")] busy_timer: Arc>, } @@ -193,18 +196,18 @@ impl Context { } /// Notify the busy timer that we're waiting on a network request - pub(crate) async fn enter_active_request(&self) { - self.busy_timer.lock().await.increment_active_requests() + pub(crate) fn enter_active_request(&self) { + self.busy_timer.lock().increment_active_requests() } /// Notify the busy timer that we stopped waiting on a network request - pub(crate) async fn leave_active_request(&self) { - self.busy_timer.lock().await.decrement_active_requests() + pub(crate) fn leave_active_request(&self) { + self.busy_timer.lock().decrement_active_requests() } /// How much time was spent working on the request - pub(crate) async fn busy_time(&self) -> Duration { - self.busy_timer.lock().await.current() + pub(crate) fn busy_time(&self) -> Duration { + self.busy_timer.lock().current() } } diff --git a/apollo-router/src/plugins/coprocessor.rs b/apollo-router/src/plugins/coprocessor.rs index ccb7909575..1c26a6b3be 100644 --- a/apollo-router/src/plugins/coprocessor.rs +++ b/apollo-router/src/plugins/coprocessor.rs @@ -516,9 +516,9 @@ where }; tracing::debug!(?payload, "externalized output"); - request.context.enter_active_request().await; + request.context.enter_active_request(); let co_processor_result = payload.call(http_client, &coprocessor_url).await; - request.context.leave_active_request().await; + request.context.leave_active_request(); tracing::debug!(?co_processor_result, "co-processor returned"); let co_processor_output = co_processor_result?; @@ -642,9 +642,9 @@ where // Second, call our co-processor and get a reply. tracing::debug!(?payload, "externalized output"); - response.context.enter_active_request().await; + response.context.enter_active_request(); let co_processor_result = payload.call(http_client, &coprocessor_url).await; - response.context.leave_active_request().await; + response.context.leave_active_request(); tracing::debug!(?co_processor_result, "co-processor returned"); let co_processor_output = co_processor_result?; @@ -728,9 +728,9 @@ where }; tracing::debug!(?payload, "externalized output"); - request.context.enter_active_request().await; + request.context.enter_active_request(); let co_processor_result = payload.call(http_client, &coprocessor_url).await; - request.context.leave_active_request().await; + request.context.leave_active_request(); tracing::debug!(?co_processor_result, "co-processor returned"); let co_processor_output = co_processor_result?; validate_coprocessor_output(&co_processor_output, PipelineStep::SubgraphRequest)?; @@ -858,9 +858,9 @@ where }; tracing::debug!(?payload, "externalized output"); - response.context.enter_active_request().await; + response.context.enter_active_request(); let co_processor_result = payload.call(http_client, &coprocessor_url).await; - response.context.leave_active_request().await; + response.context.leave_active_request(); tracing::debug!(?co_processor_result, "co-processor returned"); let co_processor_output = co_processor_result?; diff --git a/apollo-router/src/services/subgraph_service.rs b/apollo-router/src/services/subgraph_service.rs index 234b31d6e4..d0c35e84b2 100644 --- a/apollo-router/src/services/subgraph_service.rs +++ b/apollo-router/src/services/subgraph_service.rs @@ -329,13 +329,13 @@ async fn call_http( let cloned_service_name = service_name.clone(); let cloned_context = context.clone(); let (parts, body) = async move { - cloned_context.enter_active_request().await; + cloned_context.enter_active_request(); let response = match client .call(request) .await { Err(err) => { tracing::error!(fetch_error = format!("{err:?}").as_str()); - cloned_context.leave_active_request().await; + cloned_context.leave_active_request(); return Err(FetchError::SubrequestHttpError { status_code: None, @@ -359,7 +359,7 @@ async fn call_http( if !content_type_str.contains(APPLICATION_JSON.essence_str()) && !content_type_str.contains(GRAPHQL_JSON_RESPONSE_HEADER_VALUE) { - cloned_context.leave_active_request().await; + cloned_context.leave_active_request(); return if !parts.status.is_success() { @@ -387,7 +387,7 @@ async fn call_http( .instrument(tracing::debug_span!("aggregate_response_data")) .await { Err(err) => { - cloned_context.leave_active_request().await; + cloned_context.leave_active_request(); tracing::error!(fetch_error = format!("{err:?}").as_str()); @@ -400,7 +400,7 @@ async fn call_http( }, Ok(body) => body, }; - cloned_context.leave_active_request().await; + cloned_context.leave_active_request(); Ok((parts, body)) }.instrument(subgraph_req_span).await?; From ecd5d57fd5afe8fec0a7182f584b71ea58474432 Mon Sep 17 00:00:00 2001 From: Geoffroy Couprie Date: Tue, 25 Apr 2023 16:02:47 +0200 Subject: [PATCH 07/11] Filter spans before sending them to the opentelemetry layer (#2894) The Opentelemetry layer accumulates data from all spans before sending it to the opentelemetry span exporters. This means that sampling decisions are done after a lot of data was already allocated. And that this work is done even if no exporter is set up. This adds a sampling filter around the opentelemetry layer, to do the sampling decision as early as possible, and avoid this work entirely if no exporter is configured --- .changesets/fix_geal_filter_spans.md | 5 ++ apollo-router/src/plugins/telemetry/mod.rs | 72 ++++++++++-------- apollo-router/src/plugins/telemetry/reload.rs | 73 +++++++++++++++---- ...acing_tests__traced_basic_composition.snap | 4 + .../tracing_tests__traced_basic_request.snap | 4 + .../snapshots/tracing_tests__variables.snap | 4 + 6 files changed, 118 insertions(+), 44 deletions(-) create mode 100644 .changesets/fix_geal_filter_spans.md diff --git a/.changesets/fix_geal_filter_spans.md b/.changesets/fix_geal_filter_spans.md new file mode 100644 index 0000000000..b664484860 --- /dev/null +++ b/.changesets/fix_geal_filter_spans.md @@ -0,0 +1,5 @@ +### Filter spans before sending them to the opentelemetry layer + +the sampling configuration in the opentelemetry layer only applies when the span closes, so in the meantime a lot of data is created just to be dropped. This adds a filter than can sample spans before the opentelemetry layer. The sampling decision is done at the root span, and then derived from the parent span in the rest of the trace. + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/2894 \ No newline at end of file diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs index 7c1b658ead..5287dab813 100644 --- a/apollo-router/src/plugins/telemetry/mod.rs +++ b/apollo-router/src/plugins/telemetry/mod.rs @@ -3,6 +3,7 @@ use std::collections::BTreeMap; use std::collections::HashMap; use std::fmt; +use std::sync::atomic::Ordering; use std::sync::Arc; use std::thread; use std::time::Duration; @@ -47,7 +48,6 @@ use tokio::runtime::Handle; use tower::BoxError; use tower::ServiceBuilder; use tower::ServiceExt; -use tracing_opentelemetry::OpenTelemetryLayer; use tracing_opentelemetry::OpenTelemetrySpanExt; use tracing_subscriber::fmt::format::JsonFields; use tracing_subscriber::Layer; @@ -59,15 +59,17 @@ use self::apollo::SingleReport; use self::apollo_exporter::proto; use self::apollo_exporter::Sender; use self::config::Conf; +use self::config::Sampler; use self::formatters::text::TextFormatter; use self::metrics::apollo::studio::SingleTypeStat; use self::metrics::AttributesForwardConf; use self::metrics::MetricsAttributesConf; use self::reload::reload_fmt; use self::reload::reload_metrics; +use self::reload::LayeredTracer; use self::reload::NullFieldFormatter; use self::reload::OPENTELEMETRY_TRACER_HANDLE; -use self::tracing::reload::ReloadTracer; +use self::reload::SPAN_SAMPLING_RATE; use crate::layers::ServiceBuilderExt; use crate::plugin::Plugin; use crate::plugin::PluginInit; @@ -278,16 +280,16 @@ impl Plugin for Telemetry { let expose_trace_id = config.tracing.as_ref().cloned().unwrap_or_default().response_trace_id; if let Ok(response) = &response { + let mut headers: HashMap> = HashMap::new(); if expose_trace_id.enabled { if let Some(header_name) = &expose_trace_id.header_name { - let mut headers: HashMap> = HashMap::new(); if let Some(value) = response.response.headers().get(header_name) { headers.insert(header_name.to_string(), vec![value.to_str().unwrap_or_default().to_string()]); - let response_headers = serde_json::to_string(&headers).unwrap_or_default(); - span.record("apollo_private.http.response_headers",&response_headers); } } } + let response_headers = serde_json::to_string(&headers).unwrap_or_default(); + span.record("apollo_private.http.response_headers",&response_headers); if response.response.status() >= StatusCode::BAD_REQUEST { span.record("otel.status_code", "Error"); @@ -561,15 +563,39 @@ impl Telemetry { config: &config::Conf, ) -> Result { let tracing_config = config.tracing.clone().unwrap_or_default(); - let trace_config = &tracing_config.trace_config.unwrap_or_default(); - let mut builder = - opentelemetry::sdk::trace::TracerProvider::builder().with_config(trace_config.into()); - - builder = setup_tracing(builder, &tracing_config.jaeger, trace_config)?; - builder = setup_tracing(builder, &tracing_config.zipkin, trace_config)?; - builder = setup_tracing(builder, &tracing_config.datadog, trace_config)?; - builder = setup_tracing(builder, &tracing_config.otlp, trace_config)?; - builder = setup_tracing(builder, &config.apollo, trace_config)?; + + let mut trace_config = tracing_config.trace_config.unwrap_or_default(); + + let sampling_rate = if tracing_config.jaeger.is_some() + || tracing_config.zipkin.is_some() + || tracing_config.datadog.is_some() + || tracing_config.otlp.is_some() + || config + .apollo + .as_ref() + .map(|c| c.apollo_key.is_some() && c.apollo_graph_ref.is_some()) + .unwrap_or(false) + { + match trace_config.sampler { + config::SamplerOption::TraceIdRatioBased(rate) => rate, + config::SamplerOption::Always(Sampler::AlwaysOn) => 1.0, + config::SamplerOption::Always(Sampler::AlwaysOff) => 0.0, + } + } else { + 0.0 + }; + + trace_config.sampler = config::SamplerOption::Always(Sampler::AlwaysOn); + SPAN_SAMPLING_RATE.store(f64::to_bits(sampling_rate), Ordering::Relaxed); + + let mut builder = opentelemetry::sdk::trace::TracerProvider::builder() + .with_config((&trace_config).into()); + + builder = setup_tracing(builder, &tracing_config.jaeger, &trace_config)?; + builder = setup_tracing(builder, &tracing_config.zipkin, &trace_config)?; + builder = setup_tracing(builder, &tracing_config.datadog, &trace_config)?; + builder = setup_tracing(builder, &tracing_config.otlp, &trace_config)?; + builder = setup_tracing(builder, &config.apollo, &trace_config)?; // For metrics builder = builder.with_simple_exporter(metrics::span_metrics_exporter::Exporter::default()); @@ -613,21 +639,7 @@ impl Telemetry { Ok(builder) } - #[allow(clippy::type_complexity)] - fn create_fmt_layer( - config: &config::Conf, - ) -> Box< - dyn Layer< - ::tracing_subscriber::layer::Layered< - OpenTelemetryLayer< - ::tracing_subscriber::Registry, - ReloadTracer<::opentelemetry::sdk::trace::Tracer>, - >, - ::tracing_subscriber::Registry, - >, - > + Send - + Sync, - > { + fn create_fmt_layer(config: &config::Conf) -> Box + Send + Sync> { let logging = &config.logging; let fmt = match logging.format { config::LoggingFormat::Pretty => tracing_subscriber::fmt::layer() @@ -1498,7 +1510,7 @@ fn request_ftv1(mut req: SubgraphRequest) -> SubgraphRequest { .private_entries .lock() .contains_key::() - && Span::current().context().span().span_context().is_sampled() + && !Span::current().is_disabled() { req.subgraph_request.headers_mut().insert( "apollo-federation-include-trace", diff --git a/apollo-router/src/plugins/telemetry/reload.rs b/apollo-router/src/plugins/telemetry/reload.rs index 1c66ccf4ef..631b91c28a 100644 --- a/apollo-router/src/plugins/telemetry/reload.rs +++ b/apollo-router/src/plugins/telemetry/reload.rs @@ -1,15 +1,24 @@ +use std::sync::atomic::AtomicU64; +use std::sync::atomic::Ordering; + use anyhow::anyhow; use anyhow::Result; use once_cell::sync::OnceCell; use opentelemetry::metrics::noop::NoopMeterProvider; use opentelemetry::sdk::trace::Tracer; use opentelemetry::trace::TracerProvider; +use rand::thread_rng; +use rand::Rng; use tower::BoxError; +use tracing::Subscriber; use tracing_opentelemetry::OpenTelemetryLayer; +use tracing_subscriber::filter::Filtered; use tracing_subscriber::fmt::FormatFields; +use tracing_subscriber::layer::Filter; use tracing_subscriber::layer::Layer; use tracing_subscriber::layer::Layered; use tracing_subscriber::layer::SubscriberExt; +use tracing_subscriber::registry::LookupSpan; use tracing_subscriber::reload::Handle; use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::EnvFilter; @@ -22,7 +31,10 @@ use crate::plugins::telemetry::metrics; use crate::plugins::telemetry::metrics::layer::MetricsLayer; use crate::plugins::telemetry::tracing::reload::ReloadTracer; -type LayeredTracer = Layered>, Registry>; +pub(super) type LayeredTracer = Layered< + Filtered>, SamplingFilter, Registry>, + Registry, +>; // These handles allow hot tracing of layers. They have complex type definitions because tracing has // generic types in the layer definition. @@ -30,6 +42,12 @@ pub(super) static OPENTELEMETRY_TRACER_HANDLE: OnceCell< ReloadTracer, > = OnceCell::new(); +static FMT_LAYER_HANDLE: OnceCell< + Handle + Send + Sync>, LayeredTracer>, +> = OnceCell::new(); + +pub(super) static SPAN_SAMPLING_RATE: AtomicU64 = AtomicU64::new(0); + #[allow(clippy::type_complexity)] static METRICS_LAYER_HANDLE: OnceCell< Handle< @@ -44,15 +62,13 @@ static METRICS_LAYER_HANDLE: OnceCell< >, > = OnceCell::new(); -static FMT_LAYER_HANDLE: OnceCell< - Handle + Send + Sync>, LayeredTracer>, -> = OnceCell::new(); - pub(crate) fn init_telemetry(log_level: &str) -> Result<()> { let hot_tracer = ReloadTracer::new( opentelemetry::sdk::trace::TracerProvider::default().versioned_tracer("noop", None, None), ); - let opentelemetry_layer = tracing_opentelemetry::layer().with_tracer(hot_tracer.clone()); + let opentelemetry_layer = tracing_opentelemetry::layer() + .with_tracer(hot_tracer.clone()) + .with_filter(SamplingFilter::new()); // We choose json or plain based on tty let fmt = if atty::is(atty::Stream::Stdout) { @@ -125,19 +141,48 @@ pub(super) fn reload_metrics(layer: MetricsLayer) { } } -#[allow(clippy::type_complexity)] -pub(super) fn reload_fmt( - layer: Box< - dyn Layer>, Registry>> - + Send - + Sync, - >, -) { +pub(super) fn reload_fmt(layer: Box + Send + Sync>) { if let Some(handle) = FMT_LAYER_HANDLE.get() { handle.reload(layer).expect("fmt layer reload must succeed"); } } +pub(crate) struct SamplingFilter {} + +impl SamplingFilter { + pub(crate) fn new() -> Self { + Self {} + } + + fn sample(&self) -> bool { + let s: f64 = thread_rng().gen_range(0.0..=1.0); + s <= f64::from_bits(SPAN_SAMPLING_RATE.load(Ordering::Relaxed)) + } +} + +impl Filter for SamplingFilter +where + S: Subscriber + for<'span> LookupSpan<'span>, +{ + fn enabled( + &self, + meta: &tracing::Metadata<'_>, + cx: &tracing_subscriber::layer::Context<'_, S>, + ) -> bool { + let current_span = cx.current_span(); + + // + !meta.is_span() + // this span is enabled if: + || current_span + .id() + // - there's a parent span and it was enabled + .map(|id| cx.span(id).is_some()) + // - there's no parent span (it's the root), so we make the sampling decision + .unwrap_or_else(|| self.sample()) + } +} + /// prevents span fields from being formatted to a string when writing logs pub(crate) struct NullFieldFormatter; diff --git a/apollo-router/tests/snapshots/tracing_tests__traced_basic_composition.snap b/apollo-router/tests/snapshots/tracing_tests__traced_basic_composition.snap index 7b74128302..c91bf0fbb2 100644 --- a/apollo-router/tests/snapshots/tracing_tests__traced_basic_composition.snap +++ b/apollo-router/tests/snapshots/tracing_tests__traced_basic_composition.snap @@ -94,6 +94,10 @@ expression: get_spans() "apollo_private.duration_ns", 0 ], + [ + "apollo_private.http.response_headers", + "{}" + ], [ "otel.status_code", "Ok" diff --git a/apollo-router/tests/snapshots/tracing_tests__traced_basic_request.snap b/apollo-router/tests/snapshots/tracing_tests__traced_basic_request.snap index f3a09de41b..97639545b6 100644 --- a/apollo-router/tests/snapshots/tracing_tests__traced_basic_request.snap +++ b/apollo-router/tests/snapshots/tracing_tests__traced_basic_request.snap @@ -94,6 +94,10 @@ expression: get_spans() "apollo_private.duration_ns", 0 ], + [ + "apollo_private.http.response_headers", + "{}" + ], [ "otel.status_code", "Ok" diff --git a/apollo-router/tests/snapshots/tracing_tests__variables.snap b/apollo-router/tests/snapshots/tracing_tests__variables.snap index fdbf93300e..9028b598e0 100644 --- a/apollo-router/tests/snapshots/tracing_tests__variables.snap +++ b/apollo-router/tests/snapshots/tracing_tests__variables.snap @@ -94,6 +94,10 @@ expression: get_spans() "apollo_private.duration_ns", 0 ], + [ + "apollo_private.http.response_headers", + "{}" + ], [ "otel.status_code", "Error" From 88c48c9a67e8bfc520c3a9448e91dafd603ffa99 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 26 Apr 2023 15:58:26 +0300 Subject: [PATCH 08/11] pre-release prep: v1.16.0-alpha.0 (#3001) This cuts an `1.16.0-alpha.0` of the #2995 PR --- Cargo.lock | 6 ++-- apollo-router-benchmarks/Cargo.toml | 2 +- apollo-router-scaffold/Cargo.toml | 2 +- .../templates/base/Cargo.toml | 2 +- .../templates/base/xtask/Cargo.toml | 2 +- apollo-router/Cargo.toml | 2 +- .../tracing/docker-compose.datadog.yml | 2 +- dockerfiles/tracing/docker-compose.jaeger.yml | 2 +- dockerfiles/tracing/docker-compose.zipkin.yml | 2 +- docs/source/containerization/docker.mdx | 2 +- docs/source/containerization/kubernetes.mdx | 28 +++++++++--------- helm/chart/router/Chart.yaml | 4 +-- helm/chart/router/README.md | 6 ++-- licenses.html | 29 +++++++++++++++++-- scripts/install.sh | 2 +- 15 files changed, 59 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7275eeee95..7bb036b15c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -272,7 +272,7 @@ dependencies = [ [[package]] name = "apollo-router" -version = "1.15.1" +version = "1.16.0-alpha.0" dependencies = [ "access-json", "anyhow", @@ -407,7 +407,7 @@ dependencies = [ [[package]] name = "apollo-router-benchmarks" -version = "1.15.1" +version = "1.16.0-alpha.0" dependencies = [ "apollo-parser 0.4.1", "apollo-router", @@ -423,7 +423,7 @@ dependencies = [ [[package]] name = "apollo-router-scaffold" -version = "1.15.1" +version = "1.16.0-alpha.0" dependencies = [ "anyhow", "cargo-scaffold", diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml index 475f8b202b..eddc85b56c 100644 --- a/apollo-router-benchmarks/Cargo.toml +++ b/apollo-router-benchmarks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-benchmarks" -version = "1.15.1" +version = "1.16.0-alpha.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml index a755cce558..4881b4e46c 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-scaffold" -version = "1.15.1" +version = "1.16.0-alpha.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml index deea381e85..286ae373c8 100644 --- a/apollo-router-scaffold/templates/base/Cargo.toml +++ b/apollo-router-scaffold/templates/base/Cargo.toml @@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" } apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} # Note if you update these dependencies then also update xtask/Cargo.toml -apollo-router = "1.15.1" +apollo-router = "1.16.0-alpha.0" {{/if}} {{/if}} async-trait = "0.1.52" diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml index ec7e5e57e0..9c3def378c 100644 --- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml +++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml @@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" } {{#if branch}} apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} -apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.15.1" } +apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.16.0-alpha.0" } {{/if}} {{/if}} anyhow = "1.0.58" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 90fb975469..3ae7b4f278 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router" -version = "1.15.1" +version = "1.16.0-alpha.0" authors = ["Apollo Graph, Inc. "] repository = "https://github.com/apollographql/router/" documentation = "https://docs.rs/apollo-router" diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml index 66a789a9c7..e3e458cd8e 100644 --- a/dockerfiles/tracing/docker-compose.datadog.yml +++ b/dockerfiles/tracing/docker-compose.datadog.yml @@ -3,7 +3,7 @@ services: apollo-router: container_name: apollo-router - image: ghcr.io/apollographql/router:v1.15.1 + image: ghcr.io/apollographql/router:v1.16.0-alpha.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/datadog.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml index 484daa8af0..452fedc76d 100644 --- a/dockerfiles/tracing/docker-compose.jaeger.yml +++ b/dockerfiles/tracing/docker-compose.jaeger.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router #build: ./router - image: ghcr.io/apollographql/router:v1.15.1 + image: ghcr.io/apollographql/router:v1.16.0-alpha.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/jaeger.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml index 3241fbc7d9..bd74e6751d 100644 --- a/dockerfiles/tracing/docker-compose.zipkin.yml +++ b/dockerfiles/tracing/docker-compose.zipkin.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router build: ./router - image: ghcr.io/apollographql/router:v1.15.1 + image: ghcr.io/apollographql/router:v1.16.0-alpha.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/zipkin.router.yaml:/etc/config/configuration.yaml diff --git a/docs/source/containerization/docker.mdx b/docs/source/containerization/docker.mdx index 404a9523d7..5d2d709e33 100644 --- a/docs/source/containerization/docker.mdx +++ b/docs/source/containerization/docker.mdx @@ -11,7 +11,7 @@ The default behaviour of the router images is suitable for a quickstart or devel Note: The [docker documentation](https://docs.docker.com/engine/reference/run/) for the run command may be helpful when reading through the examples. -Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `` with your chosen version. e.g.: `v1.15.1` +Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `` with your chosen version. e.g.: `v1.16.0-alpha.0` ## Override the configuration diff --git a/docs/source/containerization/kubernetes.mdx b/docs/source/containerization/kubernetes.mdx index 8d606d06ea..6d3d2f8211 100644 --- a/docs/source/containerization/kubernetes.mdx +++ b/docs/source/containerization/kubernetes.mdx @@ -13,7 +13,7 @@ import { Link } from 'gatsby'; [Helm](https://helm.sh) is the package manager for kubernetes. -There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.15.1/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes. +There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.16.0-alpha.0/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes. In both the following examples, we are using helm to install the router: - into namespace "router-deploy" (create namespace if it doesn't exist) @@ -64,10 +64,10 @@ kind: ServiceAccount metadata: name: release-name-router labels: - helm.sh/chart: router-1.15.1 + helm.sh/chart: router-1.16.0-alpha.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.15.1" + app.kubernetes.io/version: "v1.16.0-alpha.0" app.kubernetes.io/managed-by: Helm --- # Source: router/templates/secret.yaml @@ -76,10 +76,10 @@ kind: Secret metadata: name: "release-name-router" labels: - helm.sh/chart: router-1.15.1 + helm.sh/chart: router-1.16.0-alpha.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.15.1" + app.kubernetes.io/version: "v1.16.0-alpha.0" app.kubernetes.io/managed-by: Helm data: managedFederationApiKey: "UkVEQUNURUQ=" @@ -90,10 +90,10 @@ kind: ConfigMap metadata: name: release-name-router labels: - helm.sh/chart: router-1.15.1 + helm.sh/chart: router-1.16.0-alpha.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.15.1" + app.kubernetes.io/version: "v1.16.0-alpha.0" app.kubernetes.io/managed-by: Helm data: configuration.yaml: | @@ -117,10 +117,10 @@ kind: Service metadata: name: release-name-router labels: - helm.sh/chart: router-1.15.1 + helm.sh/chart: router-1.16.0-alpha.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.15.1" + app.kubernetes.io/version: "v1.16.0-alpha.0" app.kubernetes.io/managed-by: Helm spec: type: ClusterIP @@ -143,10 +143,10 @@ kind: Deployment metadata: name: release-name-router labels: - helm.sh/chart: router-1.15.1 + helm.sh/chart: router-1.16.0-alpha.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.15.1" + app.kubernetes.io/version: "v1.16.0-alpha.0" app.kubernetes.io/managed-by: Helm annotations: @@ -172,7 +172,7 @@ spec: - name: router securityContext: {} - image: "ghcr.io/apollographql/router:v1.15.1" + image: "ghcr.io/apollographql/router:v1.16.0-alpha.0" imagePullPolicy: IfNotPresent args: - --hot-reload @@ -223,10 +223,10 @@ kind: Pod metadata: name: "release-name-router-test-connection" labels: - helm.sh/chart: router-1.15.1 + helm.sh/chart: router-1.16.0-alpha.0 app.kubernetes.io/name: router app.kubernetes.io/instance: release-name - app.kubernetes.io/version: "v1.15.1" + app.kubernetes.io/version: "v1.16.0-alpha.0" app.kubernetes.io/managed-by: Helm annotations: "helm.sh/hook": test diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml index ac36c044c6..c6b9c3c59a 100644 --- a/helm/chart/router/Chart.yaml +++ b/helm/chart/router/Chart.yaml @@ -20,10 +20,10 @@ type: application # so it matches the shape of our release process and release automation. # By proxy of that decision, this version uses SemVer 2.0.0, though the prefix # of "v" is not included. -version: 1.15.1 +version: 1.16.0-alpha.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v1.15.1" +appVersion: "v1.16.0-alpha.0" diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md index c5d1358130..bd6fd42b2c 100644 --- a/helm/chart/router/README.md +++ b/helm/chart/router/README.md @@ -2,7 +2,7 @@ [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation -![Version: 1.15.1](https://img.shields.io/badge/Version-1.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.15.1](https://img.shields.io/badge/AppVersion-v1.15.1-informational?style=flat-square) +![Version: 1.16.0-alpha.0](https://img.shields.io/badge/Version-1.16.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.16.0-alpha.0](https://img.shields.io/badge/AppVersion-v1.16.0--alpha.0-informational?style=flat-square) ## Prerequisites @@ -11,7 +11,7 @@ ## Get Repo Info ```console -helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.15.1 +helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.16.0-alpha.0 ``` ## Install Chart @@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.15.1 **Important:** only helm3 is supported ```console -helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.15.1 --values my-values.yaml +helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.16.0-alpha.0 --values my-values.yaml ``` _See [configuration](#configuration) below._ diff --git a/licenses.html b/licenses.html index cf9d6dcbab..0c4db30fb7 100644 --- a/licenses.html +++ b/licenses.html @@ -45,7 +45,7 @@

Third Party Licenses

Overview of licenses:

MIT OR Apache-2.0
+
  • +

    Apache License 2.0

    +

    Used by:

    + +
    The Apache License, Version 2.0 (Apache-2.0)
    +
    +Copyright 2015-2020 the fiat-crypto authors (see the AUTHORS file)
    +
    +Licensed 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.
    +
    +
  • BSD 2-Clause "Simplified" License

    Used by:

    @@ -13525,6 +13549,7 @@

    MIT License

    Used by:

    The MIT License (MIT)
     
    diff --git a/scripts/install.sh b/scripts/install.sh
    index 6ef6e9d7d5..daa0824bc3 100755
    --- a/scripts/install.sh
    +++ b/scripts/install.sh
    @@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/downloa
     
     # Router version defined in apollo-router's Cargo.toml
     # Note: Change this line manually during the release steps.
    -PACKAGE_VERSION="v1.15.1"
    +PACKAGE_VERSION="v1.16.0-alpha.0"
     
     download_binary() {
         downloader --check
    
    From 15e0fa0e680d05716d6551b4a3abcb989d19efe4 Mon Sep 17 00:00:00 2001
    From: Gary Pennington 
    Date: Wed, 3 May 2023 10:57:46 +0100
    Subject: [PATCH 09/11] Cargo configuration should match main.rs (#3028)
    
    The change is specifically targetting linux, not unix like OSs.
    
    Fixes #issue_number
    
    
    
    **Checklist**
    
    Complete the checklist (and note appropriate exceptions) before a final
    PR is raised.
    
    - [x] Changes are compatible[^1]
    - [ ] Documentation[^2] completed
    - [ ] Performance impact assessed and acceptable
    - Tests added and passing[^3]
        - [ ] Unit Tests
        - [ ] Integration Tests
        - [ ] Manual Tests
    
    **Exceptions**
    
    *Note any exceptions here*
    
    **Notes**
    
    [^1]. It may be appropriate to bring upcoming changes to the attention
    of other (impacted) groups. Please endeavour to do this before seeking
    PR approval. The mechanism for doing this will vary considerably, so use
    your judgement as to how and when to do this.
    [^2]. Configuration is an important part of many changes. Where
    applicable please try to document configuration examples.
    [^3]. Tick whichever testing boxes are applicable. If you are adding
    Manual Tests:
    - please document the manual testing (extensively) in the Exceptions.
    - please raise a separate issue to automate the test and label it (or
    ask for it to be labeled) as `manual test`
    ---
     apollo-router/Cargo.toml | 2 ++
     1 file changed, 2 insertions(+)
    
    diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
    index 3ae7b4f278..98ca83a9c9 100644
    --- a/apollo-router/Cargo.toml
    +++ b/apollo-router/Cargo.toml
    @@ -210,6 +210,8 @@ uname = "0.1.1"
     
     [target.'cfg(unix)'.dependencies]
     uname = "0.1.1"
    +
    +[target.'cfg(target_os = "linux")'.dependencies]
     tikv-jemallocator = "0.5"
     
     [dev-dependencies]
    
    From 9e00352cedcddcfec3ce43719648463c990ba4ef Mon Sep 17 00:00:00 2001
    From: Geoffroy Couprie 
    Date: Thu, 11 May 2023 11:57:39 +0200
    Subject: [PATCH 10/11] Explain the FTV1 ratio calculation (#3072)
    
    ---
     apollo-router/src/plugins/telemetry/config.rs | 9 +++++++++
     1 file changed, 9 insertions(+)
    
    diff --git a/apollo-router/src/plugins/telemetry/config.rs b/apollo-router/src/plugins/telemetry/config.rs
    index 17b0a0405a..21bb70387f 100644
    --- a/apollo-router/src/plugins/telemetry/config.rs
    +++ b/apollo-router/src/plugins/telemetry/config.rs
    @@ -611,6 +611,15 @@ impl Conf {
                     (_, SamplerOption::TraceIdRatioBased(ratio)) if ratio == 0.0 => 0.0,
                     (SamplerOption::TraceIdRatioBased(ratio), _) if ratio == 0.0 => 0.0,
                     (_, SamplerOption::Always(Sampler::AlwaysOn)) => 1.0,
    +                // the `field_ratio` should be a ratio of the entire set of requests. But FTV1 would only be reported
    +                // if a trace was generated with the Apollo exporter, which has its own sampling `global_ratio`.
    +                // in telemetry::request_ftv1, we activate FTV1 if the current trace is sampled and depending on
    +                // the ratio returned by this function.
    +                // This means that:
    +                // - field_ratio cannot be larger than global_ratio (see above, we return an error in that case)
    +                // - we have to divide field_ratio by global_ratio
    +                // Example: we want to measure FTV1 on 30% of total requests, but we the Apollo tracer samples at 50%.
    +                // If we measure FTV1 on 60% (0.3 / 0.5) of these sampled requests, that amounts to 30% of the total traffic
                     (
                         SamplerOption::TraceIdRatioBased(global_ratio),
                         SamplerOption::TraceIdRatioBased(field_ratio),
    
    From e914caf38d29c050c95fc7b9fb3b201374755997 Mon Sep 17 00:00:00 2001
    From: Jesse Rosenberger 
    Date: Thu, 11 May 2023 14:52:02 +0300
    Subject: [PATCH 11/11] prep release: v1.19.0-alpha.0 (#3084)
    
    This cuts an `1.19.0-alpha.0` of the
    https://github.com/apollographql/router/pull/2995 PR. This was
    previously released as `1.16.0-alpha.0`, but the `1.16.0-alpha.0` never
    became `1.16.0`. Instead, we've since released new actual releases that
    superceded it. This alpha is the new candidate to become an official
    `1.19.0`, but that is still not certain until further validations are
    complete.
    ---
     Cargo.lock                                    |    6 +-
     apollo-router-benchmarks/Cargo.toml           |    2 +-
     apollo-router-scaffold/Cargo.toml             |    2 +-
     .../templates/base/Cargo.toml                 |    2 +-
     .../templates/base/xtask/Cargo.toml           |    2 +-
     apollo-router/Cargo.toml                      |    2 +-
     .../tracing/docker-compose.datadog.yml        |    2 +-
     dockerfiles/tracing/docker-compose.jaeger.yml |    2 +-
     dockerfiles/tracing/docker-compose.zipkin.yml |    2 +-
     docs/source/containerization/docker.mdx       |    2 +-
     docs/source/containerization/kubernetes.mdx   |   28 +-
     helm/chart/router/Chart.yaml                  |    4 +-
     helm/chart/router/README.md                   |    6 +-
     licenses.html                                 | 3210 ++++++++---------
     scripts/install.sh                            |    2 +-
     15 files changed, 1637 insertions(+), 1637 deletions(-)
    
    diff --git a/Cargo.lock b/Cargo.lock
    index c445c1f04c..e45249a594 100644
    --- a/Cargo.lock
    +++ b/Cargo.lock
    @@ -272,7 +272,7 @@ dependencies = [
     
     [[package]]
     name = "apollo-router"
    -version = "1.18.0"
    +version = "1.19.0-alpha.0"
     dependencies = [
      "access-json",
      "anyhow",
    @@ -410,7 +410,7 @@ dependencies = [
     
     [[package]]
     name = "apollo-router-benchmarks"
    -version = "1.18.0"
    +version = "1.19.0-alpha.0"
     dependencies = [
      "apollo-parser 0.4.1",
      "apollo-router",
    @@ -426,7 +426,7 @@ dependencies = [
     
     [[package]]
     name = "apollo-router-scaffold"
    -version = "1.18.0"
    +version = "1.19.0-alpha.0"
     dependencies = [
      "anyhow",
      "cargo-scaffold",
    diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
    index 1d52466e83..dccee50a1b 100644
    --- a/apollo-router-benchmarks/Cargo.toml
    +++ b/apollo-router-benchmarks/Cargo.toml
    @@ -1,6 +1,6 @@
     [package]
     name = "apollo-router-benchmarks"
    -version = "1.18.0"
    +version = "1.19.0-alpha.0"
     authors = ["Apollo Graph, Inc. "]
     edition = "2021"
     license = "Elastic-2.0"
    diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
    index 6d6c51e509..619141fb45 100644
    --- a/apollo-router-scaffold/Cargo.toml
    +++ b/apollo-router-scaffold/Cargo.toml
    @@ -1,6 +1,6 @@
     [package]
     name = "apollo-router-scaffold"
    -version = "1.18.0"
    +version = "1.19.0-alpha.0"
     authors = ["Apollo Graph, Inc. "]
     edition = "2021"
     license = "Elastic-2.0"
    diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml
    index 989e4fa61f..2801dc08a9 100644
    --- a/apollo-router-scaffold/templates/base/Cargo.toml
    +++ b/apollo-router-scaffold/templates/base/Cargo.toml
    @@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" }
     apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
     {{else}}
     # Note if you update these dependencies then also update xtask/Cargo.toml
    -apollo-router = "1.18.0"
    +apollo-router = "1.19.0-alpha.0"
     {{/if}}
     {{/if}}
     async-trait = "0.1.52"
    diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
    index 2dd1d7f416..68f8851e31 100644
    --- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml
    +++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
    @@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" }
     {{#if branch}}
     apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
     {{else}}
    -apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.18.0" }
    +apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.19.0-alpha.0" }
     {{/if}}
     {{/if}}
     anyhow = "1.0.58"
    diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
    index 640adcc388..fe528889b5 100644
    --- a/apollo-router/Cargo.toml
    +++ b/apollo-router/Cargo.toml
    @@ -1,6 +1,6 @@
     [package]
     name = "apollo-router"
    -version = "1.18.0"
    +version = "1.19.0-alpha.0"
     authors = ["Apollo Graph, Inc. "]
     repository = "https://github.com/apollographql/router/"
     documentation = "https://docs.rs/apollo-router"
    diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml
    index 275ff3ebbb..2ffe476c0a 100644
    --- a/dockerfiles/tracing/docker-compose.datadog.yml
    +++ b/dockerfiles/tracing/docker-compose.datadog.yml
    @@ -3,7 +3,7 @@ services:
     
       apollo-router:
         container_name: apollo-router
    -    image: ghcr.io/apollographql/router:v1.18.0
    +    image: ghcr.io/apollographql/router:v1.19.0-alpha.0
         volumes:
           - ./supergraph.graphql:/etc/config/supergraph.graphql
           - ./router/datadog.router.yaml:/etc/config/configuration.yaml
    diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml
    index 6c2e3ab03f..56112dd928 100644
    --- a/dockerfiles/tracing/docker-compose.jaeger.yml
    +++ b/dockerfiles/tracing/docker-compose.jaeger.yml
    @@ -4,7 +4,7 @@ services:
       apollo-router:
         container_name: apollo-router
         #build: ./router
    -    image: ghcr.io/apollographql/router:v1.18.0
    +    image: ghcr.io/apollographql/router:v1.19.0-alpha.0
         volumes:
           - ./supergraph.graphql:/etc/config/supergraph.graphql
           - ./router/jaeger.router.yaml:/etc/config/configuration.yaml
    diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml
    index f92417cea1..00ef271ca1 100644
    --- a/dockerfiles/tracing/docker-compose.zipkin.yml
    +++ b/dockerfiles/tracing/docker-compose.zipkin.yml
    @@ -4,7 +4,7 @@ services:
       apollo-router:
         container_name: apollo-router
         build: ./router
    -    image: ghcr.io/apollographql/router:v1.18.0
    +    image: ghcr.io/apollographql/router:v1.19.0-alpha.0
         volumes:
           - ./supergraph.graphql:/etc/config/supergraph.graphql
           - ./router/zipkin.router.yaml:/etc/config/configuration.yaml
    diff --git a/docs/source/containerization/docker.mdx b/docs/source/containerization/docker.mdx
    index 72eafad396..ec9bafbc19 100644
    --- a/docs/source/containerization/docker.mdx
    +++ b/docs/source/containerization/docker.mdx
    @@ -11,7 +11,7 @@ The default behaviour of the router images is suitable for a quickstart or devel
     
     Note: The [docker documentation](https://docs.docker.com/engine/reference/run/) for the run command may be helpful when reading through the examples.
     
    -Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `` with your chosen version. e.g.: `v1.18.0`
    +Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `` with your chosen version. e.g.: `v1.19.0-alpha.0`
     
     ## Override the configuration
     
    diff --git a/docs/source/containerization/kubernetes.mdx b/docs/source/containerization/kubernetes.mdx
    index ab6609d412..24ec221922 100644
    --- a/docs/source/containerization/kubernetes.mdx
    +++ b/docs/source/containerization/kubernetes.mdx
    @@ -13,7 +13,7 @@ import { Link } from 'gatsby';
     
     [Helm](https://helm.sh) is the package manager for kubernetes.
     
    -There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.18.0/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes.
    +There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.19.0-alpha.0/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes.
     
     In both the following examples, we are using helm to install the router:
      - into namespace "router-deploy" (create namespace if it doesn't exist)
    @@ -64,10 +64,10 @@ kind: ServiceAccount
     metadata:
       name: release-name-router
       labels:
    -    helm.sh/chart: router-1.18.0
    +    helm.sh/chart: router-1.19.0-alpha.0
         app.kubernetes.io/name: router
         app.kubernetes.io/instance: release-name
    -    app.kubernetes.io/version: "v1.18.0"
    +    app.kubernetes.io/version: "v1.19.0-alpha.0"
         app.kubernetes.io/managed-by: Helm
     ---
     # Source: router/templates/secret.yaml
    @@ -76,10 +76,10 @@ kind: Secret
     metadata:
       name: "release-name-router"
       labels:
    -    helm.sh/chart: router-1.18.0
    +    helm.sh/chart: router-1.19.0-alpha.0
         app.kubernetes.io/name: router
         app.kubernetes.io/instance: release-name
    -    app.kubernetes.io/version: "v1.18.0"
    +    app.kubernetes.io/version: "v1.19.0-alpha.0"
         app.kubernetes.io/managed-by: Helm
     data:
       managedFederationApiKey: "UkVEQUNURUQ="
    @@ -90,10 +90,10 @@ kind: ConfigMap
     metadata:
       name: release-name-router
       labels:
    -    helm.sh/chart: router-1.18.0
    +    helm.sh/chart: router-1.19.0-alpha.0
         app.kubernetes.io/name: router
         app.kubernetes.io/instance: release-name
    -    app.kubernetes.io/version: "v1.18.0"
    +    app.kubernetes.io/version: "v1.19.0-alpha.0"
         app.kubernetes.io/managed-by: Helm
     data:
       configuration.yaml: |
    @@ -117,10 +117,10 @@ kind: Service
     metadata:
       name: release-name-router
       labels:
    -    helm.sh/chart: router-1.18.0
    +    helm.sh/chart: router-1.19.0-alpha.0
         app.kubernetes.io/name: router
         app.kubernetes.io/instance: release-name
    -    app.kubernetes.io/version: "v1.18.0"
    +    app.kubernetes.io/version: "v1.19.0-alpha.0"
         app.kubernetes.io/managed-by: Helm
     spec:
       type: ClusterIP
    @@ -143,10 +143,10 @@ kind: Deployment
     metadata:
       name: release-name-router
       labels:
    -    helm.sh/chart: router-1.18.0
    +    helm.sh/chart: router-1.19.0-alpha.0
         app.kubernetes.io/name: router
         app.kubernetes.io/instance: release-name
    -    app.kubernetes.io/version: "v1.18.0"
    +    app.kubernetes.io/version: "v1.19.0-alpha.0"
         app.kubernetes.io/managed-by: Helm
       
       annotations:
    @@ -172,7 +172,7 @@ spec:
             - name: router
               securityContext:
                 {}
    -          image: "ghcr.io/apollographql/router:v1.18.0"
    +          image: "ghcr.io/apollographql/router:v1.19.0-alpha.0"
               imagePullPolicy: IfNotPresent
               args:
                 - --hot-reload
    @@ -223,10 +223,10 @@ kind: Pod
     metadata:
       name: "release-name-router-test-connection"
       labels:
    -    helm.sh/chart: router-1.18.0
    +    helm.sh/chart: router-1.19.0-alpha.0
         app.kubernetes.io/name: router
         app.kubernetes.io/instance: release-name
    -    app.kubernetes.io/version: "v1.18.0"
    +    app.kubernetes.io/version: "v1.19.0-alpha.0"
         app.kubernetes.io/managed-by: Helm
       annotations:
         "helm.sh/hook": test
    diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml
    index c98e921c35..016c5e22d8 100644
    --- a/helm/chart/router/Chart.yaml
    +++ b/helm/chart/router/Chart.yaml
    @@ -20,10 +20,10 @@ type: application
     # so it matches the shape of our release process and release automation.
     # By proxy of that decision, this version uses SemVer 2.0.0, though the prefix
     # of "v" is not included.
    -version: 1.18.0
    +version: 1.19.0-alpha.0
     
     # This is the version number of the application being deployed. This version number should be
     # incremented each time you make changes to the application. Versions are not expected to
     # follow Semantic Versioning. They should reflect the version the application is using.
     # It is recommended to use it with quotes.
    -appVersion: "v1.18.0"
    +appVersion: "v1.19.0-alpha.0"
    diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md
    index d808b28aed..27dde89449 100644
    --- a/helm/chart/router/README.md
    +++ b/helm/chart/router/README.md
    @@ -2,7 +2,7 @@
     
     [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation
     
    -![Version: 1.18.0](https://img.shields.io/badge/Version-1.18.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.18.0](https://img.shields.io/badge/AppVersion-v1.18.0-informational?style=flat-square)
    +![Version: 1.19.0-alpha.0](https://img.shields.io/badge/Version-1.19.0--alpha.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.19.0-alpha.0](https://img.shields.io/badge/AppVersion-v1.19.0--alpha.0-informational?style=flat-square)
     
     ## Prerequisites
     
    @@ -11,7 +11,7 @@
     ## Get Repo Info
     
     ```console
    -helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.18.0
    +helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.19.0-alpha.0
     ```
     
     ## Install Chart
    @@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.18.0
     **Important:** only helm3 is supported
     
     ```console
    -helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.18.0 --values my-values.yaml
    +helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.19.0-alpha.0 --values my-values.yaml
     ```
     
     _See [configuration](#configuration) below._
    diff --git a/licenses.html b/licenses.html
    index cf3b4c07b7..9f673ea53b 100644
    --- a/licenses.html
    +++ b/licenses.html
    @@ -684,208 +684,208 @@ 

    Used by:

    -
    -                                 Apache License
    -                           Version 2.0, January 2004
    -                        http://www.apache.org/licenses/
    -
    -   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -   1. Definitions.
    -
    -      "License" shall mean the terms and conditions for use, reproduction,
    -      and distribution as defined by Sections 1 through 9 of this document.
    -
    -      "Licensor" shall mean the copyright owner or entity authorized by
    -      the copyright owner that is granting the License.
    -
    -      "Legal Entity" shall mean the union of the acting entity and all
    -      other entities that control, are controlled by, or are under common
    -      control with that entity. For the purposes of this definition,
    -      "control" means (i) the power, direct or indirect, to cause the
    -      direction or management of such entity, whether by contract or
    -      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -      outstanding shares, or (iii) beneficial ownership of such entity.
    -
    -      "You" (or "Your") shall mean an individual or Legal Entity
    -      exercising permissions granted by this License.
    -
    -      "Source" form shall mean the preferred form for making modifications,
    -      including but not limited to software source code, documentation
    -      source, and configuration files.
    -
    -      "Object" form shall mean any form resulting from mechanical
    -      transformation or translation of a Source form, including but
    -      not limited to compiled object code, generated documentation,
    -      and conversions to other media types.
    -
    -      "Work" shall mean the work of authorship, whether in Source or
    -      Object form, made available under the License, as indicated by a
    -      copyright notice that is included in or attached to the work
    -      (an example is provided in the Appendix below).
    -
    -      "Derivative Works" shall mean any work, whether in Source or Object
    -      form, that is based on (or derived from) the Work and for which the
    -      editorial revisions, annotations, elaborations, or other modifications
    -      represent, as a whole, an original work of authorship. For the purposes
    -      of this License, Derivative Works shall not include works that remain
    -      separable from, or merely link (or bind by name) to the interfaces of,
    -      the Work and Derivative Works thereof.
    -
    -      "Contribution" shall mean any work of authorship, including
    -      the original version of the Work and any modifications or additions
    -      to that Work or Derivative Works thereof, that is intentionally
    -      submitted to Licensor for inclusion in the Work by the copyright owner
    -      or by an individual or Legal Entity authorized to submit on behalf of
    -      the copyright owner. For the purposes of this definition, "submitted"
    -      means any form of electronic, verbal, or written communication sent
    -      to the Licensor or its representatives, including but not limited to
    -      communication on electronic mailing lists, source code control systems,
    -      and issue tracking systems that are managed by, or on behalf of, the
    -      Licensor for the purpose of discussing and improving the Work, but
    -      excluding communication that is conspicuously marked or otherwise
    -      designated in writing by the copyright owner as "Not a Contribution."
    -
    -      "Contributor" shall mean Licensor and any individual or Legal Entity
    -      on behalf of whom a Contribution has been received by Licensor and
    -      subsequently incorporated within the Work.
    -
    -   2. Grant of Copyright License. Subject to the terms and conditions of
    -      this License, each Contributor hereby grants to You a perpetual,
    -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -      copyright license to reproduce, prepare Derivative Works of,
    -      publicly display, publicly perform, sublicense, and distribute the
    -      Work and such Derivative Works in Source or Object form.
    -
    -   3. Grant of Patent License. Subject to the terms and conditions of
    -      this License, each Contributor hereby grants to You a perpetual,
    -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -      (except as stated in this section) patent license to make, have made,
    -      use, offer to sell, sell, import, and otherwise transfer the Work,
    -      where such license applies only to those patent claims licensable
    -      by such Contributor that are necessarily infringed by their
    -      Contribution(s) alone or by combination of their Contribution(s)
    -      with the Work to which such Contribution(s) was submitted. If You
    -      institute patent litigation against any entity (including a
    -      cross-claim or counterclaim in a lawsuit) alleging that the Work
    -      or a Contribution incorporated within the Work constitutes direct
    -      or contributory patent infringement, then any patent licenses
    -      granted to You under this License for that Work shall terminate
    -      as of the date such litigation is filed.
    -
    -   4. Redistribution. You may reproduce and distribute copies of the
    -      Work or Derivative Works thereof in any medium, with or without
    -      modifications, and in Source or Object form, provided that You
    -      meet the following conditions:
    -
    -      (a) You must give any other recipients of the Work or
    -          Derivative Works a copy of this License; and
    -
    -      (b) You must cause any modified files to carry prominent notices
    -          stating that You changed the files; and
    -
    -      (c) You must retain, in the Source form of any Derivative Works
    -          that You distribute, all copyright, patent, trademark, and
    -          attribution notices from the Source form of the Work,
    -          excluding those notices that do not pertain to any part of
    -          the Derivative Works; and
    -
    -      (d) If the Work includes a "NOTICE" text file as part of its
    -          distribution, then any Derivative Works that You distribute must
    -          include a readable copy of the attribution notices contained
    -          within such NOTICE file, excluding those notices that do not
    -          pertain to any part of the Derivative Works, in at least one
    -          of the following places: within a NOTICE text file distributed
    -          as part of the Derivative Works; within the Source form or
    -          documentation, if provided along with the Derivative Works; or,
    -          within a display generated by the Derivative Works, if and
    -          wherever such third-party notices normally appear. The contents
    -          of the NOTICE file are for informational purposes only and
    -          do not modify the License. You may add Your own attribution
    -          notices within Derivative Works that You distribute, alongside
    -          or as an addendum to the NOTICE text from the Work, provided
    -          that such additional attribution notices cannot be construed
    -          as modifying the License.
    -
    -      You may add Your own copyright statement to Your modifications and
    -      may provide additional or different license terms and conditions
    -      for use, reproduction, or distribution of Your modifications, or
    -      for any such Derivative Works as a whole, provided Your use,
    -      reproduction, and distribution of the Work otherwise complies with
    -      the conditions stated in this License.
    -
    -   5. Submission of Contributions. Unless You explicitly state otherwise,
    -      any Contribution intentionally submitted for inclusion in the Work
    -      by You to the Licensor shall be under the terms and conditions of
    -      this License, without any additional terms or conditions.
    -      Notwithstanding the above, nothing herein shall supersede or modify
    -      the terms of any separate license agreement you may have executed
    -      with Licensor regarding such Contributions.
    -
    -   6. Trademarks. This License does not grant permission to use the trade
    -      names, trademarks, service marks, or product names of the Licensor,
    -      except as required for reasonable and customary use in describing the
    -      origin of the Work and reproducing the content of the NOTICE file.
    -
    -   7. Disclaimer of Warranty. Unless required by applicable law or
    -      agreed to in writing, Licensor provides the Work (and each
    -      Contributor provides its Contributions) on an "AS IS" BASIS,
    -      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    -      implied, including, without limitation, any warranties or conditions
    -      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    -      PARTICULAR PURPOSE. You are solely responsible for determining the
    -      appropriateness of using or redistributing the Work and assume any
    -      risks associated with Your exercise of permissions under this License.
    -
    -   8. Limitation of Liability. In no event and under no legal theory,
    -      whether in tort (including negligence), contract, or otherwise,
    -      unless required by applicable law (such as deliberate and grossly
    -      negligent acts) or agreed to in writing, shall any Contributor be
    -      liable to You for damages, including any direct, indirect, special,
    -      incidental, or consequential damages of any character arising as a
    -      result of this License or out of the use or inability to use the
    -      Work (including but not limited to damages for loss of goodwill,
    -      work stoppage, computer failure or malfunction, or any and all
    -      other commercial damages or losses), even if such Contributor
    -      has been advised of the possibility of such damages.
    -
    -   9. Accepting Warranty or Additional Liability. While redistributing
    -      the Work or Derivative Works thereof, You may choose to offer,
    -      and charge a fee for, acceptance of support, warranty, indemnity,
    -      or other liability obligations and/or rights consistent with this
    -      License. However, in accepting such obligations, You may act only
    -      on Your own behalf and on Your sole responsibility, not on behalf
    -      of any other Contributor, and only if You agree to indemnify,
    -      defend, and hold each Contributor harmless for any liability
    -      incurred by, or claims asserted against, such Contributor by reason
    -      of your accepting any such warranty or additional liability.
    -
    -   END OF TERMS AND CONDITIONS
    -
    -   APPENDIX: How to apply the Apache License to your work.
    -
    -      To apply the Apache License to your work, attach the following
    -      boilerplate notice, with the fields enclosed by brackets "[]"
    -      replaced with your own identifying information. (Don't include
    -      the brackets!)  The text should be enclosed in the appropriate
    -      comment syntax for the file format. We also recommend that a
    -      file or class name and description of purpose be included on the
    -      same "printed page" as the copyright notice for easier
    -      identification within third-party archives.
    -
    -   Copyright [yyyy] [name of copyright owner]
    -
    -   Licensed 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.
    +                
    +                                 Apache License
    +                           Version 2.0, January 2004
    +                        http://www.apache.org/licenses/
    +
    +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +   1. Definitions.
    +
    +      "License" shall mean the terms and conditions for use, reproduction,
    +      and distribution as defined by Sections 1 through 9 of this document.
    +
    +      "Licensor" shall mean the copyright owner or entity authorized by
    +      the copyright owner that is granting the License.
    +
    +      "Legal Entity" shall mean the union of the acting entity and all
    +      other entities that control, are controlled by, or are under common
    +      control with that entity. For the purposes of this definition,
    +      "control" means (i) the power, direct or indirect, to cause the
    +      direction or management of such entity, whether by contract or
    +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +      outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +      "You" (or "Your") shall mean an individual or Legal Entity
    +      exercising permissions granted by this License.
    +
    +      "Source" form shall mean the preferred form for making modifications,
    +      including but not limited to software source code, documentation
    +      source, and configuration files.
    +
    +      "Object" form shall mean any form resulting from mechanical
    +      transformation or translation of a Source form, including but
    +      not limited to compiled object code, generated documentation,
    +      and conversions to other media types.
    +
    +      "Work" shall mean the work of authorship, whether in Source or
    +      Object form, made available under the License, as indicated by a
    +      copyright notice that is included in or attached to the work
    +      (an example is provided in the Appendix below).
    +
    +      "Derivative Works" shall mean any work, whether in Source or Object
    +      form, that is based on (or derived from) the Work and for which the
    +      editorial revisions, annotations, elaborations, or other modifications
    +      represent, as a whole, an original work of authorship. For the purposes
    +      of this License, Derivative Works shall not include works that remain
    +      separable from, or merely link (or bind by name) to the interfaces of,
    +      the Work and Derivative Works thereof.
    +
    +      "Contribution" shall mean any work of authorship, including
    +      the original version of the Work and any modifications or additions
    +      to that Work or Derivative Works thereof, that is intentionally
    +      submitted to Licensor for inclusion in the Work by the copyright owner
    +      or by an individual or Legal Entity authorized to submit on behalf of
    +      the copyright owner. For the purposes of this definition, "submitted"
    +      means any form of electronic, verbal, or written communication sent
    +      to the Licensor or its representatives, including but not limited to
    +      communication on electronic mailing lists, source code control systems,
    +      and issue tracking systems that are managed by, or on behalf of, the
    +      Licensor for the purpose of discussing and improving the Work, but
    +      excluding communication that is conspicuously marked or otherwise
    +      designated in writing by the copyright owner as "Not a Contribution."
    +
    +      "Contributor" shall mean Licensor and any individual or Legal Entity
    +      on behalf of whom a Contribution has been received by Licensor and
    +      subsequently incorporated within the Work.
    +
    +   2. Grant of Copyright License. Subject to the terms and conditions of
    +      this License, each Contributor hereby grants to You a perpetual,
    +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +      copyright license to reproduce, prepare Derivative Works of,
    +      publicly display, publicly perform, sublicense, and distribute the
    +      Work and such Derivative Works in Source or Object form.
    +
    +   3. Grant of Patent License. Subject to the terms and conditions of
    +      this License, each Contributor hereby grants to You a perpetual,
    +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +      (except as stated in this section) patent license to make, have made,
    +      use, offer to sell, sell, import, and otherwise transfer the Work,
    +      where such license applies only to those patent claims licensable
    +      by such Contributor that are necessarily infringed by their
    +      Contribution(s) alone or by combination of their Contribution(s)
    +      with the Work to which such Contribution(s) was submitted. If You
    +      institute patent litigation against any entity (including a
    +      cross-claim or counterclaim in a lawsuit) alleging that the Work
    +      or a Contribution incorporated within the Work constitutes direct
    +      or contributory patent infringement, then any patent licenses
    +      granted to You under this License for that Work shall terminate
    +      as of the date such litigation is filed.
    +
    +   4. Redistribution. You may reproduce and distribute copies of the
    +      Work or Derivative Works thereof in any medium, with or without
    +      modifications, and in Source or Object form, provided that You
    +      meet the following conditions:
    +
    +      (a) You must give any other recipients of the Work or
    +          Derivative Works a copy of this License; and
    +
    +      (b) You must cause any modified files to carry prominent notices
    +          stating that You changed the files; and
    +
    +      (c) You must retain, in the Source form of any Derivative Works
    +          that You distribute, all copyright, patent, trademark, and
    +          attribution notices from the Source form of the Work,
    +          excluding those notices that do not pertain to any part of
    +          the Derivative Works; and
    +
    +      (d) If the Work includes a "NOTICE" text file as part of its
    +          distribution, then any Derivative Works that You distribute must
    +          include a readable copy of the attribution notices contained
    +          within such NOTICE file, excluding those notices that do not
    +          pertain to any part of the Derivative Works, in at least one
    +          of the following places: within a NOTICE text file distributed
    +          as part of the Derivative Works; within the Source form or
    +          documentation, if provided along with the Derivative Works; or,
    +          within a display generated by the Derivative Works, if and
    +          wherever such third-party notices normally appear. The contents
    +          of the NOTICE file are for informational purposes only and
    +          do not modify the License. You may add Your own attribution
    +          notices within Derivative Works that You distribute, alongside
    +          or as an addendum to the NOTICE text from the Work, provided
    +          that such additional attribution notices cannot be construed
    +          as modifying the License.
    +
    +      You may add Your own copyright statement to Your modifications and
    +      may provide additional or different license terms and conditions
    +      for use, reproduction, or distribution of Your modifications, or
    +      for any such Derivative Works as a whole, provided Your use,
    +      reproduction, and distribution of the Work otherwise complies with
    +      the conditions stated in this License.
    +
    +   5. Submission of Contributions. Unless You explicitly state otherwise,
    +      any Contribution intentionally submitted for inclusion in the Work
    +      by You to the Licensor shall be under the terms and conditions of
    +      this License, without any additional terms or conditions.
    +      Notwithstanding the above, nothing herein shall supersede or modify
    +      the terms of any separate license agreement you may have executed
    +      with Licensor regarding such Contributions.
    +
    +   6. Trademarks. This License does not grant permission to use the trade
    +      names, trademarks, service marks, or product names of the Licensor,
    +      except as required for reasonable and customary use in describing the
    +      origin of the Work and reproducing the content of the NOTICE file.
    +
    +   7. Disclaimer of Warranty. Unless required by applicable law or
    +      agreed to in writing, Licensor provides the Work (and each
    +      Contributor provides its Contributions) on an "AS IS" BASIS,
    +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +      implied, including, without limitation, any warranties or conditions
    +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +      PARTICULAR PURPOSE. You are solely responsible for determining the
    +      appropriateness of using or redistributing the Work and assume any
    +      risks associated with Your exercise of permissions under this License.
    +
    +   8. Limitation of Liability. In no event and under no legal theory,
    +      whether in tort (including negligence), contract, or otherwise,
    +      unless required by applicable law (such as deliberate and grossly
    +      negligent acts) or agreed to in writing, shall any Contributor be
    +      liable to You for damages, including any direct, indirect, special,
    +      incidental, or consequential damages of any character arising as a
    +      result of this License or out of the use or inability to use the
    +      Work (including but not limited to damages for loss of goodwill,
    +      work stoppage, computer failure or malfunction, or any and all
    +      other commercial damages or losses), even if such Contributor
    +      has been advised of the possibility of such damages.
    +
    +   9. Accepting Warranty or Additional Liability. While redistributing
    +      the Work or Derivative Works thereof, You may choose to offer,
    +      and charge a fee for, acceptance of support, warranty, indemnity,
    +      or other liability obligations and/or rights consistent with this
    +      License. However, in accepting such obligations, You may act only
    +      on Your own behalf and on Your sole responsibility, not on behalf
    +      of any other Contributor, and only if You agree to indemnify,
    +      defend, and hold each Contributor harmless for any liability
    +      incurred by, or claims asserted against, such Contributor by reason
    +      of your accepting any such warranty or additional liability.
    +
    +   END OF TERMS AND CONDITIONS
    +
    +   APPENDIX: How to apply the Apache License to your work.
    +
    +      To apply the Apache License to your work, attach the following
    +      boilerplate notice, with the fields enclosed by brackets "[]"
    +      replaced with your own identifying information. (Don't include
    +      the brackets!)  The text should be enclosed in the appropriate
    +      comment syntax for the file format. We also recommend that a
    +      file or class name and description of purpose be included on the
    +      same "printed page" as the copyright notice for easier
    +      identification within third-party archives.
    +
    +   Copyright [yyyy] [name of copyright owner]
    +
    +   Licensed 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.
     
  • @@ -2598,218 +2598,218 @@

    Used by:

    -
                                     Apache License
    -                           Version 2.0, January 2004
    -                        http://www.apache.org/licenses/
    +                
                                     Apache License
    +                           Version 2.0, January 2004
    +                        http://www.apache.org/licenses/
    +
    +   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +   1. Definitions.
    +
    +      "License" shall mean the terms and conditions for use, reproduction,
    +      and distribution as defined by Sections 1 through 9 of this document.
    +
    +      "Licensor" shall mean the copyright owner or entity authorized by
    +      the copyright owner that is granting the License.
    +
    +      "Legal Entity" shall mean the union of the acting entity and all
    +      other entities that control, are controlled by, or are under common
    +      control with that entity. For the purposes of this definition,
    +      "control" means (i) the power, direct or indirect, to cause the
    +      direction or management of such entity, whether by contract or
    +      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +      outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +      "You" (or "Your") shall mean an individual or Legal Entity
    +      exercising permissions granted by this License.
    +
    +      "Source" form shall mean the preferred form for making modifications,
    +      including but not limited to software source code, documentation
    +      source, and configuration files.
    +
    +      "Object" form shall mean any form resulting from mechanical
    +      transformation or translation of a Source form, including but
    +      not limited to compiled object code, generated documentation,
    +      and conversions to other media types.
    +
    +      "Work" shall mean the work of authorship, whether in Source or
    +      Object form, made available under the License, as indicated by a
    +      copyright notice that is included in or attached to the work
    +      (an example is provided in the Appendix below).
    +
    +      "Derivative Works" shall mean any work, whether in Source or Object
    +      form, that is based on (or derived from) the Work and for which the
    +      editorial revisions, annotations, elaborations, or other modifications
    +      represent, as a whole, an original work of authorship. For the purposes
    +      of this License, Derivative Works shall not include works that remain
    +      separable from, or merely link (or bind by name) to the interfaces of,
    +      the Work and Derivative Works thereof.
    +
    +      "Contribution" shall mean any work of authorship, including
    +      the original version of the Work and any modifications or additions
    +      to that Work or Derivative Works thereof, that is intentionally
    +      submitted to Licensor for inclusion in the Work by the copyright owner
    +      or by an individual or Legal Entity authorized to submit on behalf of
    +      the copyright owner. For the purposes of this definition, "submitted"
    +      means any form of electronic, verbal, or written communication sent
    +      to the Licensor or its representatives, including but not limited to
    +      communication on electronic mailing lists, source code control systems,
    +      and issue tracking systems that are managed by, or on behalf of, the
    +      Licensor for the purpose of discussing and improving the Work, but
    +      excluding communication that is conspicuously marked or otherwise
    +      designated in writing by the copyright owner as "Not a Contribution."
    +
    +      "Contributor" shall mean Licensor and any individual or Legal Entity
    +      on behalf of whom a Contribution has been received by Licensor and
    +      subsequently incorporated within the Work.
    +
    +   2. Grant of Copyright License. Subject to the terms and conditions of
    +      this License, each Contributor hereby grants to You a perpetual,
    +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +      copyright license to reproduce, prepare Derivative Works of,
    +      publicly display, publicly perform, sublicense, and distribute the
    +      Work and such Derivative Works in Source or Object form.
    +
    +   3. Grant of Patent License. Subject to the terms and conditions of
    +      this License, each Contributor hereby grants to You a perpetual,
    +      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +      (except as stated in this section) patent license to make, have made,
    +      use, offer to sell, sell, import, and otherwise transfer the Work,
    +      where such license applies only to those patent claims licensable
    +      by such Contributor that are necessarily infringed by their
    +      Contribution(s) alone or by combination of their Contribution(s)
    +      with the Work to which such Contribution(s) was submitted. If You
    +      institute patent litigation against any entity (including a
    +      cross-claim or counterclaim in a lawsuit) alleging that the Work
    +      or a Contribution incorporated within the Work constitutes direct
    +      or contributory patent infringement, then any patent licenses
    +      granted to You under this License for that Work shall terminate
    +      as of the date such litigation is filed.
    +
    +   4. Redistribution. You may reproduce and distribute copies of the
    +      Work or Derivative Works thereof in any medium, with or without
    +      modifications, and in Source or Object form, provided that You
    +      meet the following conditions:
    +
    +      (a) You must give any other recipients of the Work or
    +          Derivative Works a copy of this License; and
    +
    +      (b) You must cause any modified files to carry prominent notices
    +          stating that You changed the files; and
    +
    +      (c) You must retain, in the Source form of any Derivative Works
    +          that You distribute, all copyright, patent, trademark, and
    +          attribution notices from the Source form of the Work,
    +          excluding those notices that do not pertain to any part of
    +          the Derivative Works; and
    +
    +      (d) If the Work includes a "NOTICE" text file as part of its
    +          distribution, then any Derivative Works that You distribute must
    +          include a readable copy of the attribution notices contained
    +          within such NOTICE file, excluding those notices that do not
    +          pertain to any part of the Derivative Works, in at least one
    +          of the following places: within a NOTICE text file distributed
    +          as part of the Derivative Works; within the Source form or
    +          documentation, if provided along with the Derivative Works; or,
    +          within a display generated by the Derivative Works, if and
    +          wherever such third-party notices normally appear. The contents
    +          of the NOTICE file are for informational purposes only and
    +          do not modify the License. You may add Your own attribution
    +          notices within Derivative Works that You distribute, alongside
    +          or as an addendum to the NOTICE text from the Work, provided
    +          that such additional attribution notices cannot be construed
    +          as modifying the License.
    +
    +      You may add Your own copyright statement to Your modifications and
    +      may provide additional or different license terms and conditions
    +      for use, reproduction, or distribution of Your modifications, or
    +      for any such Derivative Works as a whole, provided Your use,
    +      reproduction, and distribution of the Work otherwise complies with
    +      the conditions stated in this License.
    +
    +   5. Submission of Contributions. Unless You explicitly state otherwise,
    +      any Contribution intentionally submitted for inclusion in the Work
    +      by You to the Licensor shall be under the terms and conditions of
    +      this License, without any additional terms or conditions.
    +      Notwithstanding the above, nothing herein shall supersede or modify
    +      the terms of any separate license agreement you may have executed
    +      with Licensor regarding such Contributions.
    +
    +   6. Trademarks. This License does not grant permission to use the trade
    +      names, trademarks, service marks, or product names of the Licensor,
    +      except as required for reasonable and customary use in describing the
    +      origin of the Work and reproducing the content of the NOTICE file.
    +
    +   7. Disclaimer of Warranty. Unless required by applicable law or
    +      agreed to in writing, Licensor provides the Work (and each
    +      Contributor provides its Contributions) on an "AS IS" BASIS,
    +      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +      implied, including, without limitation, any warranties or conditions
    +      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +      PARTICULAR PURPOSE. You are solely responsible for determining the
    +      appropriateness of using or redistributing the Work and assume any
    +      risks associated with Your exercise of permissions under this License.
    +
    +   8. Limitation of Liability. In no event and under no legal theory,
    +      whether in tort (including negligence), contract, or otherwise,
    +      unless required by applicable law (such as deliberate and grossly
    +      negligent acts) or agreed to in writing, shall any Contributor be
    +      liable to You for damages, including any direct, indirect, special,
    +      incidental, or consequential damages of any character arising as a
    +      result of this License or out of the use or inability to use the
    +      Work (including but not limited to damages for loss of goodwill,
    +      work stoppage, computer failure or malfunction, or any and all
    +      other commercial damages or losses), even if such Contributor
    +      has been advised of the possibility of such damages.
    +
    +   9. Accepting Warranty or Additional Liability. While redistributing
    +      the Work or Derivative Works thereof, You may choose to offer,
    +      and charge a fee for, acceptance of support, warranty, indemnity,
    +      or other liability obligations and/or rights consistent with this
    +      License. However, in accepting such obligations, You may act only
    +      on Your own behalf and on Your sole responsibility, not on behalf
    +      of any other Contributor, and only if You agree to indemnify,
    +      defend, and hold each Contributor harmless for any liability
    +      incurred by, or claims asserted against, such Contributor by reason
    +      of your accepting any such warranty or additional liability.
    +
    +   END OF TERMS AND CONDITIONS
    +
    +
  • +
  • +

    Apache License 2.0

    +

    Used by:

    + +
                                   Apache License
    +                         Version 2.0, January 2004
    +                      http://www.apache.org/licenses/
     
    -   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    -   1. Definitions.
    +1. Definitions.
     
    -      "License" shall mean the terms and conditions for use, reproduction,
    -      and distribution as defined by Sections 1 through 9 of this document.
    +  "License" shall mean the terms and conditions for use, reproduction,
    +  and distribution as defined by Sections 1 through 9 of this document.
     
    -      "Licensor" shall mean the copyright owner or entity authorized by
    -      the copyright owner that is granting the License.
    +  "Licensor" shall mean the copyright owner or entity authorized by
    +  the copyright owner that is granting the License.
     
    -      "Legal Entity" shall mean the union of the acting entity and all
    -      other entities that control, are controlled by, or are under common
    -      control with that entity. For the purposes of this definition,
    -      "control" means (i) the power, direct or indirect, to cause the
    -      direction or management of such entity, whether by contract or
    -      otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -      outstanding shares, or (iii) beneficial ownership of such entity.
    +  "Legal Entity" shall mean the union of the acting entity and all
    +  other entities that control, are controlled by, or are under common
    +  control with that entity. For the purposes of this definition,
    +  "control" means (i) the power, direct or indirect, to cause the
    +  direction or management of such entity, whether by contract or
    +  otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +  outstanding shares, or (iii) beneficial ownership of such entity.
     
    -      "You" (or "Your") shall mean an individual or Legal Entity
    -      exercising permissions granted by this License.
    +  "You" (or "Your") shall mean an individual or Legal Entity
    +  exercising permissions granted by this License.
     
    -      "Source" form shall mean the preferred form for making modifications,
    -      including but not limited to software source code, documentation
    -      source, and configuration files.
    -
    -      "Object" form shall mean any form resulting from mechanical
    -      transformation or translation of a Source form, including but
    -      not limited to compiled object code, generated documentation,
    -      and conversions to other media types.
    -
    -      "Work" shall mean the work of authorship, whether in Source or
    -      Object form, made available under the License, as indicated by a
    -      copyright notice that is included in or attached to the work
    -      (an example is provided in the Appendix below).
    -
    -      "Derivative Works" shall mean any work, whether in Source or Object
    -      form, that is based on (or derived from) the Work and for which the
    -      editorial revisions, annotations, elaborations, or other modifications
    -      represent, as a whole, an original work of authorship. For the purposes
    -      of this License, Derivative Works shall not include works that remain
    -      separable from, or merely link (or bind by name) to the interfaces of,
    -      the Work and Derivative Works thereof.
    -
    -      "Contribution" shall mean any work of authorship, including
    -      the original version of the Work and any modifications or additions
    -      to that Work or Derivative Works thereof, that is intentionally
    -      submitted to Licensor for inclusion in the Work by the copyright owner
    -      or by an individual or Legal Entity authorized to submit on behalf of
    -      the copyright owner. For the purposes of this definition, "submitted"
    -      means any form of electronic, verbal, or written communication sent
    -      to the Licensor or its representatives, including but not limited to
    -      communication on electronic mailing lists, source code control systems,
    -      and issue tracking systems that are managed by, or on behalf of, the
    -      Licensor for the purpose of discussing and improving the Work, but
    -      excluding communication that is conspicuously marked or otherwise
    -      designated in writing by the copyright owner as "Not a Contribution."
    -
    -      "Contributor" shall mean Licensor and any individual or Legal Entity
    -      on behalf of whom a Contribution has been received by Licensor and
    -      subsequently incorporated within the Work.
    -
    -   2. Grant of Copyright License. Subject to the terms and conditions of
    -      this License, each Contributor hereby grants to You a perpetual,
    -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -      copyright license to reproduce, prepare Derivative Works of,
    -      publicly display, publicly perform, sublicense, and distribute the
    -      Work and such Derivative Works in Source or Object form.
    -
    -   3. Grant of Patent License. Subject to the terms and conditions of
    -      this License, each Contributor hereby grants to You a perpetual,
    -      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -      (except as stated in this section) patent license to make, have made,
    -      use, offer to sell, sell, import, and otherwise transfer the Work,
    -      where such license applies only to those patent claims licensable
    -      by such Contributor that are necessarily infringed by their
    -      Contribution(s) alone or by combination of their Contribution(s)
    -      with the Work to which such Contribution(s) was submitted. If You
    -      institute patent litigation against any entity (including a
    -      cross-claim or counterclaim in a lawsuit) alleging that the Work
    -      or a Contribution incorporated within the Work constitutes direct
    -      or contributory patent infringement, then any patent licenses
    -      granted to You under this License for that Work shall terminate
    -      as of the date such litigation is filed.
    -
    -   4. Redistribution. You may reproduce and distribute copies of the
    -      Work or Derivative Works thereof in any medium, with or without
    -      modifications, and in Source or Object form, provided that You
    -      meet the following conditions:
    -
    -      (a) You must give any other recipients of the Work or
    -          Derivative Works a copy of this License; and
    -
    -      (b) You must cause any modified files to carry prominent notices
    -          stating that You changed the files; and
    -
    -      (c) You must retain, in the Source form of any Derivative Works
    -          that You distribute, all copyright, patent, trademark, and
    -          attribution notices from the Source form of the Work,
    -          excluding those notices that do not pertain to any part of
    -          the Derivative Works; and
    -
    -      (d) If the Work includes a "NOTICE" text file as part of its
    -          distribution, then any Derivative Works that You distribute must
    -          include a readable copy of the attribution notices contained
    -          within such NOTICE file, excluding those notices that do not
    -          pertain to any part of the Derivative Works, in at least one
    -          of the following places: within a NOTICE text file distributed
    -          as part of the Derivative Works; within the Source form or
    -          documentation, if provided along with the Derivative Works; or,
    -          within a display generated by the Derivative Works, if and
    -          wherever such third-party notices normally appear. The contents
    -          of the NOTICE file are for informational purposes only and
    -          do not modify the License. You may add Your own attribution
    -          notices within Derivative Works that You distribute, alongside
    -          or as an addendum to the NOTICE text from the Work, provided
    -          that such additional attribution notices cannot be construed
    -          as modifying the License.
    -
    -      You may add Your own copyright statement to Your modifications and
    -      may provide additional or different license terms and conditions
    -      for use, reproduction, or distribution of Your modifications, or
    -      for any such Derivative Works as a whole, provided Your use,
    -      reproduction, and distribution of the Work otherwise complies with
    -      the conditions stated in this License.
    -
    -   5. Submission of Contributions. Unless You explicitly state otherwise,
    -      any Contribution intentionally submitted for inclusion in the Work
    -      by You to the Licensor shall be under the terms and conditions of
    -      this License, without any additional terms or conditions.
    -      Notwithstanding the above, nothing herein shall supersede or modify
    -      the terms of any separate license agreement you may have executed
    -      with Licensor regarding such Contributions.
    -
    -   6. Trademarks. This License does not grant permission to use the trade
    -      names, trademarks, service marks, or product names of the Licensor,
    -      except as required for reasonable and customary use in describing the
    -      origin of the Work and reproducing the content of the NOTICE file.
    -
    -   7. Disclaimer of Warranty. Unless required by applicable law or
    -      agreed to in writing, Licensor provides the Work (and each
    -      Contributor provides its Contributions) on an "AS IS" BASIS,
    -      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    -      implied, including, without limitation, any warranties or conditions
    -      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    -      PARTICULAR PURPOSE. You are solely responsible for determining the
    -      appropriateness of using or redistributing the Work and assume any
    -      risks associated with Your exercise of permissions under this License.
    -
    -   8. Limitation of Liability. In no event and under no legal theory,
    -      whether in tort (including negligence), contract, or otherwise,
    -      unless required by applicable law (such as deliberate and grossly
    -      negligent acts) or agreed to in writing, shall any Contributor be
    -      liable to You for damages, including any direct, indirect, special,
    -      incidental, or consequential damages of any character arising as a
    -      result of this License or out of the use or inability to use the
    -      Work (including but not limited to damages for loss of goodwill,
    -      work stoppage, computer failure or malfunction, or any and all
    -      other commercial damages or losses), even if such Contributor
    -      has been advised of the possibility of such damages.
    -
    -   9. Accepting Warranty or Additional Liability. While redistributing
    -      the Work or Derivative Works thereof, You may choose to offer,
    -      and charge a fee for, acceptance of support, warranty, indemnity,
    -      or other liability obligations and/or rights consistent with this
    -      License. However, in accepting such obligations, You may act only
    -      on Your own behalf and on Your sole responsibility, not on behalf
    -      of any other Contributor, and only if You agree to indemnify,
    -      defend, and hold each Contributor harmless for any liability
    -      incurred by, or claims asserted against, such Contributor by reason
    -      of your accepting any such warranty or additional liability.
    -
    -   END OF TERMS AND CONDITIONS
    -
    -
  • -
  • -

    Apache License 2.0

    -

    Used by:

    - -
                                   Apache License
    -                         Version 2.0, January 2004
    -                      http://www.apache.org/licenses/
    -
    -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -1. Definitions.
    -
    -  "License" shall mean the terms and conditions for use, reproduction,
    -  and distribution as defined by Sections 1 through 9 of this document.
    -
    -  "Licensor" shall mean the copyright owner or entity authorized by
    -  the copyright owner that is granting the License.
    -
    -  "Legal Entity" shall mean the union of the acting entity and all
    -  other entities that control, are controlled by, or are under common
    -  control with that entity. For the purposes of this definition,
    -  "control" means (i) the power, direct or indirect, to cause the
    -  direction or management of such entity, whether by contract or
    -  otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -  outstanding shares, or (iii) beneficial ownership of such entity.
    -
    -  "You" (or "Your") shall mean an individual or Legal Entity
    -  exercising permissions granted by this License.
    -
    -  "Source" form shall mean the preferred form for making modifications,
    -  including but not limited to software source code, documentation
    -  source, and configuration files.
    +  "Source" form shall mean the preferred form for making modifications,
    +  including but not limited to software source code, documentation
    +  source, and configuration files.
     
       "Object" form shall mean any form resulting from mechanical
       transformation or translation of a Source form, including but
    @@ -7369,808 +7369,7 @@ 

    Used by:

                                  Apache License
                             Version 2.0, January 2004
    -                     http://www.apache.org/licenses/
    -
    -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -1. Definitions.
    -
    -   "License" shall mean the terms and conditions for use, reproduction,
    -   and distribution as defined by Sections 1 through 9 of this document.
    -
    -   "Licensor" shall mean the copyright owner or entity authorized by
    -   the copyright owner that is granting the License.
    -
    -   "Legal Entity" shall mean the union of the acting entity and all
    -   other entities that control, are controlled by, or are under common
    -   control with that entity. For the purposes of this definition,
    -   "control" means (i) the power, direct or indirect, to cause the
    -   direction or management of such entity, whether by contract or
    -   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -   outstanding shares, or (iii) beneficial ownership of such entity.
    -
    -   "You" (or "Your") shall mean an individual or Legal Entity
    -   exercising permissions granted by this License.
    -
    -   "Source" form shall mean the preferred form for making modifications,
    -   including but not limited to software source code, documentation
    -   source, and configuration files.
    -
    -   "Object" form shall mean any form resulting from mechanical
    -   transformation or translation of a Source form, including but
    -   not limited to compiled object code, generated documentation,
    -   and conversions to other media types.
    -
    -   "Work" shall mean the work of authorship, whether in Source or
    -   Object form, made available under the License, as indicated by a
    -   copyright notice that is included in or attached to the work
    -   (an example is provided in the Appendix below).
    -
    -   "Derivative Works" shall mean any work, whether in Source or Object
    -   form, that is based on (or derived from) the Work and for which the
    -   editorial revisions, annotations, elaborations, or other modifications
    -   represent, as a whole, an original work of authorship. For the purposes
    -   of this License, Derivative Works shall not include works that remain
    -   separable from, or merely link (or bind by name) to the interfaces of,
    -   the Work and Derivative Works thereof.
    -
    -   "Contribution" shall mean any work of authorship, including
    -   the original version of the Work and any modifications or additions
    -   to that Work or Derivative Works thereof, that is intentionally
    -   submitted to Licensor for inclusion in the Work by the copyright owner
    -   or by an individual or Legal Entity authorized to submit on behalf of
    -   the copyright owner. For the purposes of this definition, "submitted"
    -   means any form of electronic, verbal, or written communication sent
    -   to the Licensor or its representatives, including but not limited to
    -   communication on electronic mailing lists, source code control systems,
    -   and issue tracking systems that are managed by, or on behalf of, the
    -   Licensor for the purpose of discussing and improving the Work, but
    -   excluding communication that is conspicuously marked or otherwise
    -   designated in writing by the copyright owner as "Not a Contribution."
    -
    -   "Contributor" shall mean Licensor and any individual or Legal Entity
    -   on behalf of whom a Contribution has been received by Licensor and
    -   subsequently incorporated within the Work.
    -
    -2. Grant of Copyright License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   copyright license to reproduce, prepare Derivative Works of,
    -   publicly display, publicly perform, sublicense, and distribute the
    -   Work and such Derivative Works in Source or Object form.
    -
    -3. Grant of Patent License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   (except as stated in this section) patent license to make, have made,
    -   use, offer to sell, sell, import, and otherwise transfer the Work,
    -   where such license applies only to those patent claims licensable
    -   by such Contributor that are necessarily infringed by their
    -   Contribution(s) alone or by combination of their Contribution(s)
    -   with the Work to which such Contribution(s) was submitted. If You
    -   institute patent litigation against any entity (including a
    -   cross-claim or counterclaim in a lawsuit) alleging that the Work
    -   or a Contribution incorporated within the Work constitutes direct
    -   or contributory patent infringement, then any patent licenses
    -   granted to You under this License for that Work shall terminate
    -   as of the date such litigation is filed.
    -
    -4. Redistribution. You may reproduce and distribute copies of the
    -   Work or Derivative Works thereof in any medium, with or without
    -   modifications, and in Source or Object form, provided that You
    -   meet the following conditions:
    -
    -   (a) You must give any other recipients of the Work or
    -       Derivative Works a copy of this License; and
    -
    -   (b) You must cause any modified files to carry prominent notices
    -       stating that You changed the files; and
    -
    -   (c) You must retain, in the Source form of any Derivative Works
    -       that You distribute, all copyright, patent, trademark, and
    -       attribution notices from the Source form of the Work,
    -       excluding those notices that do not pertain to any part of
    -       the Derivative Works; and
    -
    -   (d) If the Work includes a "NOTICE" text file as part of its
    -       distribution, then any Derivative Works that You distribute must
    -       include a readable copy of the attribution notices contained
    -       within such NOTICE file, excluding those notices that do not
    -       pertain to any part of the Derivative Works, in at least one
    -       of the following places: within a NOTICE text file distributed
    -       as part of the Derivative Works; within the Source form or
    -       documentation, if provided along with the Derivative Works; or,
    -       within a display generated by the Derivative Works, if and
    -       wherever such third-party notices normally appear. The contents
    -       of the NOTICE file are for informational purposes only and
    -       do not modify the License. You may add Your own attribution
    -       notices within Derivative Works that You distribute, alongside
    -       or as an addendum to the NOTICE text from the Work, provided
    -       that such additional attribution notices cannot be construed
    -       as modifying the License.
    -
    -   You may add Your own copyright statement to Your modifications and
    -   may provide additional or different license terms and conditions
    -   for use, reproduction, or distribution of Your modifications, or
    -   for any such Derivative Works as a whole, provided Your use,
    -   reproduction, and distribution of the Work otherwise complies with
    -   the conditions stated in this License.
    -
    -5. Submission of Contributions. Unless You explicitly state otherwise,
    -   any Contribution intentionally submitted for inclusion in the Work
    -   by You to the Licensor shall be under the terms and conditions of
    -   this License, without any additional terms or conditions.
    -   Notwithstanding the above, nothing herein shall supersede or modify
    -   the terms of any separate license agreement you may have executed
    -   with Licensor regarding such Contributions.
    -
    -6. Trademarks. This License does not grant permission to use the trade
    -   names, trademarks, service marks, or product names of the Licensor,
    -   except as required for reasonable and customary use in describing the
    -   origin of the Work and reproducing the content of the NOTICE file.
    -
    -7. Disclaimer of Warranty. Unless required by applicable law or
    -   agreed to in writing, Licensor provides the Work (and each
    -   Contributor provides its Contributions) on an "AS IS" BASIS,
    -   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    -   implied, including, without limitation, any warranties or conditions
    -   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    -   PARTICULAR PURPOSE. You are solely responsible for determining the
    -   appropriateness of using or redistributing the Work and assume any
    -   risks associated with Your exercise of permissions under this License.
    -
    -8. Limitation of Liability. In no event and under no legal theory,
    -   whether in tort (including negligence), contract, or otherwise,
    -   unless required by applicable law (such as deliberate and grossly
    -   negligent acts) or agreed to in writing, shall any Contributor be
    -   liable to You for damages, including any direct, indirect, special,
    -   incidental, or consequential damages of any character arising as a
    -   result of this License or out of the use or inability to use the
    -   Work (including but not limited to damages for loss of goodwill,
    -   work stoppage, computer failure or malfunction, or any and all
    -   other commercial damages or losses), even if such Contributor
    -   has been advised of the possibility of such damages.
    -
    -9. Accepting Warranty or Additional Liability. While redistributing
    -   the Work or Derivative Works thereof, You may choose to offer,
    -   and charge a fee for, acceptance of support, warranty, indemnity,
    -   or other liability obligations and/or rights consistent with this
    -   License. However, in accepting such obligations, You may act only
    -   on Your own behalf and on Your sole responsibility, not on behalf
    -   of any other Contributor, and only if You agree to indemnify,
    -   defend, and hold each Contributor harmless for any liability
    -   incurred by, or claims asserted against, such Contributor by reason
    -   of your accepting any such warranty or additional liability.
    -
    -END OF TERMS AND CONDITIONS
    -
    -APPENDIX: How to apply the Apache License to your work.
    -
    -   To apply the Apache License to your work, attach the following
    -   boilerplate notice, with the fields enclosed by brackets "[]"
    -   replaced with your own identifying information. (Don't include
    -   the brackets!)  The text should be enclosed in the appropriate
    -   comment syntax for the file format. We also recommend that a
    -   file or class name and description of purpose be included on the
    -   same "printed page" as the copyright notice for easier
    -   identification within third-party archives.
    -
    -Copyright [yyyy] [name of copyright owner]
    -
    -Licensed 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.
    -
    -
  • -
  • -

    Apache License 2.0

    -

    Used by:

    - -
                                  Apache License
    -                        Version 2.0, January 2004
    -                     http://www.apache.org/licenses/
    -
    -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -1. Definitions.
    -
    -   "License" shall mean the terms and conditions for use, reproduction,
    -   and distribution as defined by Sections 1 through 9 of this document.
    -
    -   "Licensor" shall mean the copyright owner or entity authorized by
    -   the copyright owner that is granting the License.
    -
    -   "Legal Entity" shall mean the union of the acting entity and all
    -   other entities that control, are controlled by, or are under common
    -   control with that entity. For the purposes of this definition,
    -   "control" means (i) the power, direct or indirect, to cause the
    -   direction or management of such entity, whether by contract or
    -   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -   outstanding shares, or (iii) beneficial ownership of such entity.
    -
    -   "You" (or "Your") shall mean an individual or Legal Entity
    -   exercising permissions granted by this License.
    -
    -   "Source" form shall mean the preferred form for making modifications,
    -   including but not limited to software source code, documentation
    -   source, and configuration files.
    -
    -   "Object" form shall mean any form resulting from mechanical
    -   transformation or translation of a Source form, including but
    -   not limited to compiled object code, generated documentation,
    -   and conversions to other media types.
    -
    -   "Work" shall mean the work of authorship, whether in Source or
    -   Object form, made available under the License, as indicated by a
    -   copyright notice that is included in or attached to the work
    -   (an example is provided in the Appendix below).
    -
    -   "Derivative Works" shall mean any work, whether in Source or Object
    -   form, that is based on (or derived from) the Work and for which the
    -   editorial revisions, annotations, elaborations, or other modifications
    -   represent, as a whole, an original work of authorship. For the purposes
    -   of this License, Derivative Works shall not include works that remain
    -   separable from, or merely link (or bind by name) to the interfaces of,
    -   the Work and Derivative Works thereof.
    -
    -   "Contribution" shall mean any work of authorship, including
    -   the original version of the Work and any modifications or additions
    -   to that Work or Derivative Works thereof, that is intentionally
    -   submitted to Licensor for inclusion in the Work by the copyright owner
    -   or by an individual or Legal Entity authorized to submit on behalf of
    -   the copyright owner. For the purposes of this definition, "submitted"
    -   means any form of electronic, verbal, or written communication sent
    -   to the Licensor or its representatives, including but not limited to
    -   communication on electronic mailing lists, source code control systems,
    -   and issue tracking systems that are managed by, or on behalf of, the
    -   Licensor for the purpose of discussing and improving the Work, but
    -   excluding communication that is conspicuously marked or otherwise
    -   designated in writing by the copyright owner as "Not a Contribution."
    -
    -   "Contributor" shall mean Licensor and any individual or Legal Entity
    -   on behalf of whom a Contribution has been received by Licensor and
    -   subsequently incorporated within the Work.
    -
    -2. Grant of Copyright License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   copyright license to reproduce, prepare Derivative Works of,
    -   publicly display, publicly perform, sublicense, and distribute the
    -   Work and such Derivative Works in Source or Object form.
    -
    -3. Grant of Patent License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   (except as stated in this section) patent license to make, have made,
    -   use, offer to sell, sell, import, and otherwise transfer the Work,
    -   where such license applies only to those patent claims licensable
    -   by such Contributor that are necessarily infringed by their
    -   Contribution(s) alone or by combination of their Contribution(s)
    -   with the Work to which such Contribution(s) was submitted. If You
    -   institute patent litigation against any entity (including a
    -   cross-claim or counterclaim in a lawsuit) alleging that the Work
    -   or a Contribution incorporated within the Work constitutes direct
    -   or contributory patent infringement, then any patent licenses
    -   granted to You under this License for that Work shall terminate
    -   as of the date such litigation is filed.
    -
    -4. Redistribution. You may reproduce and distribute copies of the
    -   Work or Derivative Works thereof in any medium, with or without
    -   modifications, and in Source or Object form, provided that You
    -   meet the following conditions:
    -
    -   (a) You must give any other recipients of the Work or
    -       Derivative Works a copy of this License; and
    -
    -   (b) You must cause any modified files to carry prominent notices
    -       stating that You changed the files; and
    -
    -   (c) You must retain, in the Source form of any Derivative Works
    -       that You distribute, all copyright, patent, trademark, and
    -       attribution notices from the Source form of the Work,
    -       excluding those notices that do not pertain to any part of
    -       the Derivative Works; and
    -
    -   (d) If the Work includes a "NOTICE" text file as part of its
    -       distribution, then any Derivative Works that You distribute must
    -       include a readable copy of the attribution notices contained
    -       within such NOTICE file, excluding those notices that do not
    -       pertain to any part of the Derivative Works, in at least one
    -       of the following places: within a NOTICE text file distributed
    -       as part of the Derivative Works; within the Source form or
    -       documentation, if provided along with the Derivative Works; or,
    -       within a display generated by the Derivative Works, if and
    -       wherever such third-party notices normally appear. The contents
    -       of the NOTICE file are for informational purposes only and
    -       do not modify the License. You may add Your own attribution
    -       notices within Derivative Works that You distribute, alongside
    -       or as an addendum to the NOTICE text from the Work, provided
    -       that such additional attribution notices cannot be construed
    -       as modifying the License.
    -
    -   You may add Your own copyright statement to Your modifications and
    -   may provide additional or different license terms and conditions
    -   for use, reproduction, or distribution of Your modifications, or
    -   for any such Derivative Works as a whole, provided Your use,
    -   reproduction, and distribution of the Work otherwise complies with
    -   the conditions stated in this License.
    -
    -5. Submission of Contributions. Unless You explicitly state otherwise,
    -   any Contribution intentionally submitted for inclusion in the Work
    -   by You to the Licensor shall be under the terms and conditions of
    -   this License, without any additional terms or conditions.
    -   Notwithstanding the above, nothing herein shall supersede or modify
    -   the terms of any separate license agreement you may have executed
    -   with Licensor regarding such Contributions.
    -
    -6. Trademarks. This License does not grant permission to use the trade
    -   names, trademarks, service marks, or product names of the Licensor,
    -   except as required for reasonable and customary use in describing the
    -   origin of the Work and reproducing the content of the NOTICE file.
    -
    -7. Disclaimer of Warranty. Unless required by applicable law or
    -   agreed to in writing, Licensor provides the Work (and each
    -   Contributor provides its Contributions) on an "AS IS" BASIS,
    -   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    -   implied, including, without limitation, any warranties or conditions
    -   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    -   PARTICULAR PURPOSE. You are solely responsible for determining the
    -   appropriateness of using or redistributing the Work and assume any
    -   risks associated with Your exercise of permissions under this License.
    -
    -8. Limitation of Liability. In no event and under no legal theory,
    -   whether in tort (including negligence), contract, or otherwise,
    -   unless required by applicable law (such as deliberate and grossly
    -   negligent acts) or agreed to in writing, shall any Contributor be
    -   liable to You for damages, including any direct, indirect, special,
    -   incidental, or consequential damages of any character arising as a
    -   result of this License or out of the use or inability to use the
    -   Work (including but not limited to damages for loss of goodwill,
    -   work stoppage, computer failure or malfunction, or any and all
    -   other commercial damages or losses), even if such Contributor
    -   has been advised of the possibility of such damages.
    -
    -9. Accepting Warranty or Additional Liability. While redistributing
    -   the Work or Derivative Works thereof, You may choose to offer,
    -   and charge a fee for, acceptance of support, warranty, indemnity,
    -   or other liability obligations and/or rights consistent with this
    -   License. However, in accepting such obligations, You may act only
    -   on Your own behalf and on Your sole responsibility, not on behalf
    -   of any other Contributor, and only if You agree to indemnify,
    -   defend, and hold each Contributor harmless for any liability
    -   incurred by, or claims asserted against, such Contributor by reason
    -   of your accepting any such warranty or additional liability.
    -
    -END OF TERMS AND CONDITIONS
    -
    -APPENDIX: How to apply the Apache License to your work.
    -
    -   To apply the Apache License to your work, attach the following
    -   boilerplate notice, with the fields enclosed by brackets "[]"
    -   replaced with your own identifying information. (Don't include
    -   the brackets!)  The text should be enclosed in the appropriate
    -   comment syntax for the file format. We also recommend that a
    -   file or class name and description of purpose be included on the
    -   same "printed page" as the copyright notice for easier
    -   identification within third-party archives.
    -
    -Copyright [yyyy] [name of copyright owner]
    -
    -Licensed 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.
    -
    -
    -
  • -
  • -

    Apache License 2.0

    -

    Used by:

    - -
                                  Apache License
    -                        Version 2.0, January 2004
    -                     https://www.apache.org/licenses/
    -
    -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -1. Definitions.
    -
    -   "License" shall mean the terms and conditions for use, reproduction,
    -   and distribution as defined by Sections 1 through 9 of this document.
    -
    -   "Licensor" shall mean the copyright owner or entity authorized by
    -   the copyright owner that is granting the License.
    -
    -   "Legal Entity" shall mean the union of the acting entity and all
    -   other entities that control, are controlled by, or are under common
    -   control with that entity. For the purposes of this definition,
    -   "control" means (i) the power, direct or indirect, to cause the
    -   direction or management of such entity, whether by contract or
    -   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -   outstanding shares, or (iii) beneficial ownership of such entity.
    -
    -   "You" (or "Your") shall mean an individual or Legal Entity
    -   exercising permissions granted by this License.
    -
    -   "Source" form shall mean the preferred form for making modifications,
    -   including but not limited to software source code, documentation
    -   source, and configuration files.
    -
    -   "Object" form shall mean any form resulting from mechanical
    -   transformation or translation of a Source form, including but
    -   not limited to compiled object code, generated documentation,
    -   and conversions to other media types.
    -
    -   "Work" shall mean the work of authorship, whether in Source or
    -   Object form, made available under the License, as indicated by a
    -   copyright notice that is included in or attached to the work
    -   (an example is provided in the Appendix below).
    -
    -   "Derivative Works" shall mean any work, whether in Source or Object
    -   form, that is based on (or derived from) the Work and for which the
    -   editorial revisions, annotations, elaborations, or other modifications
    -   represent, as a whole, an original work of authorship. For the purposes
    -   of this License, Derivative Works shall not include works that remain
    -   separable from, or merely link (or bind by name) to the interfaces of,
    -   the Work and Derivative Works thereof.
    -
    -   "Contribution" shall mean any work of authorship, including
    -   the original version of the Work and any modifications or additions
    -   to that Work or Derivative Works thereof, that is intentionally
    -   submitted to Licensor for inclusion in the Work by the copyright owner
    -   or by an individual or Legal Entity authorized to submit on behalf of
    -   the copyright owner. For the purposes of this definition, "submitted"
    -   means any form of electronic, verbal, or written communication sent
    -   to the Licensor or its representatives, including but not limited to
    -   communication on electronic mailing lists, source code control systems,
    -   and issue tracking systems that are managed by, or on behalf of, the
    -   Licensor for the purpose of discussing and improving the Work, but
    -   excluding communication that is conspicuously marked or otherwise
    -   designated in writing by the copyright owner as "Not a Contribution."
    -
    -   "Contributor" shall mean Licensor and any individual or Legal Entity
    -   on behalf of whom a Contribution has been received by Licensor and
    -   subsequently incorporated within the Work.
    -
    -2. Grant of Copyright License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   copyright license to reproduce, prepare Derivative Works of,
    -   publicly display, publicly perform, sublicense, and distribute the
    -   Work and such Derivative Works in Source or Object form.
    -
    -3. Grant of Patent License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   (except as stated in this section) patent license to make, have made,
    -   use, offer to sell, sell, import, and otherwise transfer the Work,
    -   where such license applies only to those patent claims licensable
    -   by such Contributor that are necessarily infringed by their
    -   Contribution(s) alone or by combination of their Contribution(s)
    -   with the Work to which such Contribution(s) was submitted. If You
    -   institute patent litigation against any entity (including a
    -   cross-claim or counterclaim in a lawsuit) alleging that the Work
    -   or a Contribution incorporated within the Work constitutes direct
    -   or contributory patent infringement, then any patent licenses
    -   granted to You under this License for that Work shall terminate
    -   as of the date such litigation is filed.
    -
    -4. Redistribution. You may reproduce and distribute copies of the
    -   Work or Derivative Works thereof in any medium, with or without
    -   modifications, and in Source or Object form, provided that You
    -   meet the following conditions:
    -
    -   (a) You must give any other recipients of the Work or
    -       Derivative Works a copy of this License; and
    -
    -   (b) You must cause any modified files to carry prominent notices
    -       stating that You changed the files; and
    -
    -   (c) You must retain, in the Source form of any Derivative Works
    -       that You distribute, all copyright, patent, trademark, and
    -       attribution notices from the Source form of the Work,
    -       excluding those notices that do not pertain to any part of
    -       the Derivative Works; and
    -
    -   (d) If the Work includes a "NOTICE" text file as part of its
    -       distribution, then any Derivative Works that You distribute must
    -       include a readable copy of the attribution notices contained
    -       within such NOTICE file, excluding those notices that do not
    -       pertain to any part of the Derivative Works, in at least one
    -       of the following places: within a NOTICE text file distributed
    -       as part of the Derivative Works; within the Source form or
    -       documentation, if provided along with the Derivative Works; or,
    -       within a display generated by the Derivative Works, if and
    -       wherever such third-party notices normally appear. The contents
    -       of the NOTICE file are for informational purposes only and
    -       do not modify the License. You may add Your own attribution
    -       notices within Derivative Works that You distribute, alongside
    -       or as an addendum to the NOTICE text from the Work, provided
    -       that such additional attribution notices cannot be construed
    -       as modifying the License.
    -
    -   You may add Your own copyright statement to Your modifications and
    -   may provide additional or different license terms and conditions
    -   for use, reproduction, or distribution of Your modifications, or
    -   for any such Derivative Works as a whole, provided Your use,
    -   reproduction, and distribution of the Work otherwise complies with
    -   the conditions stated in this License.
    -
    -5. Submission of Contributions. Unless You explicitly state otherwise,
    -   any Contribution intentionally submitted for inclusion in the Work
    -   by You to the Licensor shall be under the terms and conditions of
    -   this License, without any additional terms or conditions.
    -   Notwithstanding the above, nothing herein shall supersede or modify
    -   the terms of any separate license agreement you may have executed
    -   with Licensor regarding such Contributions.
    -
    -6. Trademarks. This License does not grant permission to use the trade
    -   names, trademarks, service marks, or product names of the Licensor,
    -   except as required for reasonable and customary use in describing the
    -   origin of the Work and reproducing the content of the NOTICE file.
    -
    -7. Disclaimer of Warranty. Unless required by applicable law or
    -   agreed to in writing, Licensor provides the Work (and each
    -   Contributor provides its Contributions) on an "AS IS" BASIS,
    -   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    -   implied, including, without limitation, any warranties or conditions
    -   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    -   PARTICULAR PURPOSE. You are solely responsible for determining the
    -   appropriateness of using or redistributing the Work and assume any
    -   risks associated with Your exercise of permissions under this License.
    -
    -8. Limitation of Liability. In no event and under no legal theory,
    -   whether in tort (including negligence), contract, or otherwise,
    -   unless required by applicable law (such as deliberate and grossly
    -   negligent acts) or agreed to in writing, shall any Contributor be
    -   liable to You for damages, including any direct, indirect, special,
    -   incidental, or consequential damages of any character arising as a
    -   result of this License or out of the use or inability to use the
    -   Work (including but not limited to damages for loss of goodwill,
    -   work stoppage, computer failure or malfunction, or any and all
    -   other commercial damages or losses), even if such Contributor
    -   has been advised of the possibility of such damages.
    -
    -9. Accepting Warranty or Additional Liability. While redistributing
    -   the Work or Derivative Works thereof, You may choose to offer,
    -   and charge a fee for, acceptance of support, warranty, indemnity,
    -   or other liability obligations and/or rights consistent with this
    -   License. However, in accepting such obligations, You may act only
    -   on Your own behalf and on Your sole responsibility, not on behalf
    -   of any other Contributor, and only if You agree to indemnify,
    -   defend, and hold each Contributor harmless for any liability
    -   incurred by, or claims asserted against, such Contributor by reason
    -   of your accepting any such warranty or additional liability.
    -
    -END OF TERMS AND CONDITIONS
    -
    -
  • -
  • -

    Apache License 2.0

    -

    Used by:

    - -
                                  Apache License
    -                        Version 2.0, January 2004
    -                     https://www.apache.org/licenses/
    -
    -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -1. Definitions.
    -
    -   "License" shall mean the terms and conditions for use, reproduction,
    -   and distribution as defined by Sections 1 through 9 of this document.
    -
    -   "Licensor" shall mean the copyright owner or entity authorized by
    -   the copyright owner that is granting the License.
    -
    -   "Legal Entity" shall mean the union of the acting entity and all
    -   other entities that control, are controlled by, or are under common
    -   control with that entity. For the purposes of this definition,
    -   "control" means (i) the power, direct or indirect, to cause the
    -   direction or management of such entity, whether by contract or
    -   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    -   outstanding shares, or (iii) beneficial ownership of such entity.
    -
    -   "You" (or "Your") shall mean an individual or Legal Entity
    -   exercising permissions granted by this License.
    -
    -   "Source" form shall mean the preferred form for making modifications,
    -   including but not limited to software source code, documentation
    -   source, and configuration files.
    -
    -   "Object" form shall mean any form resulting from mechanical
    -   transformation or translation of a Source form, including but
    -   not limited to compiled object code, generated documentation,
    -   and conversions to other media types.
    -
    -   "Work" shall mean the work of authorship, whether in Source or
    -   Object form, made available under the License, as indicated by a
    -   copyright notice that is included in or attached to the work
    -   (an example is provided in the Appendix below).
    -
    -   "Derivative Works" shall mean any work, whether in Source or Object
    -   form, that is based on (or derived from) the Work and for which the
    -   editorial revisions, annotations, elaborations, or other modifications
    -   represent, as a whole, an original work of authorship. For the purposes
    -   of this License, Derivative Works shall not include works that remain
    -   separable from, or merely link (or bind by name) to the interfaces of,
    -   the Work and Derivative Works thereof.
    -
    -   "Contribution" shall mean any work of authorship, including
    -   the original version of the Work and any modifications or additions
    -   to that Work or Derivative Works thereof, that is intentionally
    -   submitted to Licensor for inclusion in the Work by the copyright owner
    -   or by an individual or Legal Entity authorized to submit on behalf of
    -   the copyright owner. For the purposes of this definition, "submitted"
    -   means any form of electronic, verbal, or written communication sent
    -   to the Licensor or its representatives, including but not limited to
    -   communication on electronic mailing lists, source code control systems,
    -   and issue tracking systems that are managed by, or on behalf of, the
    -   Licensor for the purpose of discussing and improving the Work, but
    -   excluding communication that is conspicuously marked or otherwise
    -   designated in writing by the copyright owner as "Not a Contribution."
    -
    -   "Contributor" shall mean Licensor and any individual or Legal Entity
    -   on behalf of whom a Contribution has been received by Licensor and
    -   subsequently incorporated within the Work.
    -
    -2. Grant of Copyright License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   copyright license to reproduce, prepare Derivative Works of,
    -   publicly display, publicly perform, sublicense, and distribute the
    -   Work and such Derivative Works in Source or Object form.
    -
    -3. Grant of Patent License. Subject to the terms and conditions of
    -   this License, each Contributor hereby grants to You a perpetual,
    -   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    -   (except as stated in this section) patent license to make, have made,
    -   use, offer to sell, sell, import, and otherwise transfer the Work,
    -   where such license applies only to those patent claims licensable
    -   by such Contributor that are necessarily infringed by their
    -   Contribution(s) alone or by combination of their Contribution(s)
    -   with the Work to which such Contribution(s) was submitted. If You
    -   institute patent litigation against any entity (including a
    -   cross-claim or counterclaim in a lawsuit) alleging that the Work
    -   or a Contribution incorporated within the Work constitutes direct
    -   or contributory patent infringement, then any patent licenses
    -   granted to You under this License for that Work shall terminate
    -   as of the date such litigation is filed.
    -
    -4. Redistribution. You may reproduce and distribute copies of the
    -   Work or Derivative Works thereof in any medium, with or without
    -   modifications, and in Source or Object form, provided that You
    -   meet the following conditions:
    -
    -   (a) You must give any other recipients of the Work or
    -       Derivative Works a copy of this License; and
    -
    -   (b) You must cause any modified files to carry prominent notices
    -       stating that You changed the files; and
    -
    -   (c) You must retain, in the Source form of any Derivative Works
    -       that You distribute, all copyright, patent, trademark, and
    -       attribution notices from the Source form of the Work,
    -       excluding those notices that do not pertain to any part of
    -       the Derivative Works; and
    -
    -   (d) If the Work includes a "NOTICE" text file as part of its
    -       distribution, then any Derivative Works that You distribute must
    -       include a readable copy of the attribution notices contained
    -       within such NOTICE file, excluding those notices that do not
    -       pertain to any part of the Derivative Works, in at least one
    -       of the following places: within a NOTICE text file distributed
    -       as part of the Derivative Works; within the Source form or
    -       documentation, if provided along with the Derivative Works; or,
    -       within a display generated by the Derivative Works, if and
    -       wherever such third-party notices normally appear. The contents
    -       of the NOTICE file are for informational purposes only and
    -       do not modify the License. You may add Your own attribution
    -       notices within Derivative Works that You distribute, alongside
    -       or as an addendum to the NOTICE text from the Work, provided
    -       that such additional attribution notices cannot be construed
    -       as modifying the License.
    -
    -   You may add Your own copyright statement to Your modifications and
    -   may provide additional or different license terms and conditions
    -   for use, reproduction, or distribution of Your modifications, or
    -   for any such Derivative Works as a whole, provided Your use,
    -   reproduction, and distribution of the Work otherwise complies with
    -   the conditions stated in this License.
    -
    -5. Submission of Contributions. Unless You explicitly state otherwise,
    -   any Contribution intentionally submitted for inclusion in the Work
    -   by You to the Licensor shall be under the terms and conditions of
    -   this License, without any additional terms or conditions.
    -   Notwithstanding the above, nothing herein shall supersede or modify
    -   the terms of any separate license agreement you may have executed
    -   with Licensor regarding such Contributions.
    -
    -6. Trademarks. This License does not grant permission to use the trade
    -   names, trademarks, service marks, or product names of the Licensor,
    -   except as required for reasonable and customary use in describing the
    -   origin of the Work and reproducing the content of the NOTICE file.
    -
    -7. Disclaimer of Warranty. Unless required by applicable law or
    -   agreed to in writing, Licensor provides the Work (and each
    -   Contributor provides its Contributions) on an "AS IS" BASIS,
    -   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    -   implied, including, without limitation, any warranties or conditions
    -   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    -   PARTICULAR PURPOSE. You are solely responsible for determining the
    -   appropriateness of using or redistributing the Work and assume any
    -   risks associated with Your exercise of permissions under this License.
    -
    -8. Limitation of Liability. In no event and under no legal theory,
    -   whether in tort (including negligence), contract, or otherwise,
    -   unless required by applicable law (such as deliberate and grossly
    -   negligent acts) or agreed to in writing, shall any Contributor be
    -   liable to You for damages, including any direct, indirect, special,
    -   incidental, or consequential damages of any character arising as a
    -   result of this License or out of the use or inability to use the
    -   Work (including but not limited to damages for loss of goodwill,
    -   work stoppage, computer failure or malfunction, or any and all
    -   other commercial damages or losses), even if such Contributor
    -   has been advised of the possibility of such damages.
    -
    -9. Accepting Warranty or Additional Liability. While redistributing
    -   the Work or Derivative Works thereof, You may choose to offer,
    -   and charge a fee for, acceptance of support, warranty, indemnity,
    -   or other liability obligations and/or rights consistent with this
    -   License. However, in accepting such obligations, You may act only
    -   on Your own behalf and on Your sole responsibility, not on behalf
    -   of any other Contributor, and only if You agree to indemnify,
    -   defend, and hold each Contributor harmless for any liability
    -   incurred by, or claims asserted against, such Contributor by reason
    -   of your accepting any such warranty or additional liability.
    -
    -END OF TERMS AND CONDITIONS
    -
    -APPENDIX: How to apply the Apache License to your work.
    -
    -   To apply the Apache License to your work, attach the following
    -   boilerplate notice, with the fields enclosed by brackets "[]"
    -   replaced with your own identifying information. (Don't include
    -   the brackets!)  The text should be enclosed in the appropriate
    -   comment syntax for the file format. We also recommend that a
    -   file or class name and description of purpose be included on the
    -   same "printed page" as the copyright notice for easier
    -   identification within third-party archives.
    -
    -
  • -
  • -

    Apache License 2.0

    -

    Used by:

    - -
                                  Apache License
    -                        Version 2.0, January 2004
    -                     https://www.apache.org/licenses/
    +                     http://www.apache.org/licenses/
     
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    @@ -8362,7 +7561,7 @@ 

    Used by:

    you may not use this file except in compliance with the License. You may obtain a copy of the License at - https://www.apache.org/licenses/LICENSE-2.0 + 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, @@ -8375,12 +7574,11 @@

    Used by:

    Apache License 2.0

    Used by:

                                  Apache License
                             Version 2.0, January 2004
    -                     https://www.apache.org/licenses/LICENSE-2.0
    +                     http://www.apache.org/licenses/
     
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    @@ -8572,24 +7770,25 @@ 

    Used by:

    you may not use this file except in compliance with the License. You may obtain a copy of the License at - https://www.apache.org/licenses/LICENSE-2.0 + 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. +
  • Apache License 2.0

    Used by:

                                  Apache License
                             Version 2.0, January 2004
    -                     http://www.apache.org/licenses/
    +                     https://www.apache.org/licenses/
     
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    @@ -8763,42 +7962,17 @@ 

    Used by:

    of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright 2019-2020 CreepySkeleton <creepy-skeleton@yandex.ru> - -Licensed 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.
  • Apache License 2.0

    Used by:

                                  Apache License
                             Version 2.0, January 2004
    -                     http://www.apache.org/licenses/
    +                     https://www.apache.org/licenses/
     
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    @@ -8983,31 +8157,20 @@ 

    Used by:

    file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed 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.
    +
  • Apache License 2.0

    Used by:

                                  Apache License
                             Version 2.0, January 2004
    -                     http://www.apache.org/licenses/
    +                     https://www.apache.org/licenses/
     
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    @@ -9199,7 +8362,7 @@ 

    Used by:

    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 + https://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, @@ -9212,11 +8375,12 @@

    Used by:

    Apache License 2.0

    Used by:

                                  Apache License
                             Version 2.0, January 2004
    -                     http://www.apache.org/licenses/
    +                     https://www.apache.org/licenses/LICENSE-2.0
     
     TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
     
    @@ -9408,14 +8572,850 @@ 

    Used by:

    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 + https://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. - +
    +
  • +
  • +

    Apache License 2.0

    +

    Used by:

    + +
                                  Apache License
    +                        Version 2.0, January 2004
    +                     http://www.apache.org/licenses/
    +
    +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +1. Definitions.
    +
    +   "License" shall mean the terms and conditions for use, reproduction,
    +   and distribution as defined by Sections 1 through 9 of this document.
    +
    +   "Licensor" shall mean the copyright owner or entity authorized by
    +   the copyright owner that is granting the License.
    +
    +   "Legal Entity" shall mean the union of the acting entity and all
    +   other entities that control, are controlled by, or are under common
    +   control with that entity. For the purposes of this definition,
    +   "control" means (i) the power, direct or indirect, to cause the
    +   direction or management of such entity, whether by contract or
    +   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +   outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +   "You" (or "Your") shall mean an individual or Legal Entity
    +   exercising permissions granted by this License.
    +
    +   "Source" form shall mean the preferred form for making modifications,
    +   including but not limited to software source code, documentation
    +   source, and configuration files.
    +
    +   "Object" form shall mean any form resulting from mechanical
    +   transformation or translation of a Source form, including but
    +   not limited to compiled object code, generated documentation,
    +   and conversions to other media types.
    +
    +   "Work" shall mean the work of authorship, whether in Source or
    +   Object form, made available under the License, as indicated by a
    +   copyright notice that is included in or attached to the work
    +   (an example is provided in the Appendix below).
    +
    +   "Derivative Works" shall mean any work, whether in Source or Object
    +   form, that is based on (or derived from) the Work and for which the
    +   editorial revisions, annotations, elaborations, or other modifications
    +   represent, as a whole, an original work of authorship. For the purposes
    +   of this License, Derivative Works shall not include works that remain
    +   separable from, or merely link (or bind by name) to the interfaces of,
    +   the Work and Derivative Works thereof.
    +
    +   "Contribution" shall mean any work of authorship, including
    +   the original version of the Work and any modifications or additions
    +   to that Work or Derivative Works thereof, that is intentionally
    +   submitted to Licensor for inclusion in the Work by the copyright owner
    +   or by an individual or Legal Entity authorized to submit on behalf of
    +   the copyright owner. For the purposes of this definition, "submitted"
    +   means any form of electronic, verbal, or written communication sent
    +   to the Licensor or its representatives, including but not limited to
    +   communication on electronic mailing lists, source code control systems,
    +   and issue tracking systems that are managed by, or on behalf of, the
    +   Licensor for the purpose of discussing and improving the Work, but
    +   excluding communication that is conspicuously marked or otherwise
    +   designated in writing by the copyright owner as "Not a Contribution."
    +
    +   "Contributor" shall mean Licensor and any individual or Legal Entity
    +   on behalf of whom a Contribution has been received by Licensor and
    +   subsequently incorporated within the Work.
    +
    +2. Grant of Copyright License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   copyright license to reproduce, prepare Derivative Works of,
    +   publicly display, publicly perform, sublicense, and distribute the
    +   Work and such Derivative Works in Source or Object form.
    +
    +3. Grant of Patent License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   (except as stated in this section) patent license to make, have made,
    +   use, offer to sell, sell, import, and otherwise transfer the Work,
    +   where such license applies only to those patent claims licensable
    +   by such Contributor that are necessarily infringed by their
    +   Contribution(s) alone or by combination of their Contribution(s)
    +   with the Work to which such Contribution(s) was submitted. If You
    +   institute patent litigation against any entity (including a
    +   cross-claim or counterclaim in a lawsuit) alleging that the Work
    +   or a Contribution incorporated within the Work constitutes direct
    +   or contributory patent infringement, then any patent licenses
    +   granted to You under this License for that Work shall terminate
    +   as of the date such litigation is filed.
    +
    +4. Redistribution. You may reproduce and distribute copies of the
    +   Work or Derivative Works thereof in any medium, with or without
    +   modifications, and in Source or Object form, provided that You
    +   meet the following conditions:
    +
    +   (a) You must give any other recipients of the Work or
    +       Derivative Works a copy of this License; and
    +
    +   (b) You must cause any modified files to carry prominent notices
    +       stating that You changed the files; and
    +
    +   (c) You must retain, in the Source form of any Derivative Works
    +       that You distribute, all copyright, patent, trademark, and
    +       attribution notices from the Source form of the Work,
    +       excluding those notices that do not pertain to any part of
    +       the Derivative Works; and
    +
    +   (d) If the Work includes a "NOTICE" text file as part of its
    +       distribution, then any Derivative Works that You distribute must
    +       include a readable copy of the attribution notices contained
    +       within such NOTICE file, excluding those notices that do not
    +       pertain to any part of the Derivative Works, in at least one
    +       of the following places: within a NOTICE text file distributed
    +       as part of the Derivative Works; within the Source form or
    +       documentation, if provided along with the Derivative Works; or,
    +       within a display generated by the Derivative Works, if and
    +       wherever such third-party notices normally appear. The contents
    +       of the NOTICE file are for informational purposes only and
    +       do not modify the License. You may add Your own attribution
    +       notices within Derivative Works that You distribute, alongside
    +       or as an addendum to the NOTICE text from the Work, provided
    +       that such additional attribution notices cannot be construed
    +       as modifying the License.
    +
    +   You may add Your own copyright statement to Your modifications and
    +   may provide additional or different license terms and conditions
    +   for use, reproduction, or distribution of Your modifications, or
    +   for any such Derivative Works as a whole, provided Your use,
    +   reproduction, and distribution of the Work otherwise complies with
    +   the conditions stated in this License.
    +
    +5. Submission of Contributions. Unless You explicitly state otherwise,
    +   any Contribution intentionally submitted for inclusion in the Work
    +   by You to the Licensor shall be under the terms and conditions of
    +   this License, without any additional terms or conditions.
    +   Notwithstanding the above, nothing herein shall supersede or modify
    +   the terms of any separate license agreement you may have executed
    +   with Licensor regarding such Contributions.
    +
    +6. Trademarks. This License does not grant permission to use the trade
    +   names, trademarks, service marks, or product names of the Licensor,
    +   except as required for reasonable and customary use in describing the
    +   origin of the Work and reproducing the content of the NOTICE file.
    +
    +7. Disclaimer of Warranty. Unless required by applicable law or
    +   agreed to in writing, Licensor provides the Work (and each
    +   Contributor provides its Contributions) on an "AS IS" BASIS,
    +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +   implied, including, without limitation, any warranties or conditions
    +   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +   PARTICULAR PURPOSE. You are solely responsible for determining the
    +   appropriateness of using or redistributing the Work and assume any
    +   risks associated with Your exercise of permissions under this License.
    +
    +8. Limitation of Liability. In no event and under no legal theory,
    +   whether in tort (including negligence), contract, or otherwise,
    +   unless required by applicable law (such as deliberate and grossly
    +   negligent acts) or agreed to in writing, shall any Contributor be
    +   liable to You for damages, including any direct, indirect, special,
    +   incidental, or consequential damages of any character arising as a
    +   result of this License or out of the use or inability to use the
    +   Work (including but not limited to damages for loss of goodwill,
    +   work stoppage, computer failure or malfunction, or any and all
    +   other commercial damages or losses), even if such Contributor
    +   has been advised of the possibility of such damages.
    +
    +9. Accepting Warranty or Additional Liability. While redistributing
    +   the Work or Derivative Works thereof, You may choose to offer,
    +   and charge a fee for, acceptance of support, warranty, indemnity,
    +   or other liability obligations and/or rights consistent with this
    +   License. However, in accepting such obligations, You may act only
    +   on Your own behalf and on Your sole responsibility, not on behalf
    +   of any other Contributor, and only if You agree to indemnify,
    +   defend, and hold each Contributor harmless for any liability
    +   incurred by, or claims asserted against, such Contributor by reason
    +   of your accepting any such warranty or additional liability.
    +
    +END OF TERMS AND CONDITIONS
    +
    +APPENDIX: How to apply the Apache License to your work.
    +
    +   To apply the Apache License to your work, attach the following
    +   boilerplate notice, with the fields enclosed by brackets "[]"
    +   replaced with your own identifying information. (Don't include
    +   the brackets!)  The text should be enclosed in the appropriate
    +   comment syntax for the file format. We also recommend that a
    +   file or class name and description of purpose be included on the
    +   same "printed page" as the copyright notice for easier
    +   identification within third-party archives.
    +
    +Copyright 2019-2020 CreepySkeleton <creepy-skeleton@yandex.ru>
    +
    +Licensed 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.
    +
    +
  • +
  • +

    Apache License 2.0

    +

    Used by:

    + +
                                  Apache License
    +                        Version 2.0, January 2004
    +                     http://www.apache.org/licenses/
    +
    +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +1. Definitions.
    +
    +   "License" shall mean the terms and conditions for use, reproduction,
    +   and distribution as defined by Sections 1 through 9 of this document.
    +
    +   "Licensor" shall mean the copyright owner or entity authorized by
    +   the copyright owner that is granting the License.
    +
    +   "Legal Entity" shall mean the union of the acting entity and all
    +   other entities that control, are controlled by, or are under common
    +   control with that entity. For the purposes of this definition,
    +   "control" means (i) the power, direct or indirect, to cause the
    +   direction or management of such entity, whether by contract or
    +   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +   outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +   "You" (or "Your") shall mean an individual or Legal Entity
    +   exercising permissions granted by this License.
    +
    +   "Source" form shall mean the preferred form for making modifications,
    +   including but not limited to software source code, documentation
    +   source, and configuration files.
    +
    +   "Object" form shall mean any form resulting from mechanical
    +   transformation or translation of a Source form, including but
    +   not limited to compiled object code, generated documentation,
    +   and conversions to other media types.
    +
    +   "Work" shall mean the work of authorship, whether in Source or
    +   Object form, made available under the License, as indicated by a
    +   copyright notice that is included in or attached to the work
    +   (an example is provided in the Appendix below).
    +
    +   "Derivative Works" shall mean any work, whether in Source or Object
    +   form, that is based on (or derived from) the Work and for which the
    +   editorial revisions, annotations, elaborations, or other modifications
    +   represent, as a whole, an original work of authorship. For the purposes
    +   of this License, Derivative Works shall not include works that remain
    +   separable from, or merely link (or bind by name) to the interfaces of,
    +   the Work and Derivative Works thereof.
    +
    +   "Contribution" shall mean any work of authorship, including
    +   the original version of the Work and any modifications or additions
    +   to that Work or Derivative Works thereof, that is intentionally
    +   submitted to Licensor for inclusion in the Work by the copyright owner
    +   or by an individual or Legal Entity authorized to submit on behalf of
    +   the copyright owner. For the purposes of this definition, "submitted"
    +   means any form of electronic, verbal, or written communication sent
    +   to the Licensor or its representatives, including but not limited to
    +   communication on electronic mailing lists, source code control systems,
    +   and issue tracking systems that are managed by, or on behalf of, the
    +   Licensor for the purpose of discussing and improving the Work, but
    +   excluding communication that is conspicuously marked or otherwise
    +   designated in writing by the copyright owner as "Not a Contribution."
    +
    +   "Contributor" shall mean Licensor and any individual or Legal Entity
    +   on behalf of whom a Contribution has been received by Licensor and
    +   subsequently incorporated within the Work.
    +
    +2. Grant of Copyright License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   copyright license to reproduce, prepare Derivative Works of,
    +   publicly display, publicly perform, sublicense, and distribute the
    +   Work and such Derivative Works in Source or Object form.
    +
    +3. Grant of Patent License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   (except as stated in this section) patent license to make, have made,
    +   use, offer to sell, sell, import, and otherwise transfer the Work,
    +   where such license applies only to those patent claims licensable
    +   by such Contributor that are necessarily infringed by their
    +   Contribution(s) alone or by combination of their Contribution(s)
    +   with the Work to which such Contribution(s) was submitted. If You
    +   institute patent litigation against any entity (including a
    +   cross-claim or counterclaim in a lawsuit) alleging that the Work
    +   or a Contribution incorporated within the Work constitutes direct
    +   or contributory patent infringement, then any patent licenses
    +   granted to You under this License for that Work shall terminate
    +   as of the date such litigation is filed.
    +
    +4. Redistribution. You may reproduce and distribute copies of the
    +   Work or Derivative Works thereof in any medium, with or without
    +   modifications, and in Source or Object form, provided that You
    +   meet the following conditions:
    +
    +   (a) You must give any other recipients of the Work or
    +       Derivative Works a copy of this License; and
    +
    +   (b) You must cause any modified files to carry prominent notices
    +       stating that You changed the files; and
    +
    +   (c) You must retain, in the Source form of any Derivative Works
    +       that You distribute, all copyright, patent, trademark, and
    +       attribution notices from the Source form of the Work,
    +       excluding those notices that do not pertain to any part of
    +       the Derivative Works; and
    +
    +   (d) If the Work includes a "NOTICE" text file as part of its
    +       distribution, then any Derivative Works that You distribute must
    +       include a readable copy of the attribution notices contained
    +       within such NOTICE file, excluding those notices that do not
    +       pertain to any part of the Derivative Works, in at least one
    +       of the following places: within a NOTICE text file distributed
    +       as part of the Derivative Works; within the Source form or
    +       documentation, if provided along with the Derivative Works; or,
    +       within a display generated by the Derivative Works, if and
    +       wherever such third-party notices normally appear. The contents
    +       of the NOTICE file are for informational purposes only and
    +       do not modify the License. You may add Your own attribution
    +       notices within Derivative Works that You distribute, alongside
    +       or as an addendum to the NOTICE text from the Work, provided
    +       that such additional attribution notices cannot be construed
    +       as modifying the License.
    +
    +   You may add Your own copyright statement to Your modifications and
    +   may provide additional or different license terms and conditions
    +   for use, reproduction, or distribution of Your modifications, or
    +   for any such Derivative Works as a whole, provided Your use,
    +   reproduction, and distribution of the Work otherwise complies with
    +   the conditions stated in this License.
    +
    +5. Submission of Contributions. Unless You explicitly state otherwise,
    +   any Contribution intentionally submitted for inclusion in the Work
    +   by You to the Licensor shall be under the terms and conditions of
    +   this License, without any additional terms or conditions.
    +   Notwithstanding the above, nothing herein shall supersede or modify
    +   the terms of any separate license agreement you may have executed
    +   with Licensor regarding such Contributions.
    +
    +6. Trademarks. This License does not grant permission to use the trade
    +   names, trademarks, service marks, or product names of the Licensor,
    +   except as required for reasonable and customary use in describing the
    +   origin of the Work and reproducing the content of the NOTICE file.
    +
    +7. Disclaimer of Warranty. Unless required by applicable law or
    +   agreed to in writing, Licensor provides the Work (and each
    +   Contributor provides its Contributions) on an "AS IS" BASIS,
    +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +   implied, including, without limitation, any warranties or conditions
    +   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +   PARTICULAR PURPOSE. You are solely responsible for determining the
    +   appropriateness of using or redistributing the Work and assume any
    +   risks associated with Your exercise of permissions under this License.
    +
    +8. Limitation of Liability. In no event and under no legal theory,
    +   whether in tort (including negligence), contract, or otherwise,
    +   unless required by applicable law (such as deliberate and grossly
    +   negligent acts) or agreed to in writing, shall any Contributor be
    +   liable to You for damages, including any direct, indirect, special,
    +   incidental, or consequential damages of any character arising as a
    +   result of this License or out of the use or inability to use the
    +   Work (including but not limited to damages for loss of goodwill,
    +   work stoppage, computer failure or malfunction, or any and all
    +   other commercial damages or losses), even if such Contributor
    +   has been advised of the possibility of such damages.
    +
    +9. Accepting Warranty or Additional Liability. While redistributing
    +   the Work or Derivative Works thereof, You may choose to offer,
    +   and charge a fee for, acceptance of support, warranty, indemnity,
    +   or other liability obligations and/or rights consistent with this
    +   License. However, in accepting such obligations, You may act only
    +   on Your own behalf and on Your sole responsibility, not on behalf
    +   of any other Contributor, and only if You agree to indemnify,
    +   defend, and hold each Contributor harmless for any liability
    +   incurred by, or claims asserted against, such Contributor by reason
    +   of your accepting any such warranty or additional liability.
    +
    +END OF TERMS AND CONDITIONS
    +
    +APPENDIX: How to apply the Apache License to your work.
    +
    +   To apply the Apache License to your work, attach the following
    +   boilerplate notice, with the fields enclosed by brackets "[]"
    +   replaced with your own identifying information. (Don't include
    +   the brackets!)  The text should be enclosed in the appropriate
    +   comment syntax for the file format. We also recommend that a
    +   file or class name and description of purpose be included on the
    +   same "printed page" as the copyright notice for easier
    +   identification within third-party archives.
    +
    +Copyright [yyyy] [name of copyright owner]
    +
    +Licensed 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.
    +
  • +
  • +

    Apache License 2.0

    +

    Used by:

    + +
                                  Apache License
    +                        Version 2.0, January 2004
    +                     http://www.apache.org/licenses/
    +
    +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +1. Definitions.
    +
    +   "License" shall mean the terms and conditions for use, reproduction,
    +   and distribution as defined by Sections 1 through 9 of this document.
    +
    +   "Licensor" shall mean the copyright owner or entity authorized by
    +   the copyright owner that is granting the License.
    +
    +   "Legal Entity" shall mean the union of the acting entity and all
    +   other entities that control, are controlled by, or are under common
    +   control with that entity. For the purposes of this definition,
    +   "control" means (i) the power, direct or indirect, to cause the
    +   direction or management of such entity, whether by contract or
    +   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +   outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +   "You" (or "Your") shall mean an individual or Legal Entity
    +   exercising permissions granted by this License.
    +
    +   "Source" form shall mean the preferred form for making modifications,
    +   including but not limited to software source code, documentation
    +   source, and configuration files.
    +
    +   "Object" form shall mean any form resulting from mechanical
    +   transformation or translation of a Source form, including but
    +   not limited to compiled object code, generated documentation,
    +   and conversions to other media types.
    +
    +   "Work" shall mean the work of authorship, whether in Source or
    +   Object form, made available under the License, as indicated by a
    +   copyright notice that is included in or attached to the work
    +   (an example is provided in the Appendix below).
    +
    +   "Derivative Works" shall mean any work, whether in Source or Object
    +   form, that is based on (or derived from) the Work and for which the
    +   editorial revisions, annotations, elaborations, or other modifications
    +   represent, as a whole, an original work of authorship. For the purposes
    +   of this License, Derivative Works shall not include works that remain
    +   separable from, or merely link (or bind by name) to the interfaces of,
    +   the Work and Derivative Works thereof.
    +
    +   "Contribution" shall mean any work of authorship, including
    +   the original version of the Work and any modifications or additions
    +   to that Work or Derivative Works thereof, that is intentionally
    +   submitted to Licensor for inclusion in the Work by the copyright owner
    +   or by an individual or Legal Entity authorized to submit on behalf of
    +   the copyright owner. For the purposes of this definition, "submitted"
    +   means any form of electronic, verbal, or written communication sent
    +   to the Licensor or its representatives, including but not limited to
    +   communication on electronic mailing lists, source code control systems,
    +   and issue tracking systems that are managed by, or on behalf of, the
    +   Licensor for the purpose of discussing and improving the Work, but
    +   excluding communication that is conspicuously marked or otherwise
    +   designated in writing by the copyright owner as "Not a Contribution."
    +
    +   "Contributor" shall mean Licensor and any individual or Legal Entity
    +   on behalf of whom a Contribution has been received by Licensor and
    +   subsequently incorporated within the Work.
    +
    +2. Grant of Copyright License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   copyright license to reproduce, prepare Derivative Works of,
    +   publicly display, publicly perform, sublicense, and distribute the
    +   Work and such Derivative Works in Source or Object form.
    +
    +3. Grant of Patent License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   (except as stated in this section) patent license to make, have made,
    +   use, offer to sell, sell, import, and otherwise transfer the Work,
    +   where such license applies only to those patent claims licensable
    +   by such Contributor that are necessarily infringed by their
    +   Contribution(s) alone or by combination of their Contribution(s)
    +   with the Work to which such Contribution(s) was submitted. If You
    +   institute patent litigation against any entity (including a
    +   cross-claim or counterclaim in a lawsuit) alleging that the Work
    +   or a Contribution incorporated within the Work constitutes direct
    +   or contributory patent infringement, then any patent licenses
    +   granted to You under this License for that Work shall terminate
    +   as of the date such litigation is filed.
    +
    +4. Redistribution. You may reproduce and distribute copies of the
    +   Work or Derivative Works thereof in any medium, with or without
    +   modifications, and in Source or Object form, provided that You
    +   meet the following conditions:
    +
    +   (a) You must give any other recipients of the Work or
    +       Derivative Works a copy of this License; and
    +
    +   (b) You must cause any modified files to carry prominent notices
    +       stating that You changed the files; and
    +
    +   (c) You must retain, in the Source form of any Derivative Works
    +       that You distribute, all copyright, patent, trademark, and
    +       attribution notices from the Source form of the Work,
    +       excluding those notices that do not pertain to any part of
    +       the Derivative Works; and
    +
    +   (d) If the Work includes a "NOTICE" text file as part of its
    +       distribution, then any Derivative Works that You distribute must
    +       include a readable copy of the attribution notices contained
    +       within such NOTICE file, excluding those notices that do not
    +       pertain to any part of the Derivative Works, in at least one
    +       of the following places: within a NOTICE text file distributed
    +       as part of the Derivative Works; within the Source form or
    +       documentation, if provided along with the Derivative Works; or,
    +       within a display generated by the Derivative Works, if and
    +       wherever such third-party notices normally appear. The contents
    +       of the NOTICE file are for informational purposes only and
    +       do not modify the License. You may add Your own attribution
    +       notices within Derivative Works that You distribute, alongside
    +       or as an addendum to the NOTICE text from the Work, provided
    +       that such additional attribution notices cannot be construed
    +       as modifying the License.
    +
    +   You may add Your own copyright statement to Your modifications and
    +   may provide additional or different license terms and conditions
    +   for use, reproduction, or distribution of Your modifications, or
    +   for any such Derivative Works as a whole, provided Your use,
    +   reproduction, and distribution of the Work otherwise complies with
    +   the conditions stated in this License.
    +
    +5. Submission of Contributions. Unless You explicitly state otherwise,
    +   any Contribution intentionally submitted for inclusion in the Work
    +   by You to the Licensor shall be under the terms and conditions of
    +   this License, without any additional terms or conditions.
    +   Notwithstanding the above, nothing herein shall supersede or modify
    +   the terms of any separate license agreement you may have executed
    +   with Licensor regarding such Contributions.
    +
    +6. Trademarks. This License does not grant permission to use the trade
    +   names, trademarks, service marks, or product names of the Licensor,
    +   except as required for reasonable and customary use in describing the
    +   origin of the Work and reproducing the content of the NOTICE file.
    +
    +7. Disclaimer of Warranty. Unless required by applicable law or
    +   agreed to in writing, Licensor provides the Work (and each
    +   Contributor provides its Contributions) on an "AS IS" BASIS,
    +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +   implied, including, without limitation, any warranties or conditions
    +   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +   PARTICULAR PURPOSE. You are solely responsible for determining the
    +   appropriateness of using or redistributing the Work and assume any
    +   risks associated with Your exercise of permissions under this License.
    +
    +8. Limitation of Liability. In no event and under no legal theory,
    +   whether in tort (including negligence), contract, or otherwise,
    +   unless required by applicable law (such as deliberate and grossly
    +   negligent acts) or agreed to in writing, shall any Contributor be
    +   liable to You for damages, including any direct, indirect, special,
    +   incidental, or consequential damages of any character arising as a
    +   result of this License or out of the use or inability to use the
    +   Work (including but not limited to damages for loss of goodwill,
    +   work stoppage, computer failure or malfunction, or any and all
    +   other commercial damages or losses), even if such Contributor
    +   has been advised of the possibility of such damages.
    +
    +9. Accepting Warranty or Additional Liability. While redistributing
    +   the Work or Derivative Works thereof, You may choose to offer,
    +   and charge a fee for, acceptance of support, warranty, indemnity,
    +   or other liability obligations and/or rights consistent with this
    +   License. However, in accepting such obligations, You may act only
    +   on Your own behalf and on Your sole responsibility, not on behalf
    +   of any other Contributor, and only if You agree to indemnify,
    +   defend, and hold each Contributor harmless for any liability
    +   incurred by, or claims asserted against, such Contributor by reason
    +   of your accepting any such warranty or additional liability.
    +
    +END OF TERMS AND CONDITIONS
    +
    +APPENDIX: How to apply the Apache License to your work.
    +
    +   To apply the Apache License to your work, attach the following
    +   boilerplate notice, with the fields enclosed by brackets "[]"
    +   replaced with your own identifying information. (Don't include
    +   the brackets!)  The text should be enclosed in the appropriate
    +   comment syntax for the file format. We also recommend that a
    +   file or class name and description of purpose be included on the
    +   same "printed page" as the copyright notice for easier
    +   identification within third-party archives.
    +
    +Copyright [yyyy] [name of copyright owner]
    +
    +Licensed 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.
    +
    +
  • +
  • +

    Apache License 2.0

    +

    Used by:

    + +
                                  Apache License
    +                        Version 2.0, January 2004
    +                     http://www.apache.org/licenses/
    +
    +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +1. Definitions.
    +
    +   "License" shall mean the terms and conditions for use, reproduction,
    +   and distribution as defined by Sections 1 through 9 of this document.
    +
    +   "Licensor" shall mean the copyright owner or entity authorized by
    +   the copyright owner that is granting the License.
    +
    +   "Legal Entity" shall mean the union of the acting entity and all
    +   other entities that control, are controlled by, or are under common
    +   control with that entity. For the purposes of this definition,
    +   "control" means (i) the power, direct or indirect, to cause the
    +   direction or management of such entity, whether by contract or
    +   otherwise, or (ii) ownership of fifty percent (50%) or more of the
    +   outstanding shares, or (iii) beneficial ownership of such entity.
    +
    +   "You" (or "Your") shall mean an individual or Legal Entity
    +   exercising permissions granted by this License.
    +
    +   "Source" form shall mean the preferred form for making modifications,
    +   including but not limited to software source code, documentation
    +   source, and configuration files.
    +
    +   "Object" form shall mean any form resulting from mechanical
    +   transformation or translation of a Source form, including but
    +   not limited to compiled object code, generated documentation,
    +   and conversions to other media types.
    +
    +   "Work" shall mean the work of authorship, whether in Source or
    +   Object form, made available under the License, as indicated by a
    +   copyright notice that is included in or attached to the work
    +   (an example is provided in the Appendix below).
    +
    +   "Derivative Works" shall mean any work, whether in Source or Object
    +   form, that is based on (or derived from) the Work and for which the
    +   editorial revisions, annotations, elaborations, or other modifications
    +   represent, as a whole, an original work of authorship. For the purposes
    +   of this License, Derivative Works shall not include works that remain
    +   separable from, or merely link (or bind by name) to the interfaces of,
    +   the Work and Derivative Works thereof.
    +
    +   "Contribution" shall mean any work of authorship, including
    +   the original version of the Work and any modifications or additions
    +   to that Work or Derivative Works thereof, that is intentionally
    +   submitted to Licensor for inclusion in the Work by the copyright owner
    +   or by an individual or Legal Entity authorized to submit on behalf of
    +   the copyright owner. For the purposes of this definition, "submitted"
    +   means any form of electronic, verbal, or written communication sent
    +   to the Licensor or its representatives, including but not limited to
    +   communication on electronic mailing lists, source code control systems,
    +   and issue tracking systems that are managed by, or on behalf of, the
    +   Licensor for the purpose of discussing and improving the Work, but
    +   excluding communication that is conspicuously marked or otherwise
    +   designated in writing by the copyright owner as "Not a Contribution."
    +
    +   "Contributor" shall mean Licensor and any individual or Legal Entity
    +   on behalf of whom a Contribution has been received by Licensor and
    +   subsequently incorporated within the Work.
    +
    +2. Grant of Copyright License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   copyright license to reproduce, prepare Derivative Works of,
    +   publicly display, publicly perform, sublicense, and distribute the
    +   Work and such Derivative Works in Source or Object form.
    +
    +3. Grant of Patent License. Subject to the terms and conditions of
    +   this License, each Contributor hereby grants to You a perpetual,
    +   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
    +   (except as stated in this section) patent license to make, have made,
    +   use, offer to sell, sell, import, and otherwise transfer the Work,
    +   where such license applies only to those patent claims licensable
    +   by such Contributor that are necessarily infringed by their
    +   Contribution(s) alone or by combination of their Contribution(s)
    +   with the Work to which such Contribution(s) was submitted. If You
    +   institute patent litigation against any entity (including a
    +   cross-claim or counterclaim in a lawsuit) alleging that the Work
    +   or a Contribution incorporated within the Work constitutes direct
    +   or contributory patent infringement, then any patent licenses
    +   granted to You under this License for that Work shall terminate
    +   as of the date such litigation is filed.
    +
    +4. Redistribution. You may reproduce and distribute copies of the
    +   Work or Derivative Works thereof in any medium, with or without
    +   modifications, and in Source or Object form, provided that You
    +   meet the following conditions:
    +
    +   (a) You must give any other recipients of the Work or
    +       Derivative Works a copy of this License; and
    +
    +   (b) You must cause any modified files to carry prominent notices
    +       stating that You changed the files; and
    +
    +   (c) You must retain, in the Source form of any Derivative Works
    +       that You distribute, all copyright, patent, trademark, and
    +       attribution notices from the Source form of the Work,
    +       excluding those notices that do not pertain to any part of
    +       the Derivative Works; and
    +
    +   (d) If the Work includes a "NOTICE" text file as part of its
    +       distribution, then any Derivative Works that You distribute must
    +       include a readable copy of the attribution notices contained
    +       within such NOTICE file, excluding those notices that do not
    +       pertain to any part of the Derivative Works, in at least one
    +       of the following places: within a NOTICE text file distributed
    +       as part of the Derivative Works; within the Source form or
    +       documentation, if provided along with the Derivative Works; or,
    +       within a display generated by the Derivative Works, if and
    +       wherever such third-party notices normally appear. The contents
    +       of the NOTICE file are for informational purposes only and
    +       do not modify the License. You may add Your own attribution
    +       notices within Derivative Works that You distribute, alongside
    +       or as an addendum to the NOTICE text from the Work, provided
    +       that such additional attribution notices cannot be construed
    +       as modifying the License.
    +
    +   You may add Your own copyright statement to Your modifications and
    +   may provide additional or different license terms and conditions
    +   for use, reproduction, or distribution of Your modifications, or
    +   for any such Derivative Works as a whole, provided Your use,
    +   reproduction, and distribution of the Work otherwise complies with
    +   the conditions stated in this License.
    +
    +5. Submission of Contributions. Unless You explicitly state otherwise,
    +   any Contribution intentionally submitted for inclusion in the Work
    +   by You to the Licensor shall be under the terms and conditions of
    +   this License, without any additional terms or conditions.
    +   Notwithstanding the above, nothing herein shall supersede or modify
    +   the terms of any separate license agreement you may have executed
    +   with Licensor regarding such Contributions.
    +
    +6. Trademarks. This License does not grant permission to use the trade
    +   names, trademarks, service marks, or product names of the Licensor,
    +   except as required for reasonable and customary use in describing the
    +   origin of the Work and reproducing the content of the NOTICE file.
    +
    +7. Disclaimer of Warranty. Unless required by applicable law or
    +   agreed to in writing, Licensor provides the Work (and each
    +   Contributor provides its Contributions) on an "AS IS" BASIS,
    +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
    +   implied, including, without limitation, any warranties or conditions
    +   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
    +   PARTICULAR PURPOSE. You are solely responsible for determining the
    +   appropriateness of using or redistributing the Work and assume any
    +   risks associated with Your exercise of permissions under this License.
    +
    +8. Limitation of Liability. In no event and under no legal theory,
    +   whether in tort (including negligence), contract, or otherwise,
    +   unless required by applicable law (such as deliberate and grossly
    +   negligent acts) or agreed to in writing, shall any Contributor be
    +   liable to You for damages, including any direct, indirect, special,
    +   incidental, or consequential damages of any character arising as a
    +   result of this License or out of the use or inability to use the
    +   Work (including but not limited to damages for loss of goodwill,
    +   work stoppage, computer failure or malfunction, or any and all
    +   other commercial damages or losses), even if such Contributor
    +   has been advised of the possibility of such damages.
    +
    +9. Accepting Warranty or Additional Liability. While redistributing
    +   the Work or Derivative Works thereof, You may choose to offer,
    +   and charge a fee for, acceptance of support, warranty, indemnity,
    +   or other liability obligations and/or rights consistent with this
    +   License. However, in accepting such obligations, You may act only
    +   on Your own behalf and on Your sole responsibility, not on behalf
    +   of any other Contributor, and only if You agree to indemnify,
    +   defend, and hold each Contributor harmless for any liability
    +   incurred by, or claims asserted against, such Contributor by reason
    +   of your accepting any such warranty or additional liability.
    +
    +END OF TERMS AND CONDITIONS
    +
    +APPENDIX: How to apply the Apache License to your work.
    +
    +   To apply the Apache License to your work, attach the following
    +   boilerplate notice, with the fields enclosed by brackets "[]"
    +   replaced with your own identifying information. (Don't include
    +   the brackets!)  The text should be enclosed in the appropriate
    +   comment syntax for the file format. We also recommend that a
    +   file or class name and description of purpose be included on the
    +   same "printed page" as the copyright notice for easier
    +   identification within third-party archives.
    +
    +Copyright [yyyy] [name of copyright owner]
    +
    +Licensed 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.
    +
     
  • @@ -9655,8 +9655,10 @@

    Used by:

    Apache License 2.0

    Used by:

    ../../LICENSE-APACHE
    @@ -10308,8 +10310,6 @@

    Used by:

    Apache License 2.0

    Used by:

    -
    Apache License
    -
    -Version 2.0, January 2004
    -
    -http://www.apache.org/licenses/ TERMS
    -AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    -
    -   1. Definitions.
    -
    -     
    -
    -
    -      "License" shall mean the terms and conditions for use, reproduction, and
    -distribution as defined by Sections 1 through 9 of this document.
    -
    -      
    -
    -     
    -"Licensor" shall mean the copyright owner or entity authorized by the copyright
    -owner that is granting the License.
    -
    -      
    -
    -      "Legal Entity" shall mean the
    -union of the acting entity and all other entities that control, are controlled
    -by, or are under common control with that entity. For the purposes of this
    -definition, "control" means (i) the power, direct or indirect, to cause the
    -direction or management of such entity, whether by contract or otherwise, or (ii)
    -ownership of fifty percent (50%) or more of the outstanding shares, or (iii)
    -beneficial ownership of such entity.
    -
    -      
    -
    -      "You" (or "Your") shall mean
    -an individual or Legal Entity exercising permissions granted by this License.
    -
    -  
    -
    -
    -      "Source" form shall mean the preferred form for making modifications,
    -including but not limited to software source code, documentation source, and
    -configuration files.
    -
    -      
    -
    -      "Object" form shall mean any form resulting
    -from mechanical transformation or translation of a Source form, including but not
    -limited to compiled object code, generated documentation, and conversions to
    -other media types.
    -
    -      
    -
    -      "Work" shall mean the work of authorship,
    -whether in Source or Object form, made available under the License, as indicated
    -by a copyright notice that is included in or attached to the work (an example is
    -provided in the Appendix below).
    -
    -      
    -
    -      "Derivative Works" shall mean any
    -work, whether in Source or Object form, that is based on (or derived from) the
    -Work and for which the editorial revisions, annotations, elaborations, or other
    -modifications represent, as a whole, an original work of authorship. For the
    -purposes of this License, Derivative Works shall not include works that remain
    -separable from, or merely link (or bind by name) to the interfaces of, the Work
    -and Derivative Works thereof.
    -
    -      
    -
    -      "Contribution" shall mean any work
    -of authorship, including the original version of the Work and any modifications
    -or additions to that Work or Derivative Works thereof, that is intentionally
    -submitted to Licensor for inclusion in the Work by the copyright owner or by an
    -individual or Legal Entity authorized to submit on behalf of the copyright owner.
    -For the purposes of this definition, "submitted" means any form of electronic,
    -verbal, or written communication sent to the Licensor or its representatives,
    -including but not limited to communication on electronic mailing lists, source
    -code control systems, and issue tracking systems that are managed by, or on
    -behalf of, the Licensor for the purpose of discussing and improving the Work, but
    -excluding communication that is conspicuously marked or otherwise designated in
    -writing by the copyright owner as "Not a Contribution."
    -
    -      
    -
    -     
    -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of
    -whom a Contribution has been received by Licensor and subsequently incorporated
    -within the Work.
    -
    -   2. Grant of Copyright License. Subject to the terms and
    -conditions of this License, each Contributor hereby grants to You a perpetual,
    -worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license
    -to reproduce, prepare Derivative Works of, publicly display, publicly perform,
    -sublicense, and distribute the Work and such Derivative Works in Source or Object
    -form.
    -
    -   3. Grant of Patent License. Subject to the terms and conditions of this
    -License, each Contributor hereby grants to You a perpetual, worldwide,
    -non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
    -section) patent license to make, have made, use, offer to sell, sell, import, and
    -otherwise transfer the Work, where such license applies only to those patent
    -claims licensable by such Contributor that are necessarily infringed by their
    -Contribution(s) alone or by combination of their Contribution(s) with the Work to
    -which such Contribution(s) was submitted. If You institute patent litigation
    -against any entity (including a cross-claim or counterclaim in a lawsuit)
    -alleging that the Work or a Contribution incorporated within the Work constitutes
    -direct or contributory patent infringement, then any patent licenses granted to
    -You under this License for that Work shall terminate as of the date such
    -litigation is filed.
    -
    -   4. Redistribution. You may reproduce and distribute
    -copies of the Work or Derivative Works thereof in any medium, with or without
    -modifications, and in Source or Object form, provided that You meet the following
    -conditions:
    -
    -      (a) You must give any other recipients of the Work or
    -Derivative Works a copy of this License; and
    -
    -      (b) You must cause any
    -modified files to carry prominent notices stating that You changed the files;
    -and
    -
    -      (c) You must retain, in the Source form of any Derivative Works that
    -You distribute, all copyright, patent, trademark, and attribution notices from
    -the Source form of the Work, excluding those notices that do not pertain to any
    -part of the Derivative Works; and
    -
    -      (d) If the Work includes a "NOTICE" text
    -file as part of its distribution, then any Derivative Works that You distribute
    -must include a readable copy of the attribution notices contained within such
    -NOTICE file, excluding those notices that do not pertain to any part of the
    -Derivative Works, in at least one of the following places: within a NOTICE text
    -file distributed as part of the Derivative Works; within the Source form or
    -documentation, if provided along with the Derivative Works; or, within a display
    -generated by the Derivative Works, if and wherever such third-party notices
    -normally appear. The contents of the NOTICE file are for informational purposes
    -only and do not modify the License. You may add Your own attribution notices
    -within Derivative Works that You distribute, alongside or as an addendum to the
    -NOTICE text from the Work, provided that such additional attribution notices
    -cannot be construed as modifying the License.
    -
    -      You may add Your own
    -copyright statement to Your modifications and may provide additional or different
    -license terms and conditions for use, reproduction, or distribution of Your
    -modifications, or for any such Derivative Works as a whole, provided Your use,
    -reproduction, and distribution of the Work otherwise complies with the conditions
    -stated in this License.
    -
    -   5. Submission of Contributions. Unless You explicitly
    -state otherwise, any Contribution intentionally submitted for inclusion in the
    -Work by You to the Licensor shall be under the terms and conditions of this
    -License, without any additional terms or conditions. Notwithstanding the above,
    -nothing herein shall supersede or modify the terms of any separate license
    -agreement you may have executed with Licensor regarding such Contributions.
    -
    -  
    -6. Trademarks. This License does not grant permission to use the trade names,
    -trademarks, service marks, or product names of the Licensor, except as required
    -for reasonable and customary use in describing the origin of the Work and
    -reproducing the content of the NOTICE file.
    -
    -   7. Disclaimer of Warranty. Unless
    -required by applicable law or agreed to in writing, Licensor provides the Work
    -(and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
    -WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
    -without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
    -MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible
    -for determining the appropriateness of using or redistributing the Work and
    -assume any risks associated with Your exercise of permissions under this
    -License.
    -
    -   8. Limitation of Liability. In no event and under no legal theory,
    -whether in tort (including negligence), contract, or otherwise, unless required
    -by applicable law (such as deliberate and grossly negligent acts) or agreed to in
    -writing, shall any Contributor be liable to You for damages, including any
    -direct, indirect, special, incidental, or consequential damages of any character
    -arising as a result of this License or out of the use or inability to use the
    -Work (including but not limited to damages for loss of goodwill, work stoppage,
    -computer failure or malfunction, or any and all other commercial damages or
    -losses), even if such Contributor has been advised of the possibility of such
    -damages.
    -
    -   9. Accepting Warranty or Additional Liability. While redistributing
    -the Work or Derivative Works thereof, You may choose to offer, and charge a fee
    -for, acceptance of support, warranty, indemnity, or other liability obligations
    -and/or rights consistent with this License. However, in accepting such
    -obligations, You may act only on Your own behalf and on Your sole responsibility,
    -not on behalf of any other Contributor, and only if You agree to indemnify,
    -defend, and hold each Contributor harmless for any liability incurred by, or
    -claims asserted against, such Contributor by reason of your accepting any such
    -warranty or additional liability. END OF TERMS AND CONDITIONS
    -
    -APPENDIX: How to
    -apply the Apache License to your work.
    -
    -To apply the Apache License to your work,
    -attach the following boilerplate notice, with the fields enclosed by brackets
    -"[]" replaced with your own identifying information. (Don't include the
    -brackets!) The text should be enclosed in the appropriate comment syntax for the
    -file format. We also recommend that a file or class name and description of
    -purpose be included on the same "printed page" as the copyright notice for easier
    -identification within third-party archives.
    -
    -Copyright [yyyy] Kat
    -Marchán
    -
    -Licensed 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
    -
    +                
    Apache License
    +
    +Version 2.0, January 2004
    +
    +http://www.apache.org/licenses/ TERMS
    +AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
    +
    +   1. Definitions.
    +
    +     
    +
    +
    +      "License" shall mean the terms and conditions for use, reproduction, and
    +distribution as defined by Sections 1 through 9 of this document.
    +
    +      
    +
    +     
    +"Licensor" shall mean the copyright owner or entity authorized by the copyright
    +owner that is granting the License.
    +
    +      
    +
    +      "Legal Entity" shall mean the
    +union of the acting entity and all other entities that control, are controlled
    +by, or are under common control with that entity. For the purposes of this
    +definition, "control" means (i) the power, direct or indirect, to cause the
    +direction or management of such entity, whether by contract or otherwise, or (ii)
    +ownership of fifty percent (50%) or more of the outstanding shares, or (iii)
    +beneficial ownership of such entity.
    +
    +      
    +
    +      "You" (or "Your") shall mean
    +an individual or Legal Entity exercising permissions granted by this License.
    +
    +  
    +
    +
    +      "Source" form shall mean the preferred form for making modifications,
    +including but not limited to software source code, documentation source, and
    +configuration files.
    +
    +      
    +
    +      "Object" form shall mean any form resulting
    +from mechanical transformation or translation of a Source form, including but not
    +limited to compiled object code, generated documentation, and conversions to
    +other media types.
    +
    +      
    +
    +      "Work" shall mean the work of authorship,
    +whether in Source or Object form, made available under the License, as indicated
    +by a copyright notice that is included in or attached to the work (an example is
    +provided in the Appendix below).
    +
    +      
    +
    +      "Derivative Works" shall mean any
    +work, whether in Source or Object form, that is based on (or derived from) the
    +Work and for which the editorial revisions, annotations, elaborations, or other
    +modifications represent, as a whole, an original work of authorship. For the
    +purposes of this License, Derivative Works shall not include works that remain
    +separable from, or merely link (or bind by name) to the interfaces of, the Work
    +and Derivative Works thereof.
    +
    +      
    +
    +      "Contribution" shall mean any work
    +of authorship, including the original version of the Work and any modifications
    +or additions to that Work or Derivative Works thereof, that is intentionally
    +submitted to Licensor for inclusion in the Work by the copyright owner or by an
    +individual or Legal Entity authorized to submit on behalf of the copyright owner.
    +For the purposes of this definition, "submitted" means any form of electronic,
    +verbal, or written communication sent to the Licensor or its representatives,
    +including but not limited to communication on electronic mailing lists, source
    +code control systems, and issue tracking systems that are managed by, or on
    +behalf of, the Licensor for the purpose of discussing and improving the Work, but
    +excluding communication that is conspicuously marked or otherwise designated in
    +writing by the copyright owner as "Not a Contribution."
    +
    +      
    +
    +     
    +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of
    +whom a Contribution has been received by Licensor and subsequently incorporated
    +within the Work.
    +
    +   2. Grant of Copyright License. Subject to the terms and
    +conditions of this License, each Contributor hereby grants to You a perpetual,
    +worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license
    +to reproduce, prepare Derivative Works of, publicly display, publicly perform,
    +sublicense, and distribute the Work and such Derivative Works in Source or Object
    +form.
    +
    +   3. Grant of Patent License. Subject to the terms and conditions of this
    +License, each Contributor hereby grants to You a perpetual, worldwide,
    +non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this
    +section) patent license to make, have made, use, offer to sell, sell, import, and
    +otherwise transfer the Work, where such license applies only to those patent
    +claims licensable by such Contributor that are necessarily infringed by their
    +Contribution(s) alone or by combination of their Contribution(s) with the Work to
    +which such Contribution(s) was submitted. If You institute patent litigation
    +against any entity (including a cross-claim or counterclaim in a lawsuit)
    +alleging that the Work or a Contribution incorporated within the Work constitutes
    +direct or contributory patent infringement, then any patent licenses granted to
    +You under this License for that Work shall terminate as of the date such
    +litigation is filed.
    +
    +   4. Redistribution. You may reproduce and distribute
    +copies of the Work or Derivative Works thereof in any medium, with or without
    +modifications, and in Source or Object form, provided that You meet the following
    +conditions:
    +
    +      (a) You must give any other recipients of the Work or
    +Derivative Works a copy of this License; and
    +
    +      (b) You must cause any
    +modified files to carry prominent notices stating that You changed the files;
    +and
    +
    +      (c) You must retain, in the Source form of any Derivative Works that
    +You distribute, all copyright, patent, trademark, and attribution notices from
    +the Source form of the Work, excluding those notices that do not pertain to any
    +part of the Derivative Works; and
    +
    +      (d) If the Work includes a "NOTICE" text
    +file as part of its distribution, then any Derivative Works that You distribute
    +must include a readable copy of the attribution notices contained within such
    +NOTICE file, excluding those notices that do not pertain to any part of the
    +Derivative Works, in at least one of the following places: within a NOTICE text
    +file distributed as part of the Derivative Works; within the Source form or
    +documentation, if provided along with the Derivative Works; or, within a display
    +generated by the Derivative Works, if and wherever such third-party notices
    +normally appear. The contents of the NOTICE file are for informational purposes
    +only and do not modify the License. You may add Your own attribution notices
    +within Derivative Works that You distribute, alongside or as an addendum to the
    +NOTICE text from the Work, provided that such additional attribution notices
    +cannot be construed as modifying the License.
    +
    +      You may add Your own
    +copyright statement to Your modifications and may provide additional or different
    +license terms and conditions for use, reproduction, or distribution of Your
    +modifications, or for any such Derivative Works as a whole, provided Your use,
    +reproduction, and distribution of the Work otherwise complies with the conditions
    +stated in this License.
    +
    +   5. Submission of Contributions. Unless You explicitly
    +state otherwise, any Contribution intentionally submitted for inclusion in the
    +Work by You to the Licensor shall be under the terms and conditions of this
    +License, without any additional terms or conditions. Notwithstanding the above,
    +nothing herein shall supersede or modify the terms of any separate license
    +agreement you may have executed with Licensor regarding such Contributions.
    +
    +  
    +6. Trademarks. This License does not grant permission to use the trade names,
    +trademarks, service marks, or product names of the Licensor, except as required
    +for reasonable and customary use in describing the origin of the Work and
    +reproducing the content of the NOTICE file.
    +
    +   7. Disclaimer of Warranty. Unless
    +required by applicable law or agreed to in writing, Licensor provides the Work
    +(and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
    +WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
    +without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
    +MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible
    +for determining the appropriateness of using or redistributing the Work and
    +assume any risks associated with Your exercise of permissions under this
    +License.
    +
    +   8. Limitation of Liability. In no event and under no legal theory,
    +whether in tort (including negligence), contract, or otherwise, unless required
    +by applicable law (such as deliberate and grossly negligent acts) or agreed to in
    +writing, shall any Contributor be liable to You for damages, including any
    +direct, indirect, special, incidental, or consequential damages of any character
    +arising as a result of this License or out of the use or inability to use the
    +Work (including but not limited to damages for loss of goodwill, work stoppage,
    +computer failure or malfunction, or any and all other commercial damages or
    +losses), even if such Contributor has been advised of the possibility of such
    +damages.
    +
    +   9. Accepting Warranty or Additional Liability. While redistributing
    +the Work or Derivative Works thereof, You may choose to offer, and charge a fee
    +for, acceptance of support, warranty, indemnity, or other liability obligations
    +and/or rights consistent with this License. However, in accepting such
    +obligations, You may act only on Your own behalf and on Your sole responsibility,
    +not on behalf of any other Contributor, and only if You agree to indemnify,
    +defend, and hold each Contributor harmless for any liability incurred by, or
    +claims asserted against, such Contributor by reason of your accepting any such
    +warranty or additional liability. END OF TERMS AND CONDITIONS
    +
    +APPENDIX: How to
    +apply the Apache License to your work.
    +
    +To apply the Apache License to your work,
    +attach the following boilerplate notice, with the fields enclosed by brackets
    +"[]" replaced with your own identifying information. (Don't include the
    +brackets!) The text should be enclosed in the appropriate comment syntax for the
    +file format. We also recommend that a file or class name and description of
    +purpose be included on the same "printed page" as the copyright notice for easier
    +identification within third-party archives.
    +
    +Copyright [yyyy] Kat
    +Marchán
    +
    +Licensed 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.
  • @@ -11031,33 +11031,33 @@

    Used by:

    -
    Copyright (c) 2019, Sébastien Crozet
    -All rights reserved.
    -
    -Redistribution and use in source and binary forms, with or without
    -modification, are permitted provided that the following conditions are met:
    -
    -1. Redistributions of source code must retain the above copyright notice, this
    -   list of conditions and the following disclaimer.
    -
    -2. Redistributions in binary form must reproduce the above copyright notice,
    -   this list of conditions and the following disclaimer in the documentation
    -   and/or other materials provided with the distribution.
    -
    -3. Neither the name of the author nor the names of its contributors may be used
    -   to endorse or promote products derived from this software without specific
    -   prior written permission.
    -
    -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
    -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
    -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
    -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
    -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
    -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
    -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
    -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    +                
    Copyright (c) 2019, Sébastien Crozet
    +All rights reserved.
    +
    +Redistribution and use in source and binary forms, with or without
    +modification, are permitted provided that the following conditions are met:
    +
    +1. Redistributions of source code must retain the above copyright notice, this
    +   list of conditions and the following disclaimer.
    +
    +2. Redistributions in binary form must reproduce the above copyright notice,
    +   this list of conditions and the following disclaimer in the documentation
    +   and/or other materials provided with the distribution.
    +
    +3. Neither the name of the author nor the names of its contributors may be used
    +   to endorse or promote products derived from this software without specific
    +   prior written permission.
    +
    +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
    +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
    +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
    +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
    +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
    +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
    +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
    +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
    +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     
  • @@ -13445,26 +13445,26 @@

    Used by:

    -
    MIT License
    -
    -Copyright (c) 2019 Daniel Augusto Rizzi Salvadori
    -
    -Permission is hereby granted, free of charge, to any person obtaining a copy
    -of this software and associated documentation files (the "Software"), to deal
    -in the Software without restriction, including without limitation the rights
    -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    -copies of the Software, and to permit persons to whom the Software is
    -furnished to do so, subject to the following conditions:
    -
    -The above copyright notice and this permission notice shall be included in all
    -copies or substantial portions of the Software.
    -
    -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    +                
    MIT License
    +
    +Copyright (c) 2019 Daniel Augusto Rizzi Salvadori
    +
    +Permission is hereby granted, free of charge, to any person obtaining a copy
    +of this software and associated documentation files (the "Software"), to deal
    +in the Software without restriction, including without limitation the rights
    +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    +copies of the Software, and to permit persons to whom the Software is
    +furnished to do so, subject to the following conditions:
    +
    +The above copyright notice and this permission notice shall be included in all
    +copies or substantial portions of the Software.
    +
    +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
  • @@ -13473,27 +13473,27 @@

    Used by:

    -
    MIT License
    -
    -Copyright (c) 2022 picoHz
    -
    -Permission is hereby granted, free of charge, to any person obtaining a copy
    -of this software and associated documentation files (the "Software"), to deal
    -in the Software without restriction, including without limitation the rights
    -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    -copies of the Software, and to permit persons to whom the Software is
    -furnished to do so, subject to the following conditions:
    -
    -The above copyright notice and this permission notice shall be included in all
    -copies or substantial portions of the Software.
    -
    -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    -SOFTWARE.
    +                
    MIT License
    +
    +Copyright (c) 2022 picoHz
    +
    +Permission is hereby granted, free of charge, to any person obtaining a copy
    +of this software and associated documentation files (the "Software"), to deal
    +in the Software without restriction, including without limitation the rights
    +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    +copies of the Software, and to permit persons to whom the Software is
    +furnished to do so, subject to the following conditions:
    +
    +The above copyright notice and this permission notice shall be included in all
    +copies or substantial portions of the Software.
    +
    +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    +SOFTWARE.
     
  • @@ -14314,26 +14314,26 @@

    Used by:

    -
    The MIT License (MIT)
    -
    -Copyright (c) 2015 Bartłomiej Kamiński
    -
    -Permission is hereby granted, free of charge, to any person obtaining a copy
    -of this software and associated documentation files (the "Software"), to deal
    -in the Software without restriction, including without limitation the rights
    -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    -copies of the Software, and to permit persons to whom the Software is
    -furnished to do so, subject to the following conditions:
    -
    -The above copyright notice and this permission notice shall be included in all
    -copies or substantial portions of the Software.
    -
    -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    +                
    The MIT License (MIT)
    +
    +Copyright (c) 2015 Bartłomiej Kamiński
    +
    +Permission is hereby granted, free of charge, to any person obtaining a copy
    +of this software and associated documentation files (the "Software"), to deal
    +in the Software without restriction, including without limitation the rights
    +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    +copies of the Software, and to permit persons to whom the Software is
    +furnished to do so, subject to the following conditions:
    +
    +The above copyright notice and this permission notice shall be included in all
    +copies or substantial portions of the Software.
    +
    +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
  • @@ -14342,28 +14342,28 @@

    Used by:

    -
    The MIT License (MIT)
    -
    -Copyright (c) 2015 Markus Westerlind
    -
    -Permission is hereby granted, free of charge, to any person obtaining a copy
    -of this software and associated documentation files (the "Software"), to deal
    -in the Software without restriction, including without limitation the rights
    -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    -copies of the Software, and to permit persons to whom the Software is
    -furnished to do so, subject to the following conditions:
    -
    -The above copyright notice and this permission notice shall be included in
    -all copies or substantial portions of the Software.
    -
    -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    -THE SOFTWARE.
    -
    +                
    The MIT License (MIT)
    +
    +Copyright (c) 2015 Markus Westerlind
    +
    +Permission is hereby granted, free of charge, to any person obtaining a copy
    +of this software and associated documentation files (the "Software"), to deal
    +in the Software without restriction, including without limitation the rights
    +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    +copies of the Software, and to permit persons to whom the Software is
    +furnished to do so, subject to the following conditions:
    +
    +The above copyright notice and this permission notice shall be included in
    +all copies or substantial portions of the Software.
    +
    +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    +THE SOFTWARE.
    +
     
  • diff --git a/scripts/install.sh b/scripts/install.sh index 4b08e8e4c4..0300b2b9f9 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/downloa # Router version defined in apollo-router's Cargo.toml # Note: Change this line manually during the release steps. -PACKAGE_VERSION="v1.18.0" +PACKAGE_VERSION="v1.19.0-alpha.0" download_binary() { downloader --check