reorder methods

open-telemetry · Mar 12, 2024 · 85cf5ea · 85cf5ea
1 parent bf06008
commit 85cf5ea
Showing 1 changed file with 49 additions and 49 deletions.
diff --git a/opentelemetry-etw-logs/src/logs/exporter.rs b/opentelemetry-etw-logs/src/logs/exporter.rs
@@ -232,6 +232,55 @@ impl ETWExporter {
         }
     }
 
+    fn populate_part_b(
+        &self,
+        event: &mut tld::EventBuilder,
+        log_data: &opentelemetry_sdk::export::logs::LogData,
+        level: tld::Level,
+        event_id: Option<i64>,
+        event_name: Option<&str>,
+    ) {
+        // Count fields in PartB
+        const COUNT_TYPE_NAME: u8 = 1u8;
+        const COUNT_SEVERITY_NUMBER: u8 = 1u8;
+
+        let field_count = COUNT_TYPE_NAME
+            + COUNT_SEVERITY_NUMBER
+            + log_data.record.body.is_some() as u8
+            + log_data.record.severity_text.is_some() as u8
+            + event_id.is_some() as u8
+            + event_name.is_some() as u8;
+
+        // Create PartB struct
+        event.add_struct("PartB", field_count, 0);
+
+        // Fill fields of PartB struct
+        event.add_str8("_typeName", "Logs", tld::OutType::Default, 0);
+
+        if let Some(body) = log_data.record.body.clone() {
+            add_attribute_to_event(event, &Key::new("body"), &body);
+        }
+
+        event.add_u8("severityNumber", level.as_int(), tld::OutType::Default, 0);
+
+        if let Some(severity_text) = &log_data.record.severity_text {
+            event.add_str8(
+                "severityText",
+                severity_text.as_ref(),
+                tld::OutType::Default,
+                0,
+            );
+        }
+
+        if let Some(event_id) = event_id {
+            event.add_i64("eventId", event_id, tld::OutType::Default, 0);
+        }
+
+        if let Some(event_name) = event_name {
+            event.add_str8("name", event_name, tld::OutType::Default, 0);
+        }
+    }
+
     fn populate_part_c<'a>(
         &'a self,
         event: &mut tld::EventBuilder,
@@ -286,55 +335,6 @@ impl ETWExporter {
 
         return (event_id, event_name);
     }
-
-    fn populate_part_b(
-        &self,
-        event: &mut tld::EventBuilder,
-        log_data: &opentelemetry_sdk::export::logs::LogData,
-        level: tld::Level,
-        event_id: Option<i64>,
-        event_name: Option<&str>,
-    ) {
-        // Count fields in PartB
-        const COUNT_TYPE_NAME: u8 = 1u8;
-        const COUNT_SEVERITY_NUMBER: u8 = 1u8;
-
-        let field_count = COUNT_TYPE_NAME
-            + COUNT_SEVERITY_NUMBER
-            + log_data.record.body.is_some() as u8
-            + log_data.record.severity_text.is_some() as u8
-            + event_id.is_some() as u8
-            + event_name.is_some() as u8;
-
-        // Create PartB struct
-        event.add_struct("PartB", field_count, 0);
-
-        // Fill fields of PartB struct
-        event.add_str8("_typeName", "Logs", tld::OutType::Default, 0);
-
-        if let Some(body) = log_data.record.body.clone() {
-            add_attribute_to_event(event, &Key::new("body"), &body);
-        }
-
-        event.add_u8("severityNumber", level.as_int(), tld::OutType::Default, 0);
-
-        if let Some(severity_text) = &log_data.record.severity_text {
-            event.add_str8(
-                "severityText",
-                severity_text.as_ref(),
-                tld::OutType::Default,
-                0,
-            );
-        }
-
-        if let Some(event_id) = event_id {
-            event.add_i64("eventId", event_id, tld::OutType::Default, 0);
-        }
-
-        if let Some(event_name) = event_name {
-            event.add_str8("name", event_name, tld::OutType::Default, 0);
-        }
-    }
 }
 
 impl Debug for ETWExporter {