More OTLP support (#1908)

* More OTLP support

* And bump submodule

* Better error logging

* Fix sporadic CI failure

Author: trask

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/ConfigOverride.java

@@ -28,6 +28,7 @@
 import io.opentelemetry.instrumentation.api.config.Config;
 import io.opentelemetry.instrumentation.api.config.ConfigBuilder;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 class ConfigOverride {
@@ -99,17 +100,22 @@ static Config getConfig(Configuration config) {
 
     properties.put("otel.propagators", DelegatingPropagatorProvider.NAME);
 
-    String tracesExporter = System.getProperty("otel.traces.exporter");
-    if (tracesExporter == null) {
-      tracesExporter = System.getenv("OTEL_TRACES_EXPORTER");
-    }
+    String tracesExporter = getProperty("otel.traces.exporter");
     if (tracesExporter == null) {
       // currently Application Insights Exporter has to be configured manually because it relies on
       // using a BatchSpanProcessor with queue size 1 due to live metrics (this will change in the
       // future)
       properties.put("otel.traces.exporter", "none");
     } else {
       properties.put("otel.traces.exporter", tracesExporter);
+      // when using another exporter, populate otel.service.name and otel.resource.attributes
+      if (config.role.name != null) {
+        properties.put("otel.service.name", config.role.name);
+      }
+      String resourceAttributes = getProperty("otel.resource.attributes");
+      if (resourceAttributes != null) {
+        properties.put("otel.resource.attributes", resourceAttributes);
+      }
     }
 
     String metricsExporter = System.getProperty("otel.metrics.exporter");
@@ -127,5 +133,14 @@ static Config getConfig(Configuration config) {
     return new ConfigBuilder().readProperties(properties).build();
   }
 
+  private static String getProperty(String propertyName) {
+    String value = System.getProperty(propertyName);
+    if (value != null) {
+      return value;
+    }
+    String envVarName = propertyName.replace('.', '_').toUpperCase(Locale.ROOT);
+    return System.getenv(envVarName);
+  }
+
   private ConfigOverride() {}
 }

otel

@@ -6,6 +6,10 @@ do
   sleep 1
 done
 
+# need to give time for app.jar to be completely copied, otherwise sporadic
+# Error: Invalid or corrupt jarfile app.jar
+sleep 5
+
 if [ ! -z "$AI_AGENT_MODE" ]; then
 
     echo "AI_AGENT_MODE=$AI_AGENT_MODE"

test/smoke/appServers/JavaSE/resources/linux/startServer.sh

@@ -180,15 +180,25 @@ public void execOnContainer(String id, String cmd, String... args)
         p,
         10,
         TimeUnit.SECONDS,
-        String.format("executing command on container %s: '%s'", id, Joiner.on(' ').join(cmdList)));
+        String.format("executing command on container %s: '%s'", id, Joiner.on(' ').join(cmdList)),
+        id);
     flushStdout(p);
   }
 
   private static void waitAndCheckCodeForProcess(
       Process p, long timeout, TimeUnit unit, String actionName)
       throws IOException, InterruptedException {
+    waitAndCheckCodeForProcess(p, timeout, unit, actionName, null);
+  }
+
+  private static void waitAndCheckCodeForProcess(
+      Process p, long timeout, TimeUnit unit, String actionName, String containerId)
+      throws IOException, InterruptedException {
     waitForProcessToReturn(p, timeout, unit, actionName);
     if (p.exitValue() != 0) {
+      if (containerId != null) {
+        printContainerLogs(containerId);
+      }
       flushStdout(p);
       throw new SmokeTestException(
           String.format(