Close leaky resources in azure-resources, jfr-connection

Author: jack-berg

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureMetadataService.java

@@ -46,9 +46,7 @@ static Optional<String> fetchMetadata(URL url) {
             .connectTimeout(TIMEOUT)
             .readTimeout(TIMEOUT)
             .build();
-
     Request request = new Request.Builder().url(url).get().addHeader("Metadata", "true").build();
-
     try (Response response = client.newCall(request).execute()) {
       int responseCode = response.code();
       if (responseCode != 200) {
@@ -62,11 +60,13 @@ static Optional<String> fetchMetadata(URL url) {
                 + response.message());
         return Optional.empty();
       }
-
       return Optional.of(requireNonNull(response.body()).string());
     } catch (IOException e) {
       logger.log(Level.FINE, "Failed to fetch Azure VM metadata", e);
       return Optional.empty();
+    } finally {
+      client.dispatcher().executorService().shutdown();
+      client.connectionPool().evictAll();
     }
   }
 

jfr-connection/src/main/java/io/opentelemetry/contrib/jfr/connection/JfcFileConfiguration.java

@@ -33,13 +33,15 @@ public JfcFileConfiguration(InputStream configurationFile) {
   }
 
   private static String readConfigurationFile(InputStream inputStream) {
-    if (inputStream != null) {
-      return new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
-          .lines()
-          .collect(Collectors.joining());
-    } else {
+    if (inputStream == null) {
       throw new IllegalArgumentException("Null configuration provided");
     }
+    try (BufferedReader reader =
+        new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+      return reader.lines().collect(Collectors.joining());
+    } catch (IOException e) {
+      throw new IllegalStateException("Failed to read JFC configuration file", e);
+    }
   }
 
   @Override