update dependencies (#61)

* update spring

* update spring

* update dependencies

Author: EddeCCC

build.gradle

@@ -148,7 +148,7 @@ dependencies {
             platform("io.opentelemetry:opentelemetry-bom:${openTelemetryVersion}"),
             "io.opentelemetry:opentelemetry-sdk:${openTelemetryVersion}",
             "io.opentelemetry:opentelemetry-exporter-otlp:${openTelemetryVersion}",
-            "io.opentelemetry:opentelemetry-semconv:${openTelemetrySemConvVersion}",
+            "io.opentelemetry.semconv:opentelemetry-semconv:${openTelemetrySemConvVersion}",
             "io.opentelemetry.proto:opentelemetry-proto:${openTelemetryProtoVersion}",
 
             "com.google.protobuf:protobuf-java:${protobufVersion}",

gradle.properties

@@ -3,27 +3,27 @@ boomerangVersion=1.737.0
 # The OpenTelemetry-Boomerang version to ship with the EUM server
 boomerangOpenTelemetryPluginVersion=0.48.0-5
 
-springBootVersion=3.4.2
-snakeYamlVersion=2.3
+springBootVersion=3.4.4
+snakeYamlVersion=2.4
 
 # Ensure to adapt the netty version (inspectit-ocelot-core/build.gradle) when changing the OpenCensus version
 openCensusVersion=0.31.1
 openCensusInfluxdbExporterVersion=1.2
-grpcVersion=1.70.0
+grpcVersion=1.71.0
 
 # @pin Prometheus client to 0.6.0 to prevent auto prefixing counter metrics with "_total"
 # see: https://github.com/prometheus/client_java/issues/640, https://github.com/prometheus/client_java/pull/653
 # additionally, the version 1.* introduced breaking changes
 prometheusClientVersion = 0.6.0
-# Keep the OpenTelemetry versions consistent
+# Keep the OpenTelemetry versions consistent, take a look at Spring
 openTelemetryVersion=1.43.0
 openTelemetryAlphaVersion=1.43.0-alpha
-openTelemetrySemConvVersion=1.30.1-alpha
+openTelemetrySemConvVersion=1.30.0
 openTelemetryProtoVersion=1.5.0-alpha
-# Overwrite transitive dependency of OTel-proto to fix CVE - Keep an eye on Spring versions
+# Keep an eye on OTel proto version
 protobufVersion=4.28.3
 
-guavaVersion=33.4.0-jre
+guavaVersion=33.4.6-jre
 geoip2Version=4.2.1
 
 httpClientVersion=4.5.14
@@ -32,20 +32,20 @@ commonsMath3Version=3.6.1
 commonsLang3Version=3.17.0
 commonsIoVersion=2.18.0
 
-influxdbJavaVersion=2.24
+influxdbJavaVersion=2.25
 
-armeriaVersion=1.31.3
-testContainersVersion=1.20.4
+armeriaVersion=1.32.3
+testContainersVersion=1.20.6
 
 ### gradle plugin versions
 ### Check for newer version at https://plugins.gradle.org/
 # io.spring.dependency-management
 springDependencyManangementVersion=1.1.7
 # org.owasp.dependencycheck
-owaspDependencyCheckVersion=12.0.2
+owaspDependencyCheckVersion=12.1.0
 # org.cyclonedx.bom
-cyclonedxBomVersion=2.0.0
+cyclonedxBomVersion=2.2.0
 # com.palantir.docker
 palantirDockerVersion=0.36.0
-versionsPlugin=0.51.0
+versionsPlugin=0.52.0
 lombokVersion=1.18.36

src/main/java/rocks/inspectit/oce/eum/server/exporters/OtlpMetricsExporterService.java

@@ -11,15 +11,15 @@
 import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
 import io.opentelemetry.opencensusshim.internal.metrics.MetricAdapter;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReaderBuilder;
 import io.opentelemetry.sdk.resources.Resource;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ServiceAttributes;
+import io.opentelemetry.semconv.TelemetryAttributes;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,9 +111,9 @@ void doEnable() {
             enabled = true;
             otlpMetricsExporterSettings = configuration.getExporters().getMetrics().getOtlp();
             AggregationTemporalitySelector aggregationTemporalitySelector = otlpMetricsExporterSettings.getPreferredTemporality() == AggregationTemporality.DELTA ? AggregationTemporalitySelector.deltaPreferred() : AggregationTemporalitySelector.alwaysCumulative();
-            otelResource = Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, configuration.getExporters()
+            otelResource = Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, configuration.getExporters()
                     .getMetrics()
-                    .getServiceName(), AttributeKey.stringKey("inspectit.eum-server.version"), appStartupRunner.getServerVersion(), ResourceAttributes.TELEMETRY_SDK_VERSION, appStartupRunner.getOpenTelemetryVersion(), ResourceAttributes.TELEMETRY_SDK_LANGUAGE, "java", ResourceAttributes.TELEMETRY_SDK_NAME, "opentelemetry"));
+                    .getServiceName(), AttributeKey.stringKey("inspectit.eum-server.version"), appStartupRunner.getServerVersion(), TelemetryAttributes.TELEMETRY_SDK_VERSION, appStartupRunner.getOpenTelemetryVersion(), TelemetryAttributes.TELEMETRY_SDK_LANGUAGE, "java", TelemetryAttributes.TELEMETRY_SDK_NAME, "opentelemetry"));
             String endpoint = configuration.getExporters().getMetrics().getOtlp().getEndpoint();
             // OTEL expects that the URI starts with 'http://' or 'https://'
             if (!endpoint.startsWith("http")) {

src/main/java/rocks/inspectit/oce/eum/server/exporters/configuration/TraceExportersConfiguration.java

@@ -5,7 +5,7 @@
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
 import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporterBuilder;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ServiceAttributes;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@@ -66,7 +66,7 @@ public SpanExporter otlpSpanExporter() {
         }
         log.info("Starting OTLP span exporter on {} '{}'", otlpTraceExporterSettings.getProtocol()
                 .getConfigRepresentation(), endpoint);
-        System.setProperty("otel.resource.attributes", ResourceAttributes.SERVICE_NAME.getKey() + "=" + configuration.getExporters()
+        System.setProperty("otel.resource.attributes", ServiceAttributes.SERVICE_NAME.getKey() + "=" + configuration.getExporters()
                 .getTracing()
                 .getServiceName());