Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jul 28, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07f5471
fix: memory allocation events should only be sent attached to functio…
nilslice Jul 24, 2023
29d59d3
chore: pacify clippy warn
nilslice Jul 28, 2023
f099119
chore: pacify clippy warns in tests
nilslice Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust/src/adapter/zipkin.rs
View file
Open in desktop
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
View file
Open in desktop
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);
}
Comment on lines -107 to -109
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah, this seems like it might have been leftover from the refactor. Let me test it tomorrow to make sure.

Ok(())
}
}
Expand Down
18 changes: 0 additions & 18 deletions rust/tests/many_tests.rs
View file
Open in desktop
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
View file
Open in desktop
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
Loading