Merge pull request #748 from humivo/FixJava

Fix java dependency updates
aws-observability · Oct 12, 2023 · 9bed4de · 9bed4de
2 parents 1e434bb + c975575
commit 9bed4de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...pling-tests/sample-apps/spring-boot/src/main/java/com/amazon/sampleapp/AppController.java b/...pling-tests/sample-apps/spring-boot/src/main/java/com/amazon/sampleapp/AppController.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import java.time.Duration;
 
-import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
+import io.opentelemetry.semconv.ResourceAttributes;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -36,7 +36,7 @@ public class AppController {
     }
 
     Resource resource = Resource.builder()
-            .put(SERVICE_NAME, serviceName)
+            .put(ResourceAttributes.SERVICE_NAME, serviceName)
             .build();
 
     OpenTelemetry openTelemetry =

diff --git a/sample-apps/java-sample-app/manual/build.gradle.kts b/sample-apps/java-sample-app/manual/build.gradle.kts
@@ -45,7 +45,7 @@ jib {
 dependencies {
 
     // OpenTelemetry APIs and SDKs
-    implementation(platform("io.opentelemetry:opentelemetry-bom:1.31.0"))
+    implementation(platform("io.opentelemetry:opentelemetry-bom:1.30.1"))
     implementation("io.opentelemetry:opentelemetry-api")
     implementation("io.opentelemetry:opentelemetry-sdk")
 

diff --git a/...e-apps/java-sample-app/manual/src/main/java/software/amazon/adot/sampleapp/ManualApp.java b/...e-apps/java-sample-app/manual/src/main/java/software/amazon/adot/sampleapp/ManualApp.java
@@ -47,8 +47,6 @@
 import software.amazon.awssdk.services.s3.S3Client;
 import spark.Response;
 
-import java.util.List;
-
 public class ManualApp extends BaseApp {
 
     private static final String REQUEST_OTEL_SCOPE = "requestOtelContext";