Skip to content

Commit 9b514ab

Browse files
authored
Update dependencies (#66)
* update dependencies * fix plugin version
1 parent 9b8ced7 commit 9b514ab

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

gradle.properties

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,50 @@
11
# The boomerang version to ship with the EUM server
22
boomerangVersion=1.737.0
33
# The OpenTelemetry-Boomerang version to ship with the EUM server
4-
boomerangOpenTelemetryPluginVersion=0.48.0-5
4+
boomerangOpenTelemetryPluginVersion=2.0.0-1
55

6-
springBootVersion=3.4.4
6+
springBootVersion=3.5.3
77
snakeYamlVersion=2.4
88

9-
# Ensure to adapt the netty version (inspectit-ocelot-core/build.gradle) when changing the OpenCensus version
109
openCensusVersion=0.31.1
1110
openCensusInfluxdbExporterVersion=1.2
12-
grpcVersion=1.71.0
11+
grpcVersion=1.73.0
1312

1413
# @pin Prometheus client to 0.6.0 to prevent auto prefixing counter metrics with "_total"
1514
# see: https://github.com/prometheus/client_java/issues/640, https://github.com/prometheus/client_java/pull/653
1615
# additionally, the version 1.* introduced breaking changes
1716
prometheusClientVersion = 0.6.0
1817
# Keep the OpenTelemetry versions consistent, take a look at Spring
19-
openTelemetryVersion=1.43.0
20-
openTelemetryAlphaVersion=1.43.0-alpha
21-
openTelemetrySemConvVersion=1.30.0
22-
openTelemetryProtoVersion=1.5.0-alpha
18+
openTelemetryVersion=1.49.0
19+
openTelemetryAlphaVersion=1.49.0-alpha
20+
openTelemetrySemConvVersion=1.34.0
21+
openTelemetryProtoVersion=1.7.0-alpha
2322
# Keep an eye on OTel proto version
24-
protobufVersion=4.28.3
23+
protobufVersion=4.31.0
2524

26-
guavaVersion=33.4.6-jre
27-
geoip2Version=4.2.1
25+
guavaVersion=33.4.8-jre
26+
geoip2Version=4.3.1
2827

2928
httpClientVersion=4.5.14
3029
commonsNetVersion=3.11.1
3130
commonsMath3Version=3.6.1
3231
commonsLang3Version=3.17.0
33-
commonsIoVersion=2.18.0
32+
commonsIoVersion=2.19.0
3433

3534
influxdbJavaVersion=2.25
3635

37-
armeriaVersion=1.32.3
38-
testContainersVersion=1.20.6
36+
armeriaVersion=1.32.5
37+
testContainersVersion=1.21.3
3938

4039
### gradle plugin versions
4140
### Check for newer version at https://plugins.gradle.org/
4241
# io.spring.dependency-management
4342
springDependencyManangementVersion=1.1.7
4443
# org.owasp.dependencycheck
45-
owaspDependencyCheckVersion=12.1.0
44+
owaspDependencyCheckVersion=12.1.3
4645
# org.cyclonedx.bom
47-
cyclonedxBomVersion=2.2.0
46+
cyclonedxBomVersion=2.3.1
4847
# com.palantir.docker
4948
palantirDockerVersion=0.36.0
5049
versionsPlugin=0.52.0
51-
lombokVersion=1.18.36
50+
lombokVersion=1.18.38

src/main/java/io/opentelemetry/opencensusshim/internal/metrics/MetricAdapter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import java.util.regex.MatchResult;
5454
import java.util.regex.Matcher;
5555
import java.util.regex.Pattern;
56-
import javax.annotation.Nullable;
5756

5857
/**
5958
* This class has been copied from the {@code io.opentelemetry.opentelemetry-opencensus-shim}.
@@ -368,7 +367,7 @@ private static DoubleExemplarData mapExemplar(Exemplar exemplar) {
368367
exemplar.getValue());
369368
}
370369

371-
static long mapTimestamp(@Nullable Timestamp time) {
370+
static long mapTimestamp(Timestamp time) {
372371
// Treat all empty timestamps as "0" (proto3)
373372
if (time == null) {
374373
return 0;

src/main/java/io/opentelemetry/sdk/trace/OcelotSpanUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.util.CollectionUtils;
2424
import org.springframework.util.StringUtils;
2525

26-
import javax.annotation.Nullable;
2726
import java.util.Collections;
2827
import java.util.List;
2928
import java.util.Map;
@@ -41,7 +40,6 @@ public class OcelotSpanUtils {
4140
* No-operation context.
4241
*/
4342
private static final Context NOOP_CONTEXT = new Context() {
44-
@Nullable
4543
@Override
4644
public <V> V get(ContextKey<V> key) {
4745
return null;

0 commit comments

Comments
 (0)