Skip to content

Commit

Permalink
fix: parse modules with no compat versions
Browse files Browse the repository at this point in the history
  • Loading branch information
nilslice committed Aug 20, 2023
1 parent d3a7fd6 commit dde86a7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
6 changes: 4 additions & 2 deletions go/wasm.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
const wasmInstrVersionMajor = 0
const wasmInstrVersionMinor = 0 // TODO: bump this to match compiler when ready

var errorNoCompatibilityVersion = errors.New("No compatibility versions in module")

// make sure that our function was instrumented with a compatible
// version of wasm-instr
func checkVersion(m *wasm.Module) error {
Expand All @@ -31,7 +33,7 @@ func checkVersion(m *wasm.Module) error {
}

if minorGlobal == nil || majorGlobal == nil {
return errors.New("wasm_instr_version functions not found")
return errorNoCompatibilityVersion
}

minor, _, err := leb128.DecodeUint32(bytes.NewReader(m.GlobalSection[minorGlobal.Index].Init.Data))
Expand Down Expand Up @@ -60,7 +62,7 @@ func parseNames(data []byte) (map[uint32]string, error) {
}

// Check for version globals
if err := checkVersion(m); err != nil {
if err := checkVersion(m); err != nil && err != ErrorNoCompatibilityVersion {
return nil, err
}

Expand Down
6 changes: 4 additions & 2 deletions rust/src/adapter/otelstdout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ impl Adapter for OtelStdoutAdapter {
for span in trace_evt.events {
self.event_to_spans(&mut spans, span, vec![], trace_id.clone())?;
}
let otf = OtelFormatter::new(spans, "stdout".into());
println!("{:?}", &otf.traces_data);
if !spans.is_empty() {
let otf = OtelFormatter::new(spans, "stdout".into());
println!("{:?}", &otf.traces_data);
}
Ok(())
}
}
Expand Down
14 changes: 7 additions & 7 deletions rust/src/wasm_instr.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashMap;

use anyhow::{bail, Context, Result};
use anyhow::{bail, Result};

// these control the versions of instrumented wasm supported
// WASM_INSTR_VERSION_MAJOR must match the instrumented wasm
Expand All @@ -17,12 +17,12 @@ pub struct WasmInstrInfo {

impl WasmInstrInfo {
pub fn check_version(&self) -> Result<()> {
let maj_num = self
.maj_version
.context("wasm-instr missing major version")?;
let min_num = self
.min_version
.context("wasm-instr missing minor version")?;
if self.maj_version.is_none() && self.min_version.is_none() {
// likely this is an uninstrumented module, or not instrumented with automation
return Ok(());
}
let maj_num = self.maj_version.unwrap();
let min_num = self.min_version.unwrap();

if maj_num != WASM_INSTR_VERSION_MAJOR {
bail!("wasm wasm-instr major version {maj_num} is not equal to {WASM_INSTR_VERSION_MAJOR}!")
Expand Down

0 comments on commit dde86a7

Please sign in to comment.