update: fixed aws related issue

madara-alliance · Nov 7, 2024 · 103e462 · 103e462
1 parent 5b1cbc2
commit 103e462
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.env.test b/.env.test
@@ -83,7 +83,7 @@ MADARA_ORCHESTRATOR_AWS_S3_BUCKET_NAME=madara-orchestrator-test-bucket
 ## OTEL ##
 
 MADARA_ORCHESTRATOR_OTEL_SERVICE_NAME=orchestrator
-MADARA_ORCHESTRATOR_OTEL_COLLECTOR_ENDPOINT=http://localhost:4317
+
 
 
 #### SERVER ####
@@ -96,7 +96,7 @@ MADARA_ORCHESTRATOR_PORT=3000
 
 MADARA_ORCHESTRATOR_MAX_BLOCK_NO_TO_PROCESS=1000
 MADARA_ORCHESTRATOR_MIN_BLOCK_NO_TO_PROCESS=0
-MADARA_ORCHESTRATOR_MADARA_RPC_URL=http://localhost:9955
+MADARA_ORCHESTRATOR_MADARA_RPC_URL=http://localhost:9944
 
 
 #### SNOS ####

diff --git a/crates/orchestrator/src/cli/instrumentation.rs b/crates/orchestrator/src/cli/instrumentation.rs
@@ -4,7 +4,7 @@ use url::Url;
 
 /// Parameters used to config instrumentation.
 #[derive(Debug, Clone, Args)]
-#[group(requires_all = ["otel_service_name", "otel_collector_endpoint", "log_level"])]
+#[group(requires_all = ["log_level"])]
 pub struct InstrumentationCliArgs {
     /// The name of the instrumentation service.
     #[arg(env = "MADARA_ORCHESTRATOR_OTEL_SERVICE_NAME", long, default_value = "orchestrator")]

diff --git a/e2e-tests/tests.rs b/e2e-tests/tests.rs
@@ -27,7 +27,7 @@ use rstest::rstest;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use starknet::core::types::{Felt, MaybePendingStateUpdate};
-use utils::env_utils::get_env_var_or_panic;
+use utils::env_utils::{get_env_var_optional, get_env_var_or_panic};
 use uuid::Uuid;
 
 extern crate e2e_tests;
@@ -584,10 +584,7 @@ fn set_env_vars() -> Vec<(String, String)> {
             "MADARA_ORCHESTRATOR_OTEL_SERVICE_NAME".to_string(),
             get_env_var_or_panic("MADARA_ORCHESTRATOR_OTEL_SERVICE_NAME"),
         ),
-        (
-            "MADARA_ORCHESTRATOR_OTEL_COLLECTOR_ENDPOINT".to_string(),
-            get_env_var_or_panic("MADARA_ORCHESTRATOR_OTEL_COLLECTOR_ENDPOINT"),
-        ),
+
         // Server
         ("MADARA_ORCHESTRATOR_HOST".to_string(), get_env_var_or_panic("MADARA_ORCHESTRATOR_HOST")),
         ("MADARA_ORCHESTRATOR_PORT".to_string(), get_env_var_or_panic("MADARA_ORCHESTRATOR_PORT")),