Skip to content

Commit 63e5bef

Browse files
authored
fix opentelemetry version change (#14252)
* fix opentelemetry version change * format code
1 parent 6ad71e6 commit 63e5bef

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
import org.springframework.http.HttpHeaders;
2727
import org.springframework.util.unit.DataSize;
28-
import zipkin2.Call;
29-
import zipkin2.CheckResult;
30-
import zipkin2.codec.Encoding;
3128
import zipkin2.reporter.BytesMessageEncoder;
29+
import zipkin2.reporter.Call;
30+
import zipkin2.reporter.CheckResult;
3231
import zipkin2.reporter.ClosedSenderException;
32+
import zipkin2.reporter.Encoding;
3333
import zipkin2.reporter.Sender;
3434

3535
/**

dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static class ReporterConfiguration {
134134
@ConditionalOnMissingBean
135135
@ConditionalOnBean(Sender.class)
136136
AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
137-
return AsyncReporter.builder(sender).build(encoder);
137+
return AsyncReporter.builder(sender).build((zipkin2.reporter.BytesEncoder<Span>) encoder);
138138
}
139139
}
140140

dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.springframework.http.HttpEntity;
2020
import org.springframework.http.HttpMethod;
2121
import org.springframework.web.client.RestTemplate;
22-
import zipkin2.Call;
23-
import zipkin2.Callback;
22+
import zipkin2.reporter.Call;
23+
import zipkin2.reporter.Callback;
2424

2525
class ZipkinRestTemplateSender extends HttpSender {
2626
private final String endpoint;

dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.springframework.http.ResponseEntity;
2121
import org.springframework.web.reactive.function.client.WebClient;
2222
import reactor.core.publisher.Mono;
23-
import zipkin2.Call;
24-
import zipkin2.Callback;
23+
import zipkin2.reporter.Call;
24+
import zipkin2.reporter.Callback;
2525

2626
class ZipkinWebClientSender extends HttpSender {
2727
private final String endpoint;

dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<properties>
3939
<micrometer.version>1.13.0</micrometer.version>
4040
<micrometer-tracing.version>1.2.5</micrometer-tracing.version>
41-
<opentelemetry.version>1.34.1</opentelemetry.version>
42-
<zipkin-reporter.version>2.17.2</zipkin-reporter.version>
41+
<opentelemetry.version>1.38.0</opentelemetry.version>
42+
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
4343
<prometheus-client.version>0.16.0</prometheus-client.version>
4444
</properties>
4545

0 commit comments

Comments
 (0)