Skip to content

Commit 6844a04

Browse files
committed
Fix build
1 parent fe115fe commit 6844a04

3 files changed

Lines changed: 22 additions & 10 deletions

File tree

extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,11 @@ private static <C> Baggage getBaggageFromHeader(@Nullable C carrier, TextMapGett
279279
builder = Baggage.builder();
280280
}
281281
int[] counts =
282-
parseBaggageHeader(value, builder, MAX_BAGGAGE_ENTRIES - entriesAdded, MAX_BAGGAGE_BYTES - bytesAdded);
282+
parseBaggageHeader(
283+
value,
284+
builder,
285+
MAX_BAGGAGE_ENTRIES - entriesAdded,
286+
MAX_BAGGAGE_BYTES - bytesAdded);
283287
entriesAdded += counts[0];
284288
bytesAdded += counts[1];
285289
}

extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/JaegerPropagatorTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ void inject_baggageLimit_maxEntries() {
482482

483483
@Test
484484
void inject_baggageLimit_maxBytes() {
485-
Baggage baggage = Baggage.builder().put("k", nChars('v', 8192)).build();
485+
Baggage baggage = Baggage.builder().put("k", fillChars('v', 8192)).build();
486486
Map<String, String> carrier = new LinkedHashMap<>();
487487
jaegerPropagator.inject(Context.root().with(baggage), carrier, Map::put);
488488
assertThat(carrier).doesNotContainKey(BAGGAGE_PREFIX + "k");
@@ -510,7 +510,7 @@ static Stream<Arguments> extract_baggageLimit() {
510510
Map<String, String> headerCarrier = new LinkedHashMap<>();
511511
headerCarrier.put(BAGGAGE_HEADER, jaegerHeader.toString());
512512
Map<String, String> bigValueCarrier = new LinkedHashMap<>();
513-
bigValueCarrier.put(BAGGAGE_PREFIX + "k", nChars('v', 8192));
513+
bigValueCarrier.put(BAGGAGE_PREFIX + "k", fillChars('v', 8192));
514514
return Stream.of(
515515
// 65 uberctx- prefix keys — only first 64 extracted
516516
Arguments.of(prefixCarrier, baggageWithEntries(0, 64)),
@@ -520,7 +520,10 @@ static Stream<Arguments> extract_baggageLimit() {
520520
Arguments.of(bigValueCarrier, Baggage.empty()));
521521
}
522522

523-
/** Builds a {@link Baggage} with entries {@code k{start}=v{start}} through {@code k{start+count-1}=v{start+count-1}}. */
523+
/**
524+
* Builds a {@link Baggage} with entries {@code k{start}=v{start}} through {@code
525+
* k{start+count-1}=v{start+count-1}}.
526+
*/
524527
private static Baggage baggageWithEntries(int start, int count) {
525528
BaggageBuilder builder = Baggage.builder();
526529
for (int i = start; i < start + count; i++) {
@@ -530,7 +533,7 @@ private static Baggage baggageWithEntries(int start, int count) {
530533
}
531534

532535
/** Returns a string of {@code count} repetitions of {@code c}. */
533-
private static String nChars(char c, int count) {
536+
private static String fillChars(char c, int count) {
534537
char[] chars = new char[count];
535538
Arrays.fill(chars, c);
536539
return new String(chars);

extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/OtTracePropagatorTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void inject_baggageLimit_maxEntries() {
436436

437437
@Test
438438
void inject_baggageLimit_maxBytes() {
439-
Baggage baggage = Baggage.builder().put("k", nChars('v', 8192)).build();
439+
Baggage baggage = Baggage.builder().put("k", fillChars('v', 8192)).build();
440440
Map<String, String> carrier = new LinkedHashMap<>();
441441
propagator.inject(
442442
withSpanContext(
@@ -461,15 +461,17 @@ static Stream<Arguments> extract_baggageLimit() {
461461
manyEntriesCarrier.put(OtTracePropagator.PREFIX_BAGGAGE_HEADER + "k" + i, "v" + i);
462462
}
463463
Map<String, String> bigValueCarrier = carrierWithSpanContext();
464-
bigValueCarrier.put(OtTracePropagator.PREFIX_BAGGAGE_HEADER + "k", nChars('v', 8192));
464+
bigValueCarrier.put(OtTracePropagator.PREFIX_BAGGAGE_HEADER + "k", fillChars('v', 8192));
465465
return Stream.of(
466466
// 65 ot-baggage- keys — only first 64 extracted
467467
Arguments.of(manyEntriesCarrier, baggageWithEntries(0, 64)),
468468
// single entry whose value exceeds the byte limit — not extracted
469469
Arguments.of(bigValueCarrier, Baggage.empty()));
470470
}
471471

472-
/** Returns a carrier pre-populated with a valid span context (required for baggage extraction). */
472+
/**
473+
* Returns a carrier pre-populated with a valid span context (required for baggage extraction).
474+
*/
473475
private static Map<String, String> carrierWithSpanContext() {
474476
Map<String, String> carrier = new LinkedHashMap<>();
475477
carrier.put(OtTracePropagator.TRACE_ID_HEADER, TRACE_ID_RIGHT_PART);
@@ -478,7 +480,10 @@ private static Map<String, String> carrierWithSpanContext() {
478480
return carrier;
479481
}
480482

481-
/** Builds a {@link Baggage} with entries {@code k{start}=v{start}} through {@code k{start+count-1}=v{start+count-1}}. */
483+
/**
484+
* Builds a {@link Baggage} with entries {@code k{start}=v{start}} through {@code
485+
* k{start+count-1}=v{start+count-1}}.
486+
*/
482487
private static Baggage baggageWithEntries(int start, int count) {
483488
BaggageBuilder builder = Baggage.builder();
484489
for (int i = start; i < start + count; i++) {
@@ -488,7 +493,7 @@ private static Baggage baggageWithEntries(int start, int count) {
488493
}
489494

490495
/** Returns a string of {@code count} repetitions of {@code c}. */
491-
private static String nChars(char c, int count) {
496+
private static String fillChars(char c, int count) {
492497
char[] chars = new char[count];
493498
Arrays.fill(chars, c);
494499
return new String(chars);

0 commit comments

Comments
 (0)