feat: pass orgslug to logs endpoint

Author: VaibhavUpreti

src/tracer/src/cli/handlers/logs.rs

@@ -170,6 +170,7 @@ pub async fn otel_start_with_auto_install(
                 let run_name = run_snapshot.name.clone();
                 let pipeline_name = pipeline_data.name.clone();
                 let user_id = pipeline_data.tags.user_id.unwrap();
+                let organization_slug = pipeline_data.tags.organization_slug.clone();
 
                 let trace_id = run_id.clone();
                 let span_id = run_id.clone();
@@ -187,6 +188,7 @@ pub async fn otel_start_with_auto_install(
                     trace_id,
                     span_id,
                     user_email,
+                    organization_slug,
                     std::collections::HashMap::new(),
                 );
 
@@ -208,6 +210,7 @@ pub async fn otel_start_with_auto_install(
                 warning_message!("No active run found, using standalone configuration");
 
                 let user_email = pipeline_data.tags.email.unwrap();
+                let organization_slug = pipeline_data.tags.organization_slug.clone();
 
                 let run_id = uuid::Uuid::new_v4().to_string();
                 let standalone_config = OtelConfig::with_environment_variables(
@@ -219,6 +222,7 @@ pub async fn otel_start_with_auto_install(
                     run_id.clone(),
                     run_id,
                     user_email,
+                    organization_slug.clone(),
                     std::collections::HashMap::new(),
                 );
 
@@ -235,6 +239,7 @@ pub async fn otel_start_with_auto_install(
             warning_message!("Daemon not accessible: {}", e);
 
             let user_email = "unknown".to_string();
+            let organization_slug = "unknown".to_string();
 
             let run_id = uuid::Uuid::new_v4().to_string();
             let standalone_config = OtelConfig::with_environment_variables(
@@ -246,6 +251,7 @@ pub async fn otel_start_with_auto_install(
                 run_id.clone(),
                 run_id,
                 user_email,
+                organization_slug.clone(),
                 std::collections::HashMap::new(),
             );
 

src/tracer/src/opentelemetry/config.rs

@@ -17,6 +17,7 @@ pub struct OtelConfig {
     pub span_id: String,
     pub user_email: String,
     pub environment_variables: HashMap<String, String>,
+    pub organization_slug: String,
 }
 
 impl OtelConfig {
@@ -30,6 +31,7 @@ impl OtelConfig {
         trace_id: String,
         span_id: String,
         user_email: String,
+        organization_slug: String,
     ) -> Self {
         Self {
             user_id,
@@ -40,6 +42,7 @@ impl OtelConfig {
             trace_id,
             span_id,
             user_email,
+            organization_slug,
             environment_variables: HashMap::new(),
         }
     }
@@ -54,6 +57,7 @@ impl OtelConfig {
         trace_id: String,
         span_id: String,
         user_email: String,
+        organization_slug: String,
         environment_variables: HashMap<String, String>,
     ) -> Self {
         Self {
@@ -66,6 +70,7 @@ impl OtelConfig {
             span_id,
             user_email,
             environment_variables,
+            organization_slug,
         }
     }
 
@@ -95,8 +100,9 @@ impl OtelConfig {
 
     pub fn generate_config(&self) -> Result<String> {
         crate::info_message!(
-            "Generating OpenTelemetry config for run_id: {}",
-            self.run_id
+            "Generating OpenTelemetry config for run_id: {}, organization: {}",
+            self.run_id,
+            self.organization_slug
         );
 
         let template_content = include_str!("otel-config-template.yaml");
@@ -111,6 +117,7 @@ impl OtelConfig {
             .replace("{{run_id}}", &self.run_id)
             .replace("{{otel_endpoint}}", OTEL_FORWARD_ENDPOINT)
             .replace("{{organization_id}}", &self.organization_id)
+            .replace("{{organization_slug}}", &self.organization_slug)
             .replace("{{trace_id}}", &self.trace_id)
             .replace("{{span_id}}", &self.span_id)
             .replace("{{user_email}}", &self.user_email);

src/tracer/src/opentelemetry/otel-config-template.yaml

@@ -62,10 +62,10 @@ processors:
   resource:
     attributes:
       - key: service.name
-        value: "nextflow-pipeline"
+        value: "tracer-logger"
         action: insert
       - key: service.version
-        value: "1.0.0"
+        value: "1.1.0"
         action: insert
       - key: deployment.environment
         value: "production"
@@ -89,8 +89,9 @@ processors:
           - set(attributes["run_name"], "{{run_name}}")
           - set(attributes["trace_id"], "{{trace_id}}")
           - set(attributes["span_id"], "{{span_id}}")
-          - set(attributes["organization_id"], "{{organization_id}}")
           - set(attributes["run_id"], "{{run_id}}")
+          - set(attributes["organization_id"], "{{organization_id}}")
+          - set(attributes["organization_slug"], "{{organization_slug}}")
           - set(attributes["user_email"], "{{user_email}}")
           - set(attributes["log_file_path"], attributes["log.file.path"]) where attributes["log.file.path"] != nil
           - set(attributes["file_name"], attributes["log.file.name"]) where attributes["log.file.name"] != nil
@@ -106,6 +107,8 @@ exporters:
     endpoint: "{{otel_endpoint}}"
     headers:
       Content-Type: "application/json"
+      x-organization-slug: "{{organization_slug}}"
+      x-organization-id: "{{organization_id}}"
     timeout: 60s
     retry_on_failure:
       enabled: true