Skip to content

Commit

Permalink
fix: memory allocation events should only be sent attached to functio…
Browse files Browse the repository at this point in the history
…n calls (#48)

* fix: memory allocation events should only be sent attached to function calls

* chore: pacify clippy warn

* chore: pacify clippy warns in tests
  • Loading branch information
nilslice authored Jul 28, 2023
1 parent 4b8d27c commit abf1223
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 24 deletions.
2 changes: 1 addition & 1 deletion rust/src/adapter/zipkin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl ZipkinAdapter {
let mut ztf = ZipkinFormatter::new();
ztf.spans = spans;

let mut first_span = ztf
let first_span = ztf
.spans
.first_mut()
.context("No spans to send to zipkin")?;
Expand Down
3 changes: 0 additions & 3 deletions rust/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ impl InstrumentationContext {
self.stack.push(f);
}

if let Err(e) = self.collector.try_send(ev) {
error!("error recording memory allocation: {}", e);
}
Ok(())
}
}
Expand Down
18 changes: 0 additions & 18 deletions rust/tests/many_tests.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#[cfg(test)]
mod tests {
use anyhow::Result;
use serde_json::Value;
use std::convert::identity;
use std::process::Command;

mod helpers;
use helpers::otel_json::*;

#[test]
fn integration_many() -> Result<()> {
Expand All @@ -26,21 +23,6 @@ mod tests {
// First test that the modules ran the expected number of times
assert_eq!(hellos, 250);

// check that every allocation was called
let traces = output_lines
.map(|l| match serde_json::from_str(l) {
Ok(x) => Some(x),
Err(_) => None,
})
.collect::<Vec<Option<Value>>>()
.into_iter()
.filter_map(identity)
.collect::<Vec<Value>>();
let allocations = traces
.iter()
.filter(|t| attribute_of_first_span(t, "name".to_string()).unwrap() == "allocation")
.count();
assert_eq!(allocations > 10, true);
Ok(())
}
}
3 changes: 1 addition & 2 deletions rust/tests/otel_json_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ mod tests {
use serde_json::Value;

mod helpers;
use helpers::otel_json::*;

#[test]
fn otel_stdout() -> Result<()> {
Expand All @@ -26,7 +25,7 @@ mod tests {
let output = String::from_utf8(output.stdout)?;

// traces is the collection of all traces emitted from this run
let traces = output
let _traces = output
.lines()
.map(|l| match serde_json::from_str(l) {
Ok(x) => Some(x),
Expand Down

0 comments on commit abf1223

Please sign in to comment.