Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
* Copyright (c) 2019, 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -161,6 +161,7 @@ public class JaegerTracerBuilder implements TracerBuilder<JaegerTracerBuilder> {
private final Map<String, String> tags = new HashMap<>();
// this is a backward incompatible change, but the correct choice is Jaeger, not B3
private final Set<PropagationFormat> propagationFormats = EnumSet.of(PropagationFormat.JAEGER);
private boolean isPropagationFormatsDefaulted = true;
private String serviceName;
private String protocol = "http";
private String host = DEFAULT_HTTP_HOST;
Expand Down Expand Up @@ -467,6 +468,10 @@ public JaegerTracerBuilder samplerType(SamplerType samplerType) {
@ConfiguredOption(key = "propagation", kind = ConfiguredOption.Kind.LIST, type = PropagationFormat.class, value = "JAEGER")
public JaegerTracerBuilder addPropagation(PropagationFormat propagationFormat) {
Objects.requireNonNull(propagationFormat);
if (isPropagationFormatsDefaulted) {
isPropagationFormatsDefaulted = false;
this.propagationFormats.clear();
}
this.propagationFormats.add(propagationFormat);
return this;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright (c) 2024 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.helidon.tracing.providers.jaeger;

import io.opentelemetry.extension.trace.propagation.JaegerPropagator;
import org.junit.jupiter.api.Test;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;

class BuilderPropagatorDefaultTest {

@Test
void checkThatPropagatorFormatAssignmentOverridesJaegerDefault() {
JaegerTracerBuilder builder = JaegerTracerBuilder.create();
builder.addPropagation(JaegerTracerBuilder.PropagationFormat.B3_SINGLE);
var props = builder.createPropagators();
assertThat("Propagators when default overridden", props, not(hasItem(instanceOf(JaegerPropagator.class))));
}

@Test
void checkDefaultedPropagationFormatIsJaeger() {
JaegerTracerBuilder builder = JaegerTracerBuilder.create();
var props = builder.createPropagators();
assertThat("Propagators with only default", props, contains(instanceOf(JaegerPropagator.class)));
}
}