From c27ae68d5062705e9923689ad56772c736dcb64a Mon Sep 17 00:00:00 2001 From: Kevin Duffy Date: Thu, 20 Jun 2024 09:43:39 +0100 Subject: [PATCH] Update Launcher Docs Removing Option --- docs/source/basic_tutorials/launcher.md | 1 + launcher/src/main.rs | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/basic_tutorials/launcher.md b/docs/source/basic_tutorials/launcher.md index 0eecfc90..f6175925 100644 --- a/docs/source/basic_tutorials/launcher.md +++ b/docs/source/basic_tutorials/launcher.md @@ -341,6 +341,7 @@ Options: ```shell --otlp-service-name [env: OTLP_SERVICE_NAME=] + [default: text-generation-inference.router] ``` ## CORS_ALLOW_ORIGIN diff --git a/launcher/src/main.rs b/launcher/src/main.rs index 01d0e8f4..649ddeba 100644 --- a/launcher/src/main.rs +++ b/launcher/src/main.rs @@ -414,7 +414,7 @@ struct Args { otlp_endpoint: Option, #[clap(default_value = "text-generation-inference.router", long, env)] - otlp_service_name: Option, + otlp_service_name: String, #[clap(long, env)] cors_allow_origin: Vec, @@ -559,10 +559,8 @@ fn shard_manager( } // OpenTelemetry Service Name - if let Some(otlp_endpoint) = otlp_endpoint { - shard_args.push("--otlp-service-name".to_string()); - shard_args.push(otlp_service_name); - } + shard_args.push("--otlp-service-name".to_string()); + shard_args.push(otlp_service_name); // In case we use sliding window, we may ignore the sliding in flash for some backends depending on the parameter. shard_args.push("--max-input-tokens".to_string()); @@ -1220,9 +1218,10 @@ fn spawn_webserver( } // OpenTelemetry - if args.otlp_service_name { - router_args.push("--otlp-service-name".to_string()); - } + let otlp_service_name = args.otlp_service_name; + router_args.push("--otlp-service-name".to_string()); + router_args.push(otlp_service_name); + // CORS origins for origin in args.cors_allow_origin.into_iter() {