NH-119398: preserve user protocol selection

Author: cleverchuk

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

@@ -49,6 +49,8 @@
 import com.solarwinds.opentelemetry.extensions.config.parser.json.TransactionNamingSchemesParser;
 import com.solarwinds.opentelemetry.extensions.config.parser.json.TransactionSettingsConfigParser;
 import com.solarwinds.opentelemetry.extensions.config.parser.json.UrlSampleRateConfigParser;
+import lombok.Getter;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -70,7 +72,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.stream.Collectors;
-import lombok.Getter;
 
 public class ConfigurationLoader {
   private static final Logger logger = LoggerFactory.getLogger();
@@ -219,15 +220,23 @@ static void configureOtelLogExport(ConfigContainer container) throws InvalidConf
         }
       }
 
-      setSystemProperty("otel.exporter.otlp.logs.protocol", PROTOCOL);
+      String protocol = setProtocol("otel.exporter.otlp.logs.protocol");
       setSystemProperty("otel.logs.exporter", "otlp");
       setSystemProperty(
           "otel.exporter.otlp.logs.headers", String.format("authorization=Bearer %s", apiKey));
 
+      if (protocol.equalsIgnoreCase("grpc")) {
+        setEndpoint(
+                "otel.exporter.otlp.logs.endpoint",
+                String.format("https://otel.collector.%s.%s.solarwinds.com", dataCell, env),
+                "");
+        return;
+      }
+
       setEndpoint(
-          "otel.exporter.otlp.logs.endpoint",
-          String.format("https://otel.collector.%s.%s.solarwinds.com/v1/logs", dataCell, env),
-          "/v1/logs");
+              "otel.exporter.otlp.logs.endpoint",
+              String.format("https://otel.collector.%s.%s.solarwinds.com/v1/logs", dataCell, env),
+              "/v1/logs");
     }
   }
 
@@ -256,11 +265,19 @@ static void configureOtelMetricExport(ConfigContainer container) throws InvalidC
       }
     }
 
-    setSystemProperty("otel.exporter.otlp.metrics.protocol", PROTOCOL);
+    String protocol = setProtocol("otel.exporter.otlp.metrics.protocol");
     setSystemProperty("otel.metrics.exporter", "otlp");
     setSystemProperty(
         "otel.exporter.otlp.metrics.headers", String.format("authorization=Bearer %s", apiKey));
 
+    if (protocol.equalsIgnoreCase("grpc")) {
+      setEndpoint(
+              "otel.exporter.otlp.metrics.endpoint",
+              String.format("https://otel.collector.%s.%s.solarwinds.com", dataCell, env),
+              "");
+      return;
+    }
+
     setEndpoint(
         "otel.exporter.otlp.metrics.endpoint",
         String.format("https://otel.collector.%s.%s.solarwinds.com/v1/metrics", dataCell, env),
@@ -293,10 +310,18 @@ static void configureOtelTraceExport(ConfigContainer container) throws InvalidCo
       }
     }
 
-    setSystemProperty("otel.exporter.otlp.traces.protocol", PROTOCOL);
+    String protocol = setProtocol("otel.exporter.otlp.traces.protocol");
     setSystemProperty(
         "otel.exporter.otlp.traces.headers", String.format("authorization=Bearer %s", apiKey));
 
+    if (protocol.equalsIgnoreCase("grpc")){
+        setEndpoint(
+                "otel.exporter.otlp.traces.endpoint",
+                String.format("https://otel.collector.%s.%s.solarwinds.com", dataCell, env),
+                "");
+        return;
+    }
+
     setEndpoint(
         "otel.exporter.otlp.traces.endpoint",
         String.format("https://otel.collector.%s.%s.solarwinds.com/v1/traces", dataCell, env),
@@ -630,11 +655,14 @@ public static void processConfigs(ConfigContainer configs) throws InvalidConfigE
     ConfigManager.initialize(configs);
   }
 
