Skip to content

Commit 3d6b94d

Browse files
committed
Review fixes
1 parent 2ce1b5b commit 3d6b94d

File tree

1 file changed

+7
-14
lines changed
  • inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal

1 file changed

+7
-14
lines changed

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/internal/CallTree.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ int spanify(
431431
@Nullable Span parentSpan,
432432
TraceContext parentContext,
433433
SpanAnchoredClock clock,
434-
BiConsumer<SpanBuilder, SpanContext> normalSpanParentOverride,
434+
BiConsumer<SpanBuilder, SpanContext> spanParentOverride,
435435
StringBuilder tempBuilder,
436436
Tracer tracer) {
437437
int createdSpans = 0;
@@ -443,14 +443,7 @@ int spanify(
443443
if (!isPillar() || isLeaf()) {
444444
createdSpans++;
445445
span =
446-
asSpan(
447-
root,
448-
parentSpan,
449-
parentContext,
450-
tracer,
451-
clock,
452-
normalSpanParentOverride,
453-
tempBuilder);
446+
asSpan(root, parentSpan, parentContext, tracer, clock, spanParentOverride, tempBuilder);
454447
this.isSpan = true;
455448
}
456449
List<CallTree> children = getChildren();
@@ -463,7 +456,7 @@ int spanify(
463456
span != null ? span : parentSpan,
464457
parentContext,
465458
clock,
466-
normalSpanParentOverride,
459+
spanParentOverride,
467460
tempBuilder,
468461
tracer);
469462
}
@@ -476,7 +469,7 @@ protected Span asSpan(
476469
TraceContext parentContext,
477470
Tracer tracer,
478471
SpanAnchoredClock clock,
479-
BiConsumer<SpanBuilder, SpanContext> normalSpanParentOverride,
472+
BiConsumer<SpanBuilder, SpanContext> spanParentOverride,
480473
StringBuilder tempBuilder) {
481474

482475
Context parentOtelCtx;
@@ -512,7 +505,7 @@ protected Span asSpan(
512505
spanBuilder,
513506
Span.fromContext(parentOtelCtx).getSpanContext(),
514507
parentContext,
515-
normalSpanParentOverride,
508+
spanParentOverride,
516509
tempBuilder);
517510

518511
// we're not interested in the very bottom of the stack which contains things like accepting and
@@ -536,7 +529,7 @@ private void insertChildIdLinks(
536529
SpanBuilder span,
537530
SpanContext parentContext,
538531
TraceContext nonInferredParent,
539-
BiConsumer<SpanBuilder, SpanContext> normalSpanParentOverride,
532+
BiConsumer<SpanBuilder, SpanContext> spanParentOverride,
540533
StringBuilder tempBuilder) {
541534
if (childIds == null || childIds.isEmpty()) {
542535
return;
@@ -553,7 +546,7 @@ private void insertChildIdLinks(
553546
tempBuilder.toString(),
554547
parentContext.getTraceFlags(),
555548
parentContext.getTraceState());
556-
normalSpanParentOverride.accept(span, childSpanContext);
549+
spanParentOverride.accept(span, childSpanContext);
557550
}
558551
}
559552
}

0 commit comments

Comments
 (0)