Handle build-info.properties file not present case

open-telemetry · Sep 18, 2023 · 282da0d · 282da0d
1 parent cc1c5c7
commit 282da0d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/...a/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java b/...a/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java
@@ -49,7 +49,7 @@ public Resource createResource(ConfigProperties config) {
 
   private Optional<String> getServiceVersionFromBuildInfo() {
     try (InputStream in = system.openClasspathResource("build-info.properties", "META-INF")) {
-      return getServiceVersionPropertyFromStream(in);
+      return in != null ? getServiceVersionPropertyFromStream(in) : Optional.empty();
     } catch (Exception e) {
       return Optional.empty();
     }

diff --git a/.../opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java b/.../opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetectorTest.java
@@ -36,6 +36,25 @@ void givenBuildVersionIsPresentInBuildInfProperties_thenReturnBuildVersion() {
     assertThat(result.getAttribute(SERVICE_VERSION)).isEqualTo("0.0.2");
   }
 
+  @Test
+  void givenBuildVersionFileNotPresent_thenReturnEmptyResource() {
+    when(system.openClasspathResource(BUILD_PROPS, META_INFO)).thenReturn(null);
+
+    SpringBootServiceVersionDetector guesser = new SpringBootServiceVersionDetector(system);
+    Resource result = guesser.createResource(config);
+    assertThat(result).isEqualTo(Resource.empty());
+  }
+
+  @Test
+  void givenBuildVersionFileIsPresentButBuildVersionPropertyNotPresent_thenReturnEmptyResource() {
+    when(system.openClasspathResource(BUILD_PROPS, META_INFO))
+        .thenReturn(openClasspathResource(BUILD_PROPS));
+
+    SpringBootServiceVersionDetector guesser = new SpringBootServiceVersionDetector(system);
+    Resource result = guesser.createResource(config);
+    assertThat(result).isEqualTo(Resource.empty());
+  }
+
   private InputStream openClasspathResource(String resource) {
     return getClass().getClassLoader().getResourceAsStream(resource);
   }

diff --git a/...rumentation/spring/spring-boot-resources/library/src/test/resources/build-info.properties b/...rumentation/spring/spring-boot-resources/library/src/test/resources/build-info.properties
@@ -0,0 +1,2 @@
+build.artifact=something
+build.name=some-name