chore: PR feedback

dylibso · Aug 14, 2023 · d9c3312 · d9c3312
1 parent 3540045
commit d9c3312
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 50 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -74,9 +74,11 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      
+
       - name: Install Protoc
         uses: arduino/setup-protoc@v2
+        with:
+          version: "3.12.4"
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1

diff --git a/rust/src/adapter/datadog.rs b/rust/src/adapter/datadog.rs
@@ -15,11 +15,13 @@ use url::Url;
 
 use crate::{Event, Log, Metric, TraceEvent};
 
-pub use super::{
+use super::{
     datadog_formatter::{DatadogFormatter, Span, Trace},
-    Adapter, AdapterHandle, AdapterMetadata,
+    Adapter, AdapterHandle,
 };
 
+pub use super::AdapterMetadata;
+
 #[derive(Debug, Clone)]
 pub enum DatadogTraceType {
     Web,

diff --git a/rust/src/adapter/datadog_formatter/mod.rs b/rust/src/adapter/datadog_formatter/mod.rs
@@ -69,7 +69,7 @@ impl Span {
 
     pub fn add_allocation(&mut self, amount: u32) {
         self.meta
-            .insert("allocations".to_string(), amount.to_string());
+            .insert("allocation".to_string(), amount.to_string());
     }
 
     pub fn add_tag(&mut self, tag: String) {

diff --git a/rust/src/adapter/honeycomb.rs b/rust/src/adapter/honeycomb.rs
@@ -4,9 +4,14 @@ use std::time::Duration;
 use crate::{Event, TraceEvent};
 use anyhow::Result;
 
+use super::{
+    otel_formatter::{opentelemetry, OtelFormatter},
+    Adapter, AdapterHandle,
+};
+
 pub use super::{
-    otel_formatter::{opentelemetry, Attribute, OtelFormatter, Value},
-    Adapter, AdapterHandle, AdapterMetadata,
+    otel_formatter::{Attribute, Value},
+    AdapterMetadata,
 };
 
 /// Config options for HoneycombAdapter
@@ -89,19 +94,13 @@ impl HoneycombAdapter {
                 }
             }
             Event::Alloc(a) => {
-                let mut span = OtelFormatter::new_span(
-                    trace_id,
-                    parent_id,
-                    "allocation".to_string(),
-                    a.ts,
-                    a.ts,
-                );
-                OtelFormatter::add_attribute_i64_to_span(
-                    &mut span,
-                    "amount".to_string(),
-                    a.amount.into(),
-                );
-                spans.push(span);
+                if let Some(span) = spans.last_mut() {
+                    OtelFormatter::add_attribute_i64_to_span(
+                        span,
+                        "allocation".to_string(),
+                        a.amount.into(),
+                    );
+                }
             }
             _ => {}
         }

diff --git a/rust/src/adapter/lightstep.rs b/rust/src/adapter/lightstep.rs
@@ -4,9 +4,14 @@ use std::time::Duration;
 use crate::{Event, TraceEvent};
 use anyhow::Result;
 
+use super::{
+    otel_formatter::{opentelemetry, OtelFormatter},
+    Adapter, AdapterHandle,
+};
+
 pub use super::{
-    otel_formatter::{opentelemetry, Attribute, OtelFormatter, Value},
-    Adapter, AdapterHandle, AdapterMetadata,
+    otel_formatter::{Attribute, Value},
+    AdapterMetadata,
 };
 
 /// Config options for LightstepAdapter
@@ -89,19 +94,13 @@ impl LightstepAdapter {
                 }
             }
             Event::Alloc(a) => {
-                let mut span = OtelFormatter::new_span(
-                    trace_id,
-                    parent_id,
-                    "allocation".to_string(),
-                    a.ts,
-                    a.ts,
-                );
-                OtelFormatter::add_attribute_i64_to_span(
-                    &mut span,
-                    "amount".to_string(),
-                    a.amount.into(),
-                );
-                spans.push(span);
+                if let Some(span) = spans.last_mut() {
+                    OtelFormatter::add_attribute_i64_to_span(
+                        span,
+                        "allocation".to_string(),
+                        a.amount.into(),
+                    );
+                }
             }
             _ => {}
         }

diff --git a/rust/src/adapter/otelstdout.rs b/rust/src/adapter/otelstdout.rs
@@ -53,19 +53,13 @@ impl OtelStdoutAdapter {
                 }
             }
             Event::Alloc(a) => {
-                let mut span = OtelFormatter::new_span(
-                    trace_id,
-                    parent_id,
-                    "allocation".to_string(),
-                    a.ts,
-                    a.ts,
-                );
-                OtelFormatter::add_attribute_i64_to_span(
-                    &mut span,
-                    "amount".to_string(),
-                    a.amount.into(),
-                );
-                spans.push(span);
+                if let Some(span) = spans.last_mut() {
+                    OtelFormatter::add_attribute_i64_to_span(
+                        span,
+                        "allocation".to_string(),
+                        a.amount.into(),
+                    );
+                }
             }
             _ => {}
         }

diff --git a/rust/src/adapter/zipkin.rs b/rust/src/adapter/zipkin.rs
@@ -54,9 +54,9 @@ impl ZipkinAdapter {
                 }
             }
             Event::Alloc(a) => {
-                let mut span = Span::new(trace_id, parent_id, "allocation".to_string(), a.ts, a.ts);
-                span.add_tag_i64("amount".to_string(), a.amount.into());
-                spans.push(span);
+                if let Some(span) = spans.last_mut() {
+                    span.add_tag_i64("amount".to_string(), a.amount.into());
+                }
             }
             _ => {}
         }