-  private static void setSystemProperty(String key, String value) {
+  private static String setSystemProperty(String key, String value) {
     String propertyValue = getConfigValue(key);
     if (propertyValue == null) {
       System.setProperty(key, value);
+      return value;
     }
+
+    return propertyValue;
   }
 
   private static void setEndpoint(String key, String value, String path) {
@@ -646,6 +674,14 @@ private static void setEndpoint(String key, String value, String path) {
     }
   }
 
+  private static String setProtocol(String key) {
+    String protocol = getConfigValue("otel.exporter.otlp.protocol");
+    if (protocol == null) {
+     return setSystemProperty(key, ConfigurationLoader.PROTOCOL);
+    }
+    return protocol;
+  }
+
   static String normalize(String key) {
     return key.toUpperCase().replace(".", "_");
   }

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

@@ -468,6 +468,62 @@ void verifyTraceEndpointIsProperlyConfigured() throws InvalidConfigException {
         System.getProperty("otel.exporter.otlp.traces.endpoint"));
   }
 
+  @Test
+  @SetSystemProperty(
+      key = "otel.exporter.otlp.endpoint",
+      value = "https://otel.collector.na-01.cloud.solarwinds.com")
+  @SetSystemProperty(
+      key = "otel.exporter.otlp.metrics.protocol",
+      value = "grpc")
+  @ClearSystemProperty(key = "otel.exporter.otlp.metrics.endpoint")
+  void verifyMetricsEndpointIsProperlyConfiguredForGRPC() throws InvalidConfigException {
+    ConfigContainer configContainer = new ConfigContainer();
+    configContainer.putByStringValue(ConfigProperty.AGENT_SERVICE_KEY, "token:service");
+
+    configContainer.putByStringValue(ConfigProperty.AGENT_EXPORT_METRICS_ENABLED, "true");
+    ConfigurationLoader.configureOtelMetricExport(configContainer);
+    assertEquals(
+        "https://otel.collector.na-01.cloud.solarwinds.com",
+        System.getProperty("otel.exporter.otlp.metrics.endpoint"));
+  }
+
+  @Test
+  @SetSystemProperty(
+      key = "otel.exporter.otlp.endpoint",
+      value = "https://otel.collector.na-01.cloud.solarwinds.com")
+  @SetSystemProperty(
+      key = "otel.exporter.otlp.traces.protocol",
+      value = "grpc")
+  @ClearSystemProperty(key = "otel.exporter.otlp.traces.endpoint")
+  void verifyTracesEndpointIsProperlyConfiguredForGRPC() throws InvalidConfigException {
+    ConfigContainer configContainer = new ConfigContainer();
+    configContainer.putByStringValue(ConfigProperty.AGENT_SERVICE_KEY, "token:service");
+
+    ConfigurationLoader.configureOtelTraceExport(configContainer);
+    assertEquals(
+        "https://otel.collector.na-01.cloud.solarwinds.com",
+        System.getProperty("otel.exporter.otlp.traces.endpoint"));
+  }
+
+  @Test
+  @SetSystemProperty(
+      key = "otel.exporter.otlp.endpoint",
+      value = "https://otel.collector.na-01.cloud.solarwinds.com")
+  @SetSystemProperty(
+      key = "otel.exporter.otlp.logs.protocol",
+      value = "grpc")
+  @ClearSystemProperty(key = "otel.exporter.otlp.logs.endpoint")
+  void verifyLogsEndpointIsProperlyConfiguredForGRPC() throws InvalidConfigException {
+    ConfigContainer configContainer = new ConfigContainer();
+    configContainer.putByStringValue(ConfigProperty.AGENT_SERVICE_KEY, "token:service");
+
+    configContainer.putByStringValue(ConfigProperty.AGENT_EXPORT_LOGS_ENABLED, "true");
+    ConfigurationLoader.configureOtelLogExport(configContainer);
+    assertEquals(
+        "https://otel.collector.na-01.cloud.solarwinds.com",
+        System.getProperty("otel.exporter.otlp.logs.endpoint"));
+  }
+
   @Test
   void returnEnvironmentVariableEquivalent() {
     assertEquals(