Added otel collector and prometheus configs

paypal · Ahmadkashif · May 21, 2023 · May 21, 2023 · May 21, 2023 · May 21, 2023
commit 4aa682ed0204be6d08477671bb94849828444549
diff --git a/docker/manifest/config/otel/config.yaml b/docker/manifest/config/otel/config.yaml
@@ -0,0 +1,29 @@
+# connfig ref : https://opentelemetry.io/docs/collector/configuration/
+receivers:
+  otlp:
+    protocols:
+      http:
+        endpoint: "0.0.0.0:4318"
+
+
+exporters:
+  # Data sources: metrics
+  prometheus:
+    endpoint: "0.0.0.0:8889"
+    namespace: default
+    send_timestamps: true
+    metric_expiration: 180m
+    #    resource_to_telemetry_conversion:
+    #  enabled: true
+
+extensions:
+  health_check:
+  pprof:
+  zpages:
+
+service:
+  extensions: [health_check, pprof, zpages]
+  pipelines:
+    metrics:
+      receivers: [otlp]
+      exporters: [prometheus]
diff --git a/docker/manifest/config/prometheus/prometheus.yaml b/docker/manifest/config/prometheus/prometheus.yaml
@@ -0,0 +1,6 @@
+scrape_configs:
+  - job_name: 'otel'
+    scrape_interval: 10s
+    static_configs:
+      - targets: ['otel:8888']
+      - targets: ['otel:8889']
diff --git a/docker/manifest/config/proxy/config.toml b/docker/manifest/config/proxy/config.toml
@@ -39,6 +39,16 @@ DefaultTimeToLive = 1800
   CalType = "file"
   Enabled = true
 
+[OTEL]
+  Enabled = true
+  Environment = "prod"
+  Host = "otel"
+  Port = 4318
+  Poolname = "proxy_openSource"
+  Resolution = 10
+  UseTls = false
+  UrlPath = ""
+
 [Sherlock]
   Enabled = false
 

diff --git a/docker/manifest/docker-compose.yaml b/docker/manifest/docker-compose.yaml
@@ -98,6 +98,7 @@ services:
       start_period: 10s
     depends_on:
       - storageserv
+      - otel
     volumes:
       - ${PWD}/config/proxy/config.toml:/opt/juno/config/config.toml
       - ${PWD}/config/secrets:/opt/juno/bin/secrets
@@ -118,6 +119,31 @@ services:
       - ${PWD}/config/client/config.toml:/opt/juno/config.toml
       - ${PWD}/config/secrets:/opt/juno/secrets
 
+  otel:
+    <<: *service_default
+    image: otel/opentelemetry-collector:latest
+    container_name: otel
+    command: ["--config=/etc/otel-collector/config.yaml"]
+    volumes:
+      - ${PWD}/config/otel/config.yaml:/etc/otel-collector/config.yaml
+    ports:
+      - "1888:1888" # pprof extension
+      - "8888:8888" # Prometheus metrics exposed by the Collector
+      - "8889:8889" # Prometheus exporter metrics
+      - "13133:13133" # health_check extension
+      - "4317:4317" # OTLP gRPC receiver
+      - "4318:4318" # OTLP http receiver
+      - "55679:55679" # zpages extension
+
+  prometheus:
+    <<: *service_default
+    container_name: prometheus
+    image: prom/prometheus:latest
+    volumes:
+      - ${PWD}/config/prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090:9090"
+
 networks:
   junonet:
     driver: bridge

diff --git a/pkg/logging/otel/config/otelconfig.go b/pkg/logging/otel/config/otelconfig.go
@@ -27,6 +27,7 @@ var OtelConfig *Config
 type Config struct {
 	Host        string
 	Port        uint32
+	UrlPath     string
 	Environment string
 	Poolname    string
 	Enabled     bool
@@ -57,6 +58,9 @@ func (c *Config) Default() {
 	if c.Environment == "" {
 		c.Environment = "OpenSource"
 	}
+	if c.UrlPath == "" {
+		c.UrlPath = "v1/datapoint"
+	}
 }
 
 func (c *Config) Dump() {