Skip to content

Bump jaeger client #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavolloffay merged 2 commits into from
Jun 3, 2021
Merged

Bump jaeger client #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e77f24
Bump jaeger client
JoakimLofgren May 5, 2021
9df32a8
Add throws for new Exception from Jaeger client
JoakimLofgren May 5, 2021
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
7 changes: 4 additions & 3 deletions .../main/java/io/opentracing/contrib/java/spring/jaeger/starter/JaegerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.LinkedList;
import java.util.List;

import org.apache.thrift.transport.TTransportException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down Expand Up @@ -83,7 +84,7 @@ public io.opentracing.Tracer tracer(Sampler sampler,
@Bean
public Reporter reporter(JaegerConfigurationProperties properties,
Metrics metrics,
@Autowired(required = false) ReporterAppender reporterAppender) {
@Autowired(required = false) ReporterAppender reporterAppender) throws TTransportException {

List<Reporter> reporters = new LinkedList<>();
RemoteReporter remoteReporter = properties.getRemoteReporter();
Expand All @@ -108,7 +109,7 @@ public Reporter reporter(JaegerConfigurationProperties properties,

private Reporter getUdpReporter(Metrics metrics,
RemoteReporter remoteReporter,
JaegerConfigurationProperties.UdpSender udpSenderProperties) {
JaegerConfigurationProperties.UdpSender udpSenderProperties) throws TTransportException {
io.jaegertracing.thrift.internal.senders.UdpSender udpSender =
new io.jaegertracing.thrift.internal.senders.UdpSender(
udpSenderProperties.getHost(), udpSenderProperties.getPort(),
Expand All @@ -119,7 +120,7 @@ private Reporter getUdpReporter(Metrics metrics,

private Reporter getHttpReporter(Metrics metrics,
RemoteReporter remoteReporter,
JaegerConfigurationProperties.HttpSender httpSenderProperties) {
JaegerConfigurationProperties.HttpSender httpSenderProperties) throws TTransportException {
io.jaegertracing.thrift.internal.senders.HttpSender.Builder builder =
new io.jaegertracing.thrift.internal.senders.HttpSender.Builder(httpSenderProperties.getUrl());
if (httpSenderProperties.getMaxPayload() != null) {
Expand Down
4 changes: 2 additions & 2 deletions ...ntrib/java/spring/jaeger/starter/customizer/JaegerTracerB3CustomizerCustomSpringTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2018-2019 The OpenTracing Authors
* Copyright 2018-2021 The OpenTracing Authors
*
* 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
Expand Down Expand Up @@ -84,7 +84,7 @@ private void assertOnB3Headers(JaegerSpanContext context) {
// Note: This test ensures that B3 codec actually works
// If it would not, values would never be extracted from B3 headers and context will be null
assertThat(context).isNotNull();
assertThat(context.getTraceId()).isEqualTo("abc");
assertThat(context.getTraceId()).isEqualTo("0000000000000abc");
assertThat(context.getSpanId()).isEqualTo(3567L);
}
}
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<version.io.opentracing.contrib-opentracing-spring-tracer>0.4.0</version.io.opentracing.contrib-opentracing-spring-tracer>
<version.io.opentracing.contrib-opentracing-spring-web-starter>4.0.0</version.io.opentracing.contrib-opentracing-spring-web-starter>
<version.org.springframework.boot>2.3.4.RELEASE</version.org.springframework.boot>
<version.jaeger>1.3.2</version.jaeger>
<version.jaeger>1.6.0</version.jaeger>
<version.org.awaitility-awaitility>3.0.0</version.org.awaitility-awaitility>
<version.test-containers>1.7.3</version.test-containers>

Expand Down