Merge branch 'main' into cijothomas/batchspanprocessor1

cijothomas · web-flow · commit 894285010214 · 2025-08-07T10:26:50.000-07:00
diff --git a/opentelemetry/benches/context_attach.rs b/opentelemetry/benches/context_attach.rs
@@ -98,7 +98,7 @@ fn dummy_work() -> i32 {
     black_box(1 + 1)
 }
 
-fn group(c: &mut Criterion) -> BenchmarkGroup<WallTime> {
+fn group(c: &mut Criterion) -> BenchmarkGroup<'_, WallTime> {
     c.benchmark_group("context_attach")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ fn dummy_work() -> i32 {`
`98`	`98`	`black_box(1 + 1)`
`99`	`99`	`}`
`100`	`100`
`101`		`-fn group(c: &mut Criterion) -> BenchmarkGroup<WallTime> {`
	`101`	`+fn group(c: &mut Criterion) -> BenchmarkGroup<'_, WallTime> {`
`102`	`102`	`c.benchmark_group("context_attach")`
`103`	`103`	`}`
`104`	`104`