wip multiple exporters

rjenkins · rjenkins · commit 267f87613331 · 2025-07-24T15:57:20.000-07:00
diff --git a/npm/app/__tests__/config.ts b/npm/app/__tests__/config.ts
@@ -51,7 +51,7 @@ describe('configuration and validation', () => {
         process.env.ROTEL_OTLP_EXPORTER_TLS_KEY_FILE = "key.file";
         process.env.ROTEL_OTLP_EXPORTER_TLS_CA_FILE = "ca.file";
         process.env.ROTEL_OTLP_EXPORTER_TLS_SKIP_VERIFY = "true";
-        let c = Config._load_otlp_exporter_options_from_env(null);
+        let c = Config._load_otlp_exporter_options_from_env("OTLP_EXPORTER_", null);
         expect(c?.endpoint).toBe("https://api.foo.com");
         expect(c?.protocol).toBe("http");
         expect(c?.headers).toStrictEqual({"[x-api-key": "123]"})
@@ -68,8 +68,18 @@ describe('configuration and validation', () => {
         expect(c?.tls_skip_verify).toBe(true);
     });
 
+    it('Load DatadogExporter config from ENV', () => {
+        process.env.ROTEL_DATADOG_EXPORTER_REGION = "us1";
+        process.env.ROTEL_DATADOG_EXPORTER_CUSTOM_ENDPOINT = "http://localhost:5555";
+        process.env.ROTEL_DATADOG_EXPORTER_API_KEY = "123abc";
+        let c = Config._load_datadog_exporter_options_from_env("DATADOG_EXPORTER_");
+        expect(c.region).toBe("us1");
+        expect(c.custom_endpoint).toBe("http://localhost:5555");
+        expect(c.api_key).toBe("123abc");
+    });
+
     it('fails validation', () => {
-        
+        process.env.ROTEL_ENABLED = "true";
         const c1 = new Config();
         c1.options.exporter = {protocol: "X.500"};
         expect(c1.validate()).toBe(false)
@@ -78,4 +88,6 @@ describe('configuration and validation', () => {
         c2.options.log_format = "ascii";
         expect(c2.validate()).toBe(false)
     });
-});
+});
+
+
diff --git a/npm/app/config.ts b/npm/app/config.ts
@@ -23,11 +23,19 @@ export interface OTLPExporterEndpoint {
 
 // TODO: when we have more, include a key that defines this exporter type
 export interface OTLPExporter extends OTLPExporterEndpoint {
-    traces?: OTLPExporterEndpoint;
+    _type?: string 
+    traces?: OTLPExporterEndpoint | DatadogExporter;
     metrics?: OTLPExporterEndpoint;
     logs?: OTLPExporterEndpoint;
 }
 
+export interface DatadogExporter {
+    _type?: string 
+    region?: string 
+    custom_endpoint?: string 
+    api_key?: string 
+}
+
 export interface Options {
     enabled?: boolean;
     pid_file?: string;
@@ -39,7 +47,11 @@ export interface Options {
     otlp_receiver_traces_disabled?: boolean;
     otlp_receiver_metrics_disabled?: boolean;
     otlp_receiver_logs_disabled?: boolean;
-    exporter?: OTLPExporter;
+    exporter?: OTLPExporter | DatadogExporter;
+    exporters?: Record<string, OTLPExporter | DatadogExporter | undefined>
+    exporters_metrics?: string[] | undefined
+    exporters_traces?: string[] | undefined
+    exporters_logs?: string[] | undefined
 }
 
 export class Config {
@@ -84,26 +96,74 @@ export class Config {
             otlp_receiver_logs_disabled: as_bool(rotel_env("OTLP_RECEIVER_LOGS_DISABLED")),
         };
 
-        const exporter_type = as_lower(rotel_env("EXPORTER"));
-        if (exporter_type === null || exporter_type === "otlp") {
-            let exporter: OTLPExporter = Config._load_otlp_exporter_options_from_env(null) as OTLPExporter;
-            if (exporter === null) {
-                // make sure we always construct the top-level exporter config
-                exporter = {};
-            }
-            env.exporter = exporter;
+        const exporters = as_lower(rotel_env("EXPORTERS"));
+        if (exporters !== null && exporters !== undefined) {
+            env["exporters"] = {};
+            for (const exporterStr of exporters.split(",")) {
+                let name = exporterStr;
+                let value = exporterStr;
+                if (exporterStr.includes(":")) {
+                    [name, value] = exporterStr.split(":", 2);
+                }
 
-            const traces_endpoint = Config._load_otlp_exporter_options_from_env("TRACES");
-            if (traces_endpoint !== null) {
-                exporter.traces = traces_endpoint;
-            }
-            const metrics_endpoint = Config._load_otlp_exporter_options_from_env("METRICS");
-            if (metrics_endpoint !== null) {
-                exporter.metrics = metrics_endpoint;
+                let exporter: OTLPExporter | DatadogExporter | undefined = undefined;
+                let pfx = "EXPORTER_" + name.toUpperCase + "_" 
+                switch(value) {
+                    case "otlp":
+                        exporter = Config._load_otlp_exporter_options_from_env(pfx, "OTLPExporter") as OTLPExporter;
+                        exporter._type = "otlp"
+                        if (exporter === null || exporter === undefined) {
+                            exporter = {};
+                            exporter._type = "otlp";
+                        }
+                    case "datadog":
+                        const datadogExporter: DatadogExporter = {                           
+                            _type: "datadog",
+                            region: rotel_env(pfx + "REGION"),
+                            custom_endpoint: rotel_env(pfx + "CUSTOM_ENDPOINT"),
+                            api_key: rotel_env(pfx + "API_KEY"),
+                        };
+                        exporter = datadogExporter;
+                }
+                if (exporter !== undefined) {
+                    env.exporters[name] = exporter;
+                }
             }
-            const logs_endpoint = Config._load_otlp_exporter_options_from_env("LOGS");
-            if (logs_endpoint != null) {
-                exporter.logs = logs_endpoint;
+            env.exporters_traces = as_list(rotel_env("EXPORTERS_TRACES"))
+            env.exporters_metrics = as_list(rotel_env("EXPORTERS_METRICS"))
+            env.exporters_logs = as_list(rotel_env("EXPORTERS_LOGS"))
+        } else {
+            const exporter_type = as_lower(rotel_env("EXPORTER"));
+            if (exporter_type === null || exporter_type === "otlp") {
+                let exporter: OTLPExporter = Config._load_otlp_exporter_options_from_env("OTLP_EXPORTER_", null) as OTLPExporter;
+                if (exporter === null) {
+                    // make sure we always construct the top-level exporter config
+                    exporter = {};
+                }
+                exporter._type = "otlp";
+                env.exporter = exporter;
+
+                const traces_endpoint = Config._load_otlp_exporter_options_from_env("OTLP_EXPORTER_TRACES_", "TRACES");
+                if (traces_endpoint !== null) {
+                    exporter.traces = traces_endpoint;
+                }
+                const metrics_endpoint = Config._load_otlp_exporter_options_from_env("OTLP_EXPORTER_METRICS_", "METRICS");
+                if (metrics_endpoint !== null) {
+                    exporter.metrics = metrics_endpoint;
+                }
+                const logs_endpoint = Config._load_otlp_exporter_options_from_env("OTLP_EXPORTER_LOGS_", "LOGS");
+                if (logs_endpoint != null) {
+                    exporter.logs = logs_endpoint;
+                }
+            } else if (exporter_type === "datadog") {
+                const pfx = "DATADOG_EXPORTER_"
+                var c: DatadogExporter =  {
+                    _type: "datadog",
+                    region: rotel_env(pfx + "REGION"),
+                    custom_endpoint: rotel_env(pfx + "CUSTOM_ENDPOINT"),
+                    api_key: rotel_env(pfx + "API_KEY"),
+                }
+            env.exporter = c;
             }
         }
 
@@ -117,11 +177,20 @@ export class Config {
         return final_env;
     }
 
-    static _load_otlp_exporter_options_from_env(endpoint_type: string | null): OTLPExporter | OTLPExporterEndpoint | undefined {
-        let pfx = "OTLP_EXPORTER_";
-        if (endpoint_type !== null) {
-            pfx += `${endpoint_type}_`;
-        }
+    static _load_datadog_exporter_options_from_env(pfx: string): DatadogExporter {
+        const datadogExporter: DatadogExporter = {
+            region: rotel_env(pfx + "REGION"),
+            custom_endpoint: rotel_env(pfx + "CUSTOM_ENDPOINT"),
+            api_key: rotel_env(pfx + "API_KEY"),
+        };
+        return datadogExporter;
+    }
+
+    static _load_otlp_exporter_options_from_env(pfx: string, endpoint_type: string | null): OTLPExporter | OTLPExporterEndpoint | undefined {
+        // let pfx = "OTLP_EXPORTER_";
+        // if (endpoint_type !== null) {
+        //     pfx += `${endpoint_type}_`;
+        // }
         const endpoint: OTLPExporterEndpoint = {
             endpoint: rotel_env(pfx + "ENDPOINT"),
             protocol: as_lower(rotel_env(pfx + "PROTOCOL")),
@@ -170,20 +239,30 @@ export class Config {
         
         const exporter = opts.exporter;
         if (exporter !== undefined) {
-            _set_otlp_exporter_agent_env(updates, null, exporter);
-
-            const traces = exporter.traces;
-            if (traces !== undefined) {
-                _set_otlp_exporter_agent_env(updates, "TRACES", traces);
-            }
+            console.log("exporter._type in build_agent_environment is " + exporter._type);
+            switch (exporter._type) {
+                case "otlp" || undefined:
+                    const otlpExporter: OTLPExporter = <OTLPExporter>exporter;
+                    _set_otlp_exporter_agent_env(updates, null, exporter);
+
+                    const traces = otlpExporter.traces;
+                    if (traces !== undefined) {
+                        _set_otlp_exporter_agent_env(updates, "TRACES", traces);
+                    }
 
-            const metrics = exporter.metrics;
-            if (metrics !== undefined) {
-                _set_otlp_exporter_agent_env(updates, "METRICS", metrics);
-            }
-            const logs = exporter.logs;
-            if (logs !== undefined) {
-                _set_otlp_exporter_agent_env(updates, "LOGS", logs);
+                    const metrics = otlpExporter.metrics;
+                    if (metrics !== undefined) {
+                        _set_otlp_exporter_agent_env(updates, "METRICS", metrics);
+                    }
+                    const logs = otlpExporter.logs;
+                    if (logs !== undefined) {
+                        _set_otlp_exporter_agent_env(updates, "LOGS", logs);
+                    }
+                    break;
+                case "datadog":
+                    const datadogExporter: DatadogExporter = <DatadogExporter>exporter;
+                    _set_datadog_exporter_agent_env(updates, "DATADOG_EXPORTER_" , exporter);
+                    break;
             }
         }
 
@@ -217,10 +296,19 @@ export class Config {
 
         const exporter = this.options.exporter;
         if (exporter !== undefined) {
-            const protocol = exporter.protocol;
-            if (protocol !== undefined && protocol !== 'grpc' && protocol !== 'http') {
-                console.error("exporter protocol must be 'grpc' or 'http'");
-                return false;
+            if (exporter._type === undefined) {
+                exporter._type = "otlp"
+            }
+            switch (exporter._type) {
+                case "otlp":
+                    const otlpExporter: OTLPExporter = <OTLPExporter>exporter;
+                    const protocol = otlpExporter.protocol;
+                    console.log("protocol is " + protocol);
+                    if (protocol !== undefined && protocol !== 'grpc' && protocol !== 'http') {
+                        console.error("exporter protocol must be 'grpc' or 'http'");
+                        return false;
+                    }
+                
             }
         }
 
@@ -234,6 +322,15 @@ export class Config {
     }
 }
 
+function _set_datadog_exporter_agent_env(updates: Record<string, any>, pfx: string, exporter: DatadogExporter) {
+    Object.assign(updates, {
+        [pfx + "EXPORTER"]: "datadog", 
+        [pfx + "REGION"]: exporter.region,
+        [pfx + "CUSTOM_ENDPOINT"]: exporter.custom_endpoint,
+        [pfx + "API_KEY"]: exporter.api_key,
+    })
+}
+
 function _set_otlp_exporter_agent_env(updates: Record<string, any>, endpoint_type: string | null, exporter: OTLPExporter | OTLPExporterEndpoint | null): void {
     let pfx = "OTLP_EXPORTER_";
     if (endpoint_type !== null) {
@@ -317,6 +414,8 @@ function as_bool(value: string | null | undefined): boolean | undefined {
 }
 
 function rotel_env(base_key: string): string | undefined {
+    // let key = rotel_expand_env_key(base_key);
+    // console.log("key is " + key);
     const envVar = process.env[rotel_expand_env_key(base_key)];
     return envVar !== undefined ? envVar : undefined;
 }
diff --git a/npm/app/package.json b/npm/app/package.json
@@ -21,8 +21,8 @@
   },
   "homepage": "https://github.com/streamfold/rotel-nodejs#readme",
   "devDependencies": {
-    "@babel/preset-typescript": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
+    "@babel/preset-typescript": "^7.26.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-trace-otlp-grpc": "^0.200.0",
     "@opentelemetry/resources": "^2.0.0",
@@ -57,5 +57,8 @@
       "lib/*"
     ],
     "root": true
+  },
+  "dependencies": {
+    "yarn": "^1.22.22"
   }
 }
diff --git a/npm/app/yarn.lock b/npm/app/yarn.lock
@@ -1595,6 +1595,11 @@
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
+"@streamfold/rotel-darwin-arm64@0.0.7-alpha":
+  version "0.0.7-alpha"
+  resolved "https://registry.npmjs.org/@streamfold/rotel-darwin-arm64/-/rotel-darwin-arm64-0.0.7-alpha.tgz"
+  integrity sha512-OQpkxS6GgAoeM/queJkNilqFMtXmjmjJNUhTgKb5Vuyg8Y5lNAW8zyXrQ9kvc8TcUGgN0olGElcimAd8gYigrQ==
+
 "@types/babel__core@^7.1.14":
   version "7.20.5"
   resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz"
@@ -3625,24 +3630,14 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rotel-agent-darwin-arm64@0.0.12-alpha:
-  version "0.0.12-alpha"
-  resolved "https://registry.npmjs.org/rotel-agent-darwin-arm64/-/rotel-agent-darwin-arm64-0.0.12-alpha.tgz"
-  integrity sha512-b5kXW731JQopiM3EEO2mQmR6wfUoN1F7y2Fpg/8HCv6/S0PvTQPPrfh516wBRwxTPErCoXnq1fBAYICwK6C5Og==
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
 
-semver@^6.3.0:
-  version "6.3.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^6.3.1:
+semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
@@ -3985,6 +3980,11 @@ yargs@^17.3.1, yargs@^17.7.2:
     y18n "^5.0.5"
     yargs-parser "^21.1.1"
 
+yarn@^1.22.22:
+  version "1.22.22"
+  resolved "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz"
+  integrity sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
