add otel protocol override

Author: skadefro

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build
 
-VERSION = 1.5.11.123
+VERSION = 1.5.11.124
 HASH = $(shell git rev-parse --short HEAD)
 bump:
 	@echo "Bumping version to $(VERSION) recursively..."

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/core",
-  "version": "1.5.11.123",
+  "version": "1.5.11.124",
   "description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {
@@ -49,6 +49,8 @@
     "@opentelemetry/api-logs": "0.57.1",
     "@opentelemetry/exporter-logs-otlp-grpc": "0.57.1",
     "@opentelemetry/exporter-metrics-otlp-grpc": "0.57.1",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.57.1",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.57.1",
     "@opentelemetry/sdk-node": "0.57.1",
     "amqplib": "0.10.4",
     "bcryptjs": "2.4.3",

public.template/swagger.json

@@ -513,7 +513,7 @@
 	},
 	"info": {
 		"title": "@openiap/core",
-		"version": "1.5.11.123",
+		"version": "1.5.11.124",
 		"description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
 		"license": {
 			"name": "MPL-2.0"

src/Config.ts

@@ -435,6 +435,7 @@ export class Config {
         otel_measure__mongodb_watch: false,
         enable_analytics: true,
         enable_detailed_analytic: false,
+        otel_protocol: "grpc",
         otel_debug_log: false,
         otel_warn_log: false,
         otel_err_log: false,
@@ -749,6 +750,7 @@ export class Config {
     public static otel_measure__mongodb_watch: boolean = Config.parseBoolean(Config.getEnv("otel_measure__mongodb_watch"));
     public static enable_analytics: boolean = Config.parseBoolean(Config.getEnv("enable_analytics"));
     public static enable_detailed_analytic: boolean = Config.parseBoolean(Config.getEnv("enable_detailed_analytic"));
+    public static otel_protocol: string = Config.getEnv("otel_protocol");
     public static otel_debug_log: boolean = Config.parseBoolean(Config.getEnv("otel_debug_log"));
     public static otel_warn_log: boolean = Config.parseBoolean(Config.getEnv("otel_warn_log"));
     public static otel_err_log: boolean = Config.parseBoolean(Config.getEnv("otel_err_log"));

src/LoginProvider.ts

@@ -1192,6 +1192,7 @@ export class LoginProvider {
             grafana_url: Config.grafana_url,
             llmchat_queue: Config.llmchat_queue,
             enable_analytics: Config.enable_analytics,
+            otel_protocol: Config.otel_protocol,
             enable_gitserver: Config.enable_gitserver,
             web_hide_general_info: Config.web_hide_general_info,
             ofid: Logger.ofid(),

src/Messages/Message.ts

@@ -1999,6 +1999,8 @@ export class Message {
             if (Config.otel_trace_interval > 0) msg.otel_trace_interval = Config.otel_trace_interval;
             if (Config.otel_metric_interval > 0) msg.otel_metric_interval = Config.otel_metric_interval;
             msg.enable_analytics = Config.enable_analytics;
+            // @ts-ignore
+            msg.otel_protocol = Config.otel_protocol;
             if (msg.user != null) {
                 if (msg.user.email == null || msg.user.email == "") {
                     msg.user.email = "";

src/WebServer.ts

@@ -680,6 +680,7 @@ export class WebServer {
                     if (Config.otel_trace_interval > 0) res.config.otel_trace_interval = Config.otel_trace_interval;
                     if (Config.otel_metric_interval > 0) res.config.otel_metric_interval = Config.otel_metric_interval;
                     res.config.enable_analytics = Config.enable_analytics;
+                    res.config.otel_protocol = Config.otel_protocol;
                     res.config.otel_trace_url = Config.otel_trace_url;
                     res.config.otel_metric_url = Config.otel_metric_url;
                     res.config.otel_log_url = Config.otel_log_url;

src/dockerdriver.ts

@@ -208,6 +208,7 @@ export class dockerdriver implements i_agent_driver {
                 "NPM_TOKEN=" + NPM_TOKEN,
                 "enable_analytics=" + Config.enable_analytics.toString(),
                 "enable_detailed_analytic=" + Config.enable_detailed_analytic.toString(),
+                "otel_protocol=" + Config.otel_protocol.toString(),
                 "otel_trace_url=" + Config.otel_trace_url,
                 "otel_metric_url=" + Config.otel_metric_url,
                 "otel_log_url=" + Config.otel_log_url,

src/public/swagger.json

@@ -513,7 +513,7 @@
 	},
 	"info": {
 		"title": "@openiap/core",
-		"version": "1.5.11.123",
+		"version": "1.5.11.124",
 		"description": "Easy orchestration of data, code and automation tools.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
 		"license": {
 			"name": "MPL-2.0"