Add jmxfetch integrations metricconfigs for native builds

Add more extensive error reporting related to metricconfigs

Author: ygree

dd-java-agent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/JMXFetch.java

@@ -9,6 +9,7 @@
 import datadog.trace.api.StatsDClient;
 import datadog.trace.api.StatsDClientManager;
 import datadog.trace.api.flare.TracerFlare;
+import datadog.trace.api.telemetry.LogCollector;
 import de.thetaphi.forbiddenapis.SuppressForbidden;
 import java.io.IOException;
 import java.io.InputStream;
@@ -174,6 +175,7 @@ private static List<String> getInternalMetricFiles() {
         log.debug("metricconfigs not found. returning empty set");
         return Collections.emptyList();
       }
+      log.debug("reading found metricconfigs");
       Scanner scanner = new Scanner(metricConfigsStream);
       scanner.useDelimiter("\n");
       final List<String> result = new ArrayList<>();
@@ -183,8 +185,19 @@ private static List<String> getInternalMetricFiles() {
         integrationName.clear();
         integrationName.add(config.replace(".yaml", ""));
 
-        if (Config.get().isJmxFetchIntegrationEnabled(integrationName, false)) {
+        if (!Config.get().isJmxFetchIntegrationEnabled(integrationName, false)) {
+          log.debug(
+              "skipping metric config `{}` because integration {} is disabled",
+              config,
+              integrationName);
+        } else {
           final URL resource = JMXFetch.class.getResource("metricconfigs/" + config);
+          if (resource == null) {
+            log.debug(
+                LogCollector.SEND_TELEMETRY, "metric config `{}` not found. skipping", config);
+            continue;
+          }
+          log.debug("adding metric config `{}`", config);
 
           // jar!/ means a file internal to a jar, only add the part after if it exists
           final String path = resource.getPath();

dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/ResourcesFeatureInstrumentation.java

@@ -7,7 +7,12 @@
 import com.oracle.svm.core.jdk.Resources;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.agent.tooling.InstrumenterModule;
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
 import net.bytebuddy.asm.Advice;
 
 @AutoService(InstrumenterModule.class)
@@ -33,32 +38,57 @@ public static void onExit() {
       // (drop trace/shared prefixes from embedded resources, so we can find them in native-image
       // as the final executable won't have our isolating class-loader to map these resources)
 
-      String[] tracerResources = {
-        "dd-java-agent.version",
-        "dd-trace-api.version",
-        "trace/dd-trace-core.version",
-        "shared/dogstatsd/version.properties",
-        "shared/version-utils.version",
-        "shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz",
-        "profiling/jfr/dd.jfp",
-        "profiling/jfr/safepoints.jfp",
-        "profiling/jfr/overrides/comprehensive.jfp",
-        "profiling/jfr/overrides/minimal.jfp",
-        // jmxfetch configs
-        "metrics/project.properties", // org.datadog.jmxfetch.AppConfig reads its version
-        "metrics/org/datadog/jmxfetch/default-jmx-metrics.yaml",
-        "metrics/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml",
-        "metrics/org/datadog/jmxfetch/old-gc-default-jmx-metrics.yaml",
-        // tracer's jmxfetch configs
-        "metrics/jmxfetch-config.yaml",
-        "metrics/jmxfetch-websphere-config.yaml",
-      };
+      List<String> tracerResources = new ArrayList<>();
+      tracerResources.add("dd-java-agent.version");
+      tracerResources.add("dd-trace-api.version");
+      tracerResources.add("trace/dd-trace-core.version");
+      tracerResources.add("shared/dogstatsd/version.properties");
+      tracerResources.add("shared/version-utils.version");
+      tracerResources.add("shared/datadog/okhttp3/internal/publicsuffix/publicsuffixes.gz");
+      tracerResources.add("profiling/jfr/dd.jfp");
+      tracerResources.add("profiling/jfr/safepoints.jfp");
+      tracerResources.add("profiling/jfr/overrides/comprehensive.jfp");
+      tracerResources.add("profiling/jfr/overrides/minimal.jfp");
 
+      // jmxfetch configs
+      tracerResources.add(
+          "metrics/project.properties"); // org.datadog.jmxfetch.AppConfig reads its version
+      tracerResources.add("metrics/org/datadog/jmxfetch/default-jmx-metrics.yaml");
+      tracerResources.add("metrics/org/datadog/jmxfetch/new-gc-default-jmx-metrics.yaml");
+      tracerResources.add("metrics/org/datadog/jmxfetch/old-gc-default-jmx-metrics.yaml");
+
+      // tracer's jmxfetch configs
+      tracerResources.add("metrics/jmxfetch-config.yaml");
+      tracerResources.add("metrics/jmxfetch-websphere-config.yaml");
+
+      {
+        // jmxfetch integrations metricconfigs
+        String metricConfigsPath = "metrics/datadog/trace/agent/jmxfetch/";
+        String metricConfigs = metricConfigsPath + "metricconfigs.txt";
+        tracerResources.add(metricConfigs);
+        InputStream is = ClassLoader.getSystemResourceAsStream(metricConfigs);
+        if (is == null) {
+          System.err.println("ERROR: metricconfigs.txt not found");
+        } else
+          try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+            String metricConfig;
+            while ((metricConfig = reader.readLine()) != null) {
+              if (!metricConfig.trim().isEmpty()) {
+                tracerResources.add(metricConfigsPath + "metricconfigs/" + metricConfig);
+              }
+            }
+          } catch (IOException e) {
+            System.err.println("ERROR: reading metricconfig: " + e);
+          }
+      }
+
+      // registering tracer resources to include in the native build
       for (String original : tracerResources) {
         String flattened = original.substring(original.indexOf('/') + 1);
         try (InputStream is = ClassLoader.getSystemResourceAsStream(original)) {
           Resources.registerResource(flattened, is);
-        } catch (Throwable ignore) {
+        } catch (Throwable t) {
+          System.err.println("ERROR: reading `" + original + "` " + t);
         }
       }
     }