Skip to content

Commit f4dd6d2

Browse files
Copilotjsturtevant
andcommitted
Remove redundant parent = Span::current() from instrument attributes
Co-authored-by: jsturtevant <[email protected]>
1 parent d56aabf commit f4dd6d2

File tree

9 files changed

+60
-60
lines changed

9 files changed

+60
-60
lines changed

src/hyperlight_common/src/flatbuffer_wrappers/function_call.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use alloc::vec::Vec;
1919

2020
use anyhow::{Error, Result, bail};
2121
use flatbuffers::{FlatBufferBuilder, WIPOffset, size_prefixed_root};
22-
use tracing::{Span, instrument};
22+
use tracing::instrument;
2323

2424
use super::function_types::{ParameterValue, ReturnType};
2525
use crate::flatbuffers::hyperlight::generated::{
@@ -52,7 +52,7 @@ pub struct FunctionCall {
5252
}
5353

5454
impl FunctionCall {
55-
#[instrument(skip_all, parent = Span::current(), level= "Trace")]
55+
#[instrument(skip_all, level = "Trace")]
5656
pub fn new(
5757
function_name: String,
5858
parameters: Option<Vec<ParameterValue>>,
@@ -213,7 +213,7 @@ impl FunctionCall {
213213
}
214214
}
215215

216-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
216+
#[instrument(err(Debug), skip_all, level = "Trace")]
217217
pub fn validate_guest_function_call_buffer(function_call_buffer: &[u8]) -> Result<()> {
218218
let guest_function_call_fb = size_prefixed_root::<FbFunctionCall>(function_call_buffer)
219219
.map_err(|e| anyhow::anyhow!("Error reading function call buffer: {:?}", e))?;
@@ -225,7 +225,7 @@ pub fn validate_guest_function_call_buffer(function_call_buffer: &[u8]) -> Resul
225225
}
226226
}
227227

228-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
228+
#[instrument(err(Debug), skip_all, level = "Trace")]
229229
pub fn validate_host_function_call_buffer(function_call_buffer: &[u8]) -> Result<()> {
230230
let host_function_call_fb = size_prefixed_root::<FbFunctionCall>(function_call_buffer)
231231
.map_err(|e| anyhow::anyhow!("Error reading function call buffer: {:?}", e))?;
@@ -239,7 +239,7 @@ pub fn validate_host_function_call_buffer(function_call_buffer: &[u8]) -> Result
239239

240240
impl TryFrom<&[u8]> for FunctionCall {
241241
type Error = Error;
242-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
242+
#[instrument(err(Debug), skip_all, level = "Trace")]
243243
fn try_from(value: &[u8]) -> Result<Self> {
244244
let function_call_fb = size_prefixed_root::<FbFunctionCall>(value)
245245
.map_err(|e| anyhow::anyhow!("Error reading function call buffer: {:?}", e))?;

src/hyperlight_common/src/flatbuffer_wrappers/function_types.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use alloc::vec::Vec;
1919

2020
use anyhow::{Error, Result, anyhow, bail};
2121
use flatbuffers::size_prefixed_root;
22-
use tracing::{Span, instrument};
22+
use tracing::instrument;
2323

2424
use super::guest_error::GuestError;
2525
use crate::flatbuffers::hyperlight::generated::{
@@ -283,7 +283,7 @@ pub enum ReturnType {
283283
}
284284

285285
impl From<&ParameterValue> for ParameterType {
286-
#[instrument(skip_all, parent = Span::current(), level= "Trace")]
286+
#[instrument(skip_all, level = "Trace")]
287287
fn from(value: &ParameterValue) -> Self {
288288
match *value {
289289
ParameterValue::Int(_) => ParameterType::Int,
@@ -302,7 +302,7 @@ impl From<&ParameterValue> for ParameterType {
302302
impl TryFrom<Parameter<'_>> for ParameterValue {
303303
type Error = Error;
304304

305-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
305+
#[instrument(err(Debug), skip_all, level = "Trace")]
306306
fn try_from(param: Parameter<'_>) -> Result<Self> {
307307
let value = param.value_type();
308308
let result = match value {
@@ -342,7 +342,7 @@ impl TryFrom<Parameter<'_>> for ParameterValue {
342342
}
343343

344344
impl From<ParameterType> for FbParameterType {
345-
#[instrument(skip_all, parent = Span::current(), level= "Trace")]
345+
#[instrument(skip_all, level = "Trace")]
346346
fn from(value: ParameterType) -> Self {
347347
match value {
348348
ParameterType::Int => FbParameterType::hlint,
@@ -359,7 +359,7 @@ impl From<ParameterType> for FbParameterType {
359359
}
360360

361361
impl From<ReturnType> for FbReturnType {
362-
#[instrument(skip_all, parent = Span::current(), level= "Trace")]
362+
#[instrument(skip_all, level = "Trace")]
363363
fn from(value: ReturnType) -> Self {
364364
match value {
365365
ReturnType::Int => FbReturnType::hlint,
@@ -378,7 +378,7 @@ impl From<ReturnType> for FbReturnType {
378378

379379
impl TryFrom<FbParameterType> for ParameterType {
380380
type Error = Error;
381-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
381+
#[instrument(err(Debug), skip_all, level = "Trace")]
382382
fn try_from(value: FbParameterType) -> Result<Self> {
383383
match value {
384384
FbParameterType::hlint => Ok(ParameterType::Int),
@@ -399,7 +399,7 @@ impl TryFrom<FbParameterType> for ParameterType {
399399

400400
impl TryFrom<FbReturnType> for ReturnType {
401401
type Error = Error;
402-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
402+
#[instrument(err(Debug), skip_all, level = "Trace")]
403403
fn try_from(value: FbReturnType) -> Result<Self> {
404404
match value {
405405
FbReturnType::hlint => Ok(ReturnType::Int),
@@ -421,7 +421,7 @@ impl TryFrom<FbReturnType> for ReturnType {
421421

422422
impl TryFrom<ParameterValue> for i32 {
423423
type Error = Error;
424-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
424+
#[instrument(err(Debug), skip_all, level = "Trace")]
425425
fn try_from(value: ParameterValue) -> Result<Self> {
426426
match value {
427427
ParameterValue::Int(v) => Ok(v),
@@ -434,7 +434,7 @@ impl TryFrom<ParameterValue> for i32 {
434434

435435
impl TryFrom<ParameterValue> for u32 {
436436
type Error = Error;
437-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
437+
#[instrument(err(Debug), skip_all, level = "Trace")]
438438
fn try_from(value: ParameterValue) -> Result<Self> {
439439
match value {
440440
ParameterValue::UInt(v) => Ok(v),
@@ -447,7 +447,7 @@ impl TryFrom<ParameterValue> for u32 {
447447

448448
impl TryFrom<ParameterValue> for i64 {
449449
type Error = Error;
450-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
450+
#[instrument(err(Debug), skip_all, level = "Trace")]
451451
fn try_from(value: ParameterValue) -> Result<Self> {
452452
match value {
453453
ParameterValue::Long(v) => Ok(v),
@@ -460,7 +460,7 @@ impl TryFrom<ParameterValue> for i64 {
460460

461461
impl TryFrom<ParameterValue> for u64 {
462462
type Error = Error;
463-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
463+
#[instrument(err(Debug), skip_all, level = "Trace")]
464464
fn try_from(value: ParameterValue) -> Result<Self> {
465465
match value {
466466
ParameterValue::ULong(v) => Ok(v),
@@ -473,7 +473,7 @@ impl TryFrom<ParameterValue> for u64 {
473473

474474
impl TryFrom<ParameterValue> for f32 {
475475
type Error = Error;
476-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
476+
#[instrument(err(Debug), skip_all, level = "Trace")]
477477
fn try_from(value: ParameterValue) -> Result<Self> {
478478
match value {
479479
ParameterValue::Float(v) => Ok(v),
@@ -486,7 +486,7 @@ impl TryFrom<ParameterValue> for f32 {
486486

487487
impl TryFrom<ParameterValue> for f64 {
488488
type Error = Error;
489-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
489+
#[instrument(err(Debug), skip_all, level = "Trace")]
490490
fn try_from(value: ParameterValue) -> Result<Self> {
491491
match value {
492492
ParameterValue::Double(v) => Ok(v),
@@ -499,7 +499,7 @@ impl TryFrom<ParameterValue> for f64 {
499499

500500
impl TryFrom<ParameterValue> for String {
501501
type Error = Error;
502-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
502+
#[instrument(err(Debug), skip_all, level = "Trace")]
503503
fn try_from(value: ParameterValue) -> Result<Self> {
504504
match value {
505505
ParameterValue::String(v) => Ok(v),
@@ -512,7 +512,7 @@ impl TryFrom<ParameterValue> for String {
512512

513513
impl TryFrom<ParameterValue> for bool {
514514
type Error = Error;
515-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
515+
#[instrument(err(Debug), skip_all, level = "Trace")]
516516
fn try_from(value: ParameterValue) -> Result<Self> {
517517
match value {
518518
ParameterValue::Bool(v) => Ok(v),
@@ -525,7 +525,7 @@ impl TryFrom<ParameterValue> for bool {
525525

526526
impl TryFrom<ParameterValue> for Vec<u8> {
527527
type Error = Error;
528-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
528+
#[instrument(err(Debug), skip_all, level = "Trace")]
529529
fn try_from(value: ParameterValue) -> Result<Self> {
530530
match value {
531531
ParameterValue::VecBytes(v) => Ok(v),
@@ -538,7 +538,7 @@ impl TryFrom<ParameterValue> for Vec<u8> {
538538

539539
impl TryFrom<ReturnValue> for i32 {
540540
type Error = Error;
541-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
541+
#[instrument(err(Debug), skip_all, level = "Trace")]
542542
fn try_from(value: ReturnValue) -> Result<Self> {
543543
match value {
544544
ReturnValue::Int(v) => Ok(v),
@@ -551,7 +551,7 @@ impl TryFrom<ReturnValue> for i32 {
551551

552552
impl TryFrom<ReturnValue> for u32 {
553553
type Error = Error;
554-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
554+
#[instrument(err(Debug), skip_all, level = "Trace")]
555555
fn try_from(value: ReturnValue) -> Result<Self> {
556556
match value {
557557
ReturnValue::UInt(v) => Ok(v),
@@ -564,7 +564,7 @@ impl TryFrom<ReturnValue> for u32 {
564564

565565
impl TryFrom<ReturnValue> for i64 {
566566
type Error = Error;
567-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
567+
#[instrument(err(Debug), skip_all, level = "Trace")]
568568
fn try_from(value: ReturnValue) -> Result<Self> {
569569
match value {
570570
ReturnValue::Long(v) => Ok(v),
@@ -577,7 +577,7 @@ impl TryFrom<ReturnValue> for i64 {
577577

578578
impl TryFrom<ReturnValue> for u64 {
579579
type Error = Error;
580-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
580+
#[instrument(err(Debug), skip_all, level = "Trace")]
581581
fn try_from(value: ReturnValue) -> Result<Self> {
582582
match value {
583583
ReturnValue::ULong(v) => Ok(v),
@@ -590,7 +590,7 @@ impl TryFrom<ReturnValue> for u64 {
590590

591591
impl TryFrom<ReturnValue> for f32 {
592592
type Error = Error;
593-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
593+
#[instrument(err(Debug), skip_all, level = "Trace")]
594594
fn try_from(value: ReturnValue) -> Result<Self> {
595595
match value {
596596
ReturnValue::Float(v) => Ok(v),
@@ -603,7 +603,7 @@ impl TryFrom<ReturnValue> for f32 {
603603

604604
impl TryFrom<ReturnValue> for f64 {
605605
type Error = Error;
606-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
606+
#[instrument(err(Debug), skip_all, level = "Trace")]
607607
fn try_from(value: ReturnValue) -> Result<Self> {
608608
match value {
609609
ReturnValue::Double(v) => Ok(v),
@@ -616,7 +616,7 @@ impl TryFrom<ReturnValue> for f64 {
616616

617617
impl TryFrom<ReturnValue> for String {
618618
type Error = Error;
619-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
619+
#[instrument(err(Debug), skip_all, level = "Trace")]
620620
fn try_from(value: ReturnValue) -> Result<Self> {
621621
match value {
622622
ReturnValue::String(v) => Ok(v),
@@ -629,7 +629,7 @@ impl TryFrom<ReturnValue> for String {
629629

630630
impl TryFrom<ReturnValue> for bool {
631631
type Error = Error;
632-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
632+
#[instrument(err(Debug), skip_all, level = "Trace")]
633633
fn try_from(value: ReturnValue) -> Result<Self> {
634634
match value {
635635
ReturnValue::Bool(v) => Ok(v),
@@ -642,7 +642,7 @@ impl TryFrom<ReturnValue> for bool {
642642

643643
impl TryFrom<ReturnValue> for Vec<u8> {
644644
type Error = Error;
645-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
645+
#[instrument(err(Debug), skip_all, level = "Trace")]
646646
fn try_from(value: ReturnValue) -> Result<Self> {
647647
match value {
648648
ReturnValue::VecBytes(v) => Ok(v),
@@ -655,7 +655,7 @@ impl TryFrom<ReturnValue> for Vec<u8> {
655655

656656
impl TryFrom<ReturnValue> for () {
657657
type Error = Error;
658-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
658+
#[instrument(err(Debug), skip_all, level = "Trace")]
659659
fn try_from(value: ReturnValue) -> Result<Self> {
660660
match value {
661661
ReturnValue::Void(()) => Ok(()),
@@ -668,7 +668,7 @@ impl TryFrom<ReturnValue> for () {
668668

669669
impl TryFrom<ReturnValueBox<'_>> for ReturnValue {
670670
type Error = Error;
671-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
671+
#[instrument(err(Debug), skip_all, level = "Trace")]
672672
fn try_from(return_value_box: ReturnValueBox<'_>) -> Result<Self> {
673673
match return_value_box.value_type() {
674674
FbReturnValue::hlint => {
@@ -739,7 +739,7 @@ impl TryFrom<ReturnValueBox<'_>> for ReturnValue {
739739

740740
impl TryFrom<&ReturnValue> for Vec<u8> {
741741
type Error = Error;
742-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
742+
#[instrument(err(Debug), skip_all, level = "Trace")]
743743
fn try_from(value: &ReturnValue) -> Result<Vec<u8>> {
744744
let mut builder = flatbuffers::FlatBufferBuilder::new();
745745
let result_bytes = match value {

src/hyperlight_common/src/flatbuffer_wrappers/guest_error.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extern crate flatbuffers;
1818

1919
use alloc::string::{String, ToString};
2020

21-
use tracing::{Span, instrument};
21+
use tracing::instrument;
2222

2323
use crate::flatbuffers::hyperlight::generated::ErrorCode as FbErrorCode;
2424

@@ -188,14 +188,14 @@ pub struct GuestError {
188188
}
189189

190190
impl GuestError {
191-
#[instrument(skip_all, parent = Span::current(), level= "Trace")]
191+
#[instrument(skip_all, level = "Trace")]
192192
pub fn new(code: ErrorCode, message: String) -> Self {
193193
Self { code, message }
194194
}
195195
}
196196

197197
impl Default for GuestError {
198-
#[instrument(parent = Span::current(), level= "Trace")]
198+
#[instrument(level = "Trace")]
199199
fn default() -> Self {
200200
Self {
201201
code: ErrorCode::NoError,

src/hyperlight_common/src/flatbuffer_wrappers/guest_log_data.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use alloc::vec::Vec;
1919

2020
use anyhow::{Error, Result, anyhow};
2121
use flatbuffers::size_prefixed_root;
22-
use tracing::{Span, instrument};
22+
use tracing::instrument;
2323

2424
use super::guest_log_level::LogLevel;
2525
use crate::flatbuffers::hyperlight::generated::{
@@ -39,7 +39,7 @@ pub struct GuestLogData {
3939
}
4040

4141
impl GuestLogData {
42-
#[instrument(skip_all, parent = Span::current(), level= "Trace")]
42+
#[instrument(skip_all, level = "Trace")]
4343
pub fn new(
4444
message: String,
4545
source: String,
@@ -61,7 +61,7 @@ impl GuestLogData {
6161

6262
impl TryFrom<&[u8]> for GuestLogData {
6363
type Error = Error;
64-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
64+
#[instrument(err(Debug), skip_all, level = "Trace")]
6565
fn try_from(raw_bytes: &[u8]) -> Result<Self> {
6666
let gld_gen = size_prefixed_root::<FbGuestLogData>(raw_bytes)
6767
.map_err(|e| anyhow!("Error while reading GuestLogData: {:?}", e))?;
@@ -85,7 +85,7 @@ impl TryFrom<&[u8]> for GuestLogData {
8585

8686
impl TryFrom<&GuestLogData> for Vec<u8> {
8787
type Error = Error;
88-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
88+
#[instrument(err(Debug), skip_all, level = "Trace")]
8989
fn try_from(value: &GuestLogData) -> Result<Vec<u8>> {
9090
let mut builder = flatbuffers::FlatBufferBuilder::new();
9191
let message = builder.create_string(&value.message);
@@ -114,13 +114,13 @@ impl TryFrom<&GuestLogData> for Vec<u8> {
114114

115115
impl TryFrom<GuestLogData> for Vec<u8> {
116116
type Error = Error;
117-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
117+
#[instrument(err(Debug), skip_all, level = "Trace")]
118118
fn try_from(value: GuestLogData) -> Result<Vec<u8>> {
119119
(&value).try_into()
120120
}
121121
}
122122

123-
#[instrument(err(Debug), skip_all, parent = Span::current(), level= "Trace")]
123+
#[instrument(err(Debug), skip_all, level = "Trace")]
124124
fn convert_generated_option(field_name: &str, opt: Option<&str>) -> Result<String> {
125125
opt.map(|s| s.to_string())
126126
.ok_or_else(|| anyhow!("Missing field: {}", field_name))

0 commit comments

Comments
 (0)