NH-120449: add proxy for http getSettings

Author: cleverchuk

build.gradle.kts

@@ -18,7 +18,7 @@ plugins{
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
-val swoAgentVersion = "3.0.1"
+val swoAgentVersion = "3.0.2"
 extra["swoAgentVersion"] = swoAgentVersion
 group = "com.solarwinds"
 version = if (System.getenv("SNAPSHOT_BUILD").toBoolean()) "$swoAgentVersion-SNAPSHOT" else swoAgentVersion

custom/src/main/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegate.java

@@ -16,6 +16,9 @@
 
 package com.solarwinds.opentelemetry.extensions.config;
 
+import com.solarwinds.joboe.config.ConfigManager;
+import com.solarwinds.joboe.config.ConfigProperty;
+import com.solarwinds.joboe.config.ProxyConfig;
 import com.solarwinds.joboe.logging.Logger;
 import com.solarwinds.joboe.logging.LoggerFactory;
 import com.solarwinds.joboe.sampling.Settings;
@@ -26,6 +29,8 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.net.URL;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -88,7 +93,16 @@ private String getErrorMessage(HttpURLConnection connection) {
   }
 
   HttpURLConnection getHttpUrlConnection(URL url, String authorizationHeader) throws IOException {
-    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+    HttpURLConnection connection;
+    ProxyConfig proxyConfig = (ProxyConfig) ConfigManager.getConfig(ConfigProperty.AGENT_PROXY);
+    if (proxyConfig != null) {
+      Proxy proxy =
+          new Proxy(
+              Proxy.Type.HTTP, new InetSocketAddress(proxyConfig.getHost(), proxyConfig.getPort()));
+      connection = (HttpURLConnection) url.openConnection(proxy);
+    } else {
+      connection = (HttpURLConnection) url.openConnection();
+    }
 
     connection.setRequestMethod("GET");
     connection.setRequestProperty("Authorization", authorizationHeader);

custom/src/test/java/com/solarwinds/opentelemetry/extensions/config/HttpSettingsReaderDelegateTest.java

@@ -27,6 +27,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import com.solarwinds.joboe.config.ConfigManager;
+import com.solarwinds.joboe.config.ConfigProperty;
+import com.solarwinds.joboe.config.InvalidConfigException;
+import com.solarwinds.joboe.config.ProxyConfig;
 import com.solarwinds.joboe.sampling.Settings;
 import io.opentelemetry.api.internal.InstrumentationUtil;
 import java.io.ByteArrayInputStream;
@@ -198,4 +202,22 @@ void testGetHttpUrlConnection_Configuration() throws IOException {
     verify(mockConnection).setConnectTimeout(10000);
     verify(mockConnection).setReadTimeout(10000);
   }
+
+  @Test
+  void testGetHttpUrlConnectionConfigurationProxy() throws IOException, InvalidConfigException {
+    ConfigManager.setConfig(ConfigProperty.AGENT_PROXY, new ProxyConfig("localhost", 1000,"test","test"));
+    when(mockUrl.openConnection(any())).thenReturn(mockConnection);
+
+    HttpURLConnection result = tested.getHttpUrlConnection(mockUrl, TEST_AUTH_HEADER);
+
+    assertEquals(mockConnection, result);
+
+    verify(mockConnection).setRequestMethod("GET");
+    verify(mockConnection).setRequestProperty("Authorization", TEST_AUTH_HEADER);
+    verify(mockConnection).setRequestProperty("Content-Type", "application/json");
+
+    verify(mockConnection).setRequestProperty("Accept", "application/json");
+    verify(mockConnection).setConnectTimeout(10000);
+    verify(mockConnection).setReadTimeout(10000);
+  }
 }