Merge pull request #247 from solarwinds/cc/NH-84912

NH-84912: remove layer logic for settings

build.gradle

@@ -44,8 +44,8 @@ subprojects {
                 opentelemetryJavaagent: "2.5.0",
                 bytebuddy             : "1.12.10",
                 guava                 : "30.1-jre",
-                joboe                 : "10.0.6",
-                agent                 : "2.5.0", // the custom distro agent version
+                joboe                 : "10.0.8",
+                agent                 : "2.5.1", // the custom distro agent version
                 autoservice           : "1.0.1",
                 caffeine              : "2.9.3",
                 json : "20231013",

custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcher.java

@@ -22,8 +22,6 @@
 import com.solarwinds.joboe.sampling.Settings;
 import com.solarwinds.joboe.sampling.SettingsFetcher;
 import com.solarwinds.joboe.sampling.SettingsListener;
-import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 
 public class AwsLambdaSettingsFetcher implements SettingsFetcher {
@@ -45,26 +43,7 @@ public Settings getSettings() {
     if (settings == null
         || System.currentTimeMillis() - settings.getTimestamp() > settings.getTtl() * 1000) {
       try {
-        Map<String, Settings> allSettings = settingsReader.getSettings();
-        if (allSettings.isEmpty()) {
-          logger.warn("No Settings returned by the Settings Reader!");
-
-        } else {
-          settings = allSettings.get(DEFAULT_LAYER);
-          if (settings == null) {
-            logger.debug("Cannot find Settings with empty ID. Trying to locate the default record");
-            Optional<Settings> defaultSetting =
-                allSettings.values().stream().filter(Settings::isDefault).findFirst();
-
-            if (defaultSetting.isPresent()) {
-              settings = defaultSetting.get();
-            } else {
-              logger.warn(
-                  "Cannot find Settings with empty ID nor a default record... using the first record");
-              settings = allSettings.values().iterator().next();
-            }
-          }
-        }
+        settings = settingsReader.getSettings();
 
       } catch (SamplingException e) {
         logger.debug(

custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/FileSettingsReader.java

@@ -28,7 +28,6 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 public class FileSettingsReader {
@@ -43,23 +42,25 @@ public FileSettingsReader(String settingsFilePath) {
     this.settingsFilePath = settingsFilePath;
   }
 
-  public Map<String, Settings> getSettings() throws SamplingException {
+  public Settings getSettings() throws SamplingException {
+    Settings settings = null;
     try {
       byte[] bytes = Files.readAllBytes(Paths.get(settingsFilePath));
-      Map<String, Settings> kvSetting =
-          convertToSettingsMap(gson.fromJson(new String(bytes), type));
+      List<Settings> kvSetting = convertToSettingsMap(gson.fromJson(new String(bytes), type));
       logger.debug(String.format("Got settings from file: %s", kvSetting));
 
-      return kvSetting;
+      if (!kvSetting.isEmpty()) {
+        settings = kvSetting.get(0);
+      }
 
     } catch (IOException e) {
       logger.debug(String.format("Failed to read settings from file, error: %s", e));
       throw new SamplingException("Error reading settings from file");
     }
+    return settings;
   }
 
-  private Map<String, Settings> convertToSettingsMap(List<JsonSettings> jsonSettings) {
-    return jsonSettings.stream()
-        .collect(Collectors.toMap(JsonSettings::getLayer, FileSettings::new));
+  private List<Settings> convertToSettingsMap(List<JsonSettings> jsonSettings) {
+    return jsonSettings.stream().map(FileSettings::new).collect(Collectors.toList());
   }
 }

custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/AwsLambdaSettingsFetcherTest.java

@@ -24,8 +24,6 @@
 import com.solarwinds.joboe.sampling.SamplingException;
 import com.solarwinds.joboe.sampling.Settings;
 import com.solarwinds.joboe.sampling.SettingsListener;
-import java.util.Collections;
-import java.util.HashMap;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -45,13 +43,7 @@ class AwsLambdaSettingsFetcherTest {
 
   @Test
   void returnSettingsWhenNoSettings() throws SamplingException {
-    when(fileSettingsReaderMock.getSettings())
-        .thenReturn(
-            new HashMap<>() {
-              {
-                put("", settingsMock);
-              }
-            });
+    when(fileSettingsReaderMock.getSettings()).thenReturn(settingsMock);
 
     tested.getSettings();
 
@@ -60,13 +52,7 @@ void returnSettingsWhenNoSettings() throws SamplingException {
 
   @Test
   void returnSettingsWhenSettingsExpired() throws SamplingException {
-    when(fileSettingsReaderMock.getSettings())
-        .thenReturn(
-            new HashMap<>() {
-              {
-                put("", settingsMock);
-              }
-            });
+    when(fileSettingsReaderMock.getSettings()).thenReturn(settingsMock);
 
     when(settingsMock.getTimestamp()).thenReturn(0L);
     when(settingsMock.getTtl()).thenReturn(0L);
@@ -79,13 +65,7 @@ void returnSettingsWhenSettingsExpired() throws SamplingException {
 
   @Test
   void callListenerOnSettingsRetrieved() throws SamplingException {
-    when(fileSettingsReaderMock.getSettings())
-        .thenReturn(
-            new HashMap<>() {
-              {
-                put("", settingsMock);
-              }
-            });
+    when(fileSettingsReaderMock.getSettings()).thenReturn(settingsMock);
 
     tested.registerListener(settingsListenerMock);
     tested.getSettings();
@@ -95,7 +75,7 @@ void callListenerOnSettingsRetrieved() throws SamplingException {
 
   @Test
   void returnNullWhenNoSettings() throws SamplingException {
-    when(fileSettingsReaderMock.getSettings()).thenReturn(Collections.emptyMap());
+    when(fileSettingsReaderMock.getSettings()).thenReturn(null);
 
     tested.getSettings();
 

custom/lambda/src/test/java/com/solarwinds/opentelemetry/extensions/FileSettingsReaderTest.java

@@ -16,21 +16,20 @@
 
 package com.solarwinds.opentelemetry.extensions;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.solarwinds.joboe.sampling.SamplingException;
 import com.solarwinds.joboe.sampling.Settings;
-import java.util.Map;
 import org.junit.jupiter.api.Test;
 
 class FileSettingsReaderTest {
-  private FileSettingsReader tested =
+  private final FileSettingsReader tested =
       new FileSettingsReader(
           FileSettingsReader.class.getResource("/solarwinds-apm-settings.json").getPath());
 
   @Test
   void returnSettings() throws SamplingException {
-    Map<String, Settings> settings = tested.getSettings();
-    assertEquals(1, settings.size());
+    Settings settings = tested.getSettings();
+    assertNotNull(settings);
   }
 }