go-duck-cli 1.4.14 → 1.4.16

package/generators/telemetry.js

@@ -143,6 +143,63 @@ var globalMetrics = &AppMetrics{
 	StatusCodes: make(map[int]*StatusStats),
 }
 
+type MetricsBroker struct {
+	clients map[chan AppMetrics]bool
+	mu      sync.Mutex
+}
+
+var GlobalMetricsBroker = &MetricsBroker{
+	clients: make(map[chan AppMetrics]bool),
+}
+
+func (b *MetricsBroker) AddClient(client chan AppMetrics) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	b.clients[client] = true
+}
+
+func (b *MetricsBroker) RemoveClient(client chan AppMetrics) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	delete(b.clients, client)
+	close(client)
+}
+
+func (b *MetricsBroker) Broadcast(metrics *AppMetrics) {
+	metrics.Mu.RLock()
+	safeCopy := AppMetrics{
+		StartTime:   metrics.StartTime,
+		Endpoints:   make(map[string]*EndpointStats),
+		StatusCodes: make(map[int]*StatusStats),
+		FailedCalls: metrics.FailedCalls,
+	}
+	for k, v := range metrics.Endpoints {
+		safeCopy.Endpoints[k] = &EndpointStats{Count: v.Count, MeanTime: v.MeanTime, MaxTime: v.MaxTime, TotalTime: v.TotalTime}
+	}
+	for k, v := range metrics.StatusCodes {
+		safeCopy.StatusCodes[k] = &StatusStats{Count: v.Count, MeanTime: v.MeanTime, MaxTime: v.MaxTime, TotalTime: v.TotalTime}
+	}
+	metrics.Mu.RUnlock()
+
+	b.mu.Lock()
+	defer b.mu.Unlock()
+	for client := range b.clients {
+		select {
+		case client <- safeCopy:
+		default:
+		}
+	}
+}
+
+func init() {
+	go func() {
+		for {
+			time.Sleep(1 * time.Second)
+			GlobalMetricsBroker.Broadcast(globalMetrics)
+		}
+	}()
+}
+
 func MetricsTrackingMiddleware(cfg *config.Config) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		start := time.Now()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-duck-cli",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "description": "The Ultimate Evolutionary Go Microservice Scaffolder.",
   "main": "index.js",
   "type": "module",

package/templates/go/router.go.hbs

@@ -2,7 +2,6 @@ package router
 
 import (
     "context"
-    "encoding/json"
     "fmt"
     "io"
     "log"
@@ -19,8 +18,6 @@ import (
     "gorm.io/gorm"
     "gorm.io/plugin/opentelemetry/tracing"
     "github.com/prometheus/client_golang/prometheus/promhttp"
-    "github.com/shirou/gopsutil/v3/cpu"
-    "github.com/shirou/gopsutil/v3/mem"
     {{#if multitenancy_enabled}}
     "{{app_name}}/management"
     {{/if}}
@@ -1540,7 +1537,7 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
       }
 
       document.getElementById('live-logs-btn').onclick = () => {
-        if (!keycloak.authenticated && {{appConfig.GoDuck.Security.OIDC.Enabled}}) {
+        if (!keycloak.authenticated && {{#if appConfig.GoDuck.Security.OIDC.Enabled}}true{{else}}false{{/if}}) {
           alert('Please login to view Server Logs');
           return;
         }
@@ -1567,7 +1564,7 @@ func SetupRouter(appConfig *config.Config) *gin.Engine {
       };
 
       document.getElementById('compact-widget-btn').onclick = () => {
-        if (!keycloak.authenticated && {{appConfig.GoDuck.Security.OIDC.Enabled}}) {
+        if (!keycloak.authenticated && {{#if appConfig.GoDuck.Security.OIDC.Enabled}}true{{else}}false{{/if}}) {
           alert('Please login to view system telemetry.');
           return;
         }