|
8 | 8 | import datadog.trace.agent.tooling.Instrumenter; |
9 | 9 | import datadog.trace.agent.tooling.InstrumenterModule; |
10 | 10 | import java.io.BufferedReader; |
11 | | -import java.io.IOException; |
12 | 11 | import java.io.InputStream; |
13 | 12 | import java.io.InputStreamReader; |
14 | 13 | import java.util.ArrayList; |
@@ -61,34 +60,27 @@ public static void onExit() { |
61 | 60 | tracerResources.add("metrics/jmxfetch-config.yaml"); |
62 | 61 | tracerResources.add("metrics/jmxfetch-websphere-config.yaml"); |
63 | 62 |
|
64 | | - { |
65 | | - // jmxfetch integrations metricconfigs |
66 | | - String metricConfigsPath = "metrics/datadog/trace/agent/jmxfetch/"; |
67 | | - String metricConfigs = metricConfigsPath + "metricconfigs.txt"; |
68 | | - tracerResources.add(metricConfigs); |
69 | | - InputStream is = ClassLoader.getSystemResourceAsStream(metricConfigs); |
70 | | - if (is == null) { |
71 | | - System.err.println("ERROR: metricconfigs.txt not found"); |
72 | | - } else |
73 | | - try (BufferedReader reader = new BufferedReader(new InputStreamReader(is))) { |
74 | | - String metricConfig; |
75 | | - while ((metricConfig = reader.readLine()) != null) { |
76 | | - if (!metricConfig.trim().isEmpty()) { |
77 | | - tracerResources.add(metricConfigsPath + "metricconfigs/" + metricConfig); |
78 | | - } |
79 | | - } |
80 | | - } catch (IOException e) { |
81 | | - System.err.println("ERROR: reading metricconfig: " + e); |
| 63 | + // jmxfetch integrations metricconfigs |
| 64 | + String metricConfigsPath = "metrics/datadog/trace/agent/jmxfetch/"; |
| 65 | + String metricConfigs = metricConfigsPath + "metricconfigs.txt"; |
| 66 | + tracerResources.add(metricConfigs); |
| 67 | + try (InputStream is = ClassLoader.getSystemResourceAsStream(metricConfigs); |
| 68 | + BufferedReader reader = new BufferedReader(new InputStreamReader(is))) { |
| 69 | + String metricConfig; |
| 70 | + while ((metricConfig = reader.readLine()) != null) { |
| 71 | + if (!metricConfig.trim().isEmpty()) { |
| 72 | + tracerResources.add(metricConfigsPath + "metricconfigs/" + metricConfig); |
82 | 73 | } |
| 74 | + } |
| 75 | + } catch (Throwable ignore) { |
83 | 76 | } |
84 | 77 |
|
85 | 78 | // registering tracer resources to include in the native build |
86 | 79 | for (String original : tracerResources) { |
87 | 80 | String flattened = original.substring(original.indexOf('/') + 1); |
88 | 81 | try (InputStream is = ClassLoader.getSystemResourceAsStream(original)) { |
89 | 82 | Resources.registerResource(flattened, is); |
90 | | - } catch (Throwable t) { |
91 | | - System.err.println("ERROR: reading `" + original + "` " + t); |
| 83 | + } catch (Throwable ignore) { |
92 | 84 | } |
93 | 85 | } |
94 | 86 | } |
|
0 commit comments