updated observability

observability/tracing/collector-config.yaml

@@ -12,9 +12,13 @@ extensions:
 
 exporters:
   otlp/jaeger:
-    endpoint: "jaeger:4320"
+    endpoint: "jaeger:4317"
     tls:
       insecure: true
+
+  prometheus:
+    endpoint: "0.0.0.0:8889"
+
   otlphttp/grafana:
     endpoint: https://otlp-gateway-prod-us-east-0.grafana.net/otlp
     auth:
@@ -35,5 +39,9 @@ service:
   pipelines:
     traces:
       receivers: [otlp]
-      exporters: [otlphttp/grafana,otlp/digma,otlp/jaeger]
+      exporters: [otlphttp/grafana,otlp/jaeger]
+      processors: [batch]
+    metrics:
+      receivers: [otlp]
+      exporters: [prometheus]
       processors: [batch]

observability/tracing/docker-compose.trace.yml

@@ -6,6 +6,8 @@ services:
     container_name: jaeger
     volumes:
       - badger_data:/badger
+    expose:
+      - "4317"
     ports:
       - "16686:16686"
       - "14250"
@@ -17,13 +19,35 @@ services:
       - BADGER_DIRECTORY_VALUE=/badger/data
       - BADGER_DIRECTORY_KEY=/badger/key
 
+  grafana:
+    container_name: grafana
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning
+    image: grafana/grafana-oss:latest
+    ports:
+      - 3000:3000
+    environment:
+      - GF_SECURITY_ADMIN_USER=admin
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+      - GF_USERS_ALLOW_SIGN_UP=false
+    
+  prometheus:
+    container_name: prometheus
+    image: prom/prometheus:latest
+    volumes:
+      - ./prometheus.yaml:/etc/prometheus/prometheus.yml
+    ports:
+      - "9090:9090"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+      
   collector:
     image: otel/opentelemetry-collector-contrib
     command: ["--config=/otel-local-config.yaml"]
     volumes:
       - ./collector-config.yaml:/otel-local-config.yaml
     ports:
-      - "0.0.0.0:4318:4318" # HTTP OTLP receiver
+      - "0.0.0.0:4317:4317" # GRPC OTLP receiver
       - "0.0.0.0:8889:8889" # METRICS
     extra_hosts:
       - "host.docker.internal:host-gateway"

pom.xml

@@ -116,7 +116,14 @@
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-prometheus</artifactId>
+    </dependency>
     <!-- webjars -->
     <dependency>
       <groupId>org.webjars.npm</groupId>
@@ -164,16 +171,6 @@
           <artifactId>opentelemetry-exporter-otlp</artifactId>
           <version>1.26.0</version>
       </dependency>
-    <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-tracing-bridge-otel</artifactId>
-      <version>1.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>io.github.digma-ai</groupId>
-      <artifactId>digma-spring-boot-micrometer-tracing-autoconf</artifactId>
-      <version>0.7.4</version>
-    </dependency>
 
   </dependencies>