fix: Configuration issues

Signed-off-by: Kemal Akkoyun <[email protected]>

Author: kakkoyun

demo/infrastructure/docker-compose/Makefile

@@ -144,10 +144,33 @@ pull: ## Pull latest images
 
 update: pull restart ## Update images and restart services
 
-validate: ## Validate docker-compose configuration
+validate-docker-compose: ## Validate docker-compose configuration
 	@echo "$(BLUE)Validating configuration...$(NC)"
 	@docker-compose config > /dev/null && echo "$(GREEN)✓ Configuration valid$(NC)" || echo "$(RED)✗ Configuration invalid$(NC)"
 
+validate-otel: ## Validate OpenTelemetry Collector configuration
+	@echo "$(BLUE)Validating OTel Collector configuration...$(NC)"
+	@docker-compose exec -T otel-collector /otelcol-contrib validate --config=/etc/otelcol-contrib/config.yaml && \
+		echo "$(GREEN)✓ OTel Collector configuration valid$(NC)" || \
+		echo "$(RED)✗ OTel Collector configuration invalid$(NC)"
+
+validate-otel-local: ## Validate OTel Collector config locally (requires otelcol-contrib binary)
+	@echo "$(BLUE)Validating OTel Collector configuration locally...$(NC)"
+	@if command -v otelcol-contrib > /dev/null 2>&1; then \
+		otelcol-contrib validate --config=otel-collector/config.yaml && \
+		echo "$(GREEN)✓ Configuration valid$(NC)"; \
+	else \
+		echo "$(YELLOW)! otelcol-contrib not found. Install from: https://github.com/open-telemetry/opentelemetry-collector-releases$(NC)"; \
+	fi
+
+validate-prometheus: ## Validate Prometheus configuration
+	@echo "$(BLUE)Validating Prometheus configuration...$(NC)"
+	@docker-compose exec -T prometheus promtool check config /etc/prometheus/prometheus.yml && \
+		echo "$(GREEN)✓ Prometheus configuration valid$(NC)" || \
+		echo "$(RED)✗ Prometheus configuration invalid$(NC)"
+
+validate: validate-docker-compose validate-otel validate-prometheus ## Validate all configurations (docker-compose, OTel, Prometheus)
+
 metrics-otel: ## Show OpenTelemetry Collector metrics
 	@echo "$(BLUE)OpenTelemetry Collector Metrics:$(NC)"
 	@curl -s http://localhost:8888/metrics | grep -E "^(otelcol_receiver_accepted|otelcol_exporter_sent)" | head -20

demo/infrastructure/docker-compose/README.md

@@ -465,6 +465,81 @@ grafana:
    - Go to Dashboards → Import
    - Upload JSON file from `grafana/dashboards/dashboards/`
 
+## Configuration Validation
+
+### Built-in Validation Tools
+
+The observability stack includes several validation tools to check configurations before deployment:
+
+#### Validate All Configurations
+
+```bash
+make validate-all
+```
+
+This runs validation for:
+
+- Docker Compose configuration
+- OpenTelemetry Collector configuration
+- Prometheus configuration
+
+#### Individual Validation
+
+**Docker Compose:**
+
+```bash
+make validate
+# Or manually:
+docker-compose config
+```
+
+**OpenTelemetry Collector:**
+
+```bash
+make validate-otel
+# Or manually:
+docker-compose exec otel-collector /otelcol-contrib validate --config=/etc/otelcol-contrib/config.yaml
+```
+
+**Prometheus:**
+
+```bash
+make validate-prometheus
+# Or manually:
+docker-compose exec prometheus promtool check config /etc/prometheus/prometheus.yml
+```
+
+### External Validation Tools
+
+For more comprehensive validation and best practices checking:
+
+1. **otel-config-validator** (by Lightstep/AWS):
+   - GUI: <https://github.com/lightstep/otel-config-validator>
+   - Validates OTel configurations
+   - Identifies common misconfigurations
+
+2. **OTelBin** (online tool):
+   - URL: <https://www.otelbin.io/>
+   - Visualizes OTel Collector pipelines
+   - YAML linting and syntax highlighting
+
+3. **CoGuard CLI**:
+   - Security-focused configuration scanner
+   - Detects misconfigurations and vulnerabilities
+   - Install: <https://www.coguard.io/>
+
+### Best Practice: Validate Before Deploy
+
+Always validate configurations before deploying:
+
+```bash
+# Before starting services
+make validate-all
+
+# If validation passes, then start
+make start
+```
+
 ## Maintenance
 
 ### Update Images

demo/infrastructure/docker-compose/docker-compose.yml

@@ -11,10 +11,12 @@ services:
     command:
       - --set=receivers.otlp.protocols.grpc.endpoint=0.0.0.0:4317
       - --set=receivers.otlp.protocols.http.endpoint=0.0.0.0:4318
+      - --feature-gates=-telemetry.UseLocalHostAsDefaultMetricsAddress  # Expose telemetry on 0.0.0.0:8888
     ports:
       - "16686:16686"  # Jaeger UI
-      - "4317"         # OTLP gRPC (internal)
-      - "4318"         # OTLP HTTP (internal)
+      - "4317"  # OTLP gRPC (internal)
+      - "4318"  # OTLP HTTP (internal)
+      - "14269:8888"  # Internal telemetry metrics (Jaeger's port 8888 mapped to host 14269)
     environment:
       - COLLECTOR_OTLP_ENABLED=true
     networks:
@@ -54,26 +56,25 @@ services:
   otel-collector:
     image: otel/opentelemetry-collector-contrib:0.139.0
     container_name: otel-collector
-    command: ["--config=/etc/otelcol-contrib/config.yaml"]
+    command:
+      - "--config=/etc/otelcol-contrib/config.yaml"
+      - "--feature-gates=-telemetry.UseLocalHostAsDefaultMetricsAddress"  # Expose metrics on 0.0.0.0
     volumes:
       - ./otel-collector/config.yaml:/etc/otelcol-contrib/config.yaml:ro
     ports:
-      - "4317:4317"    # OTLP gRPC receiver
-      - "4318:4318"    # OTLP HTTP receiver
-      - "8888:8888"    # Collector metrics
-      - "8889:8889"    # Prometheus exporter
+      - "4317:4317"  # OTLP gRPC receiver
+      - "4318:4318"  # OTLP HTTP receiver
+      - "8888:8888"  # Collector internal telemetry metrics
+      - "8889:8889"  # Application metrics + spanmetrics
+      - "13133:13133"  # Health check endpoint
     networks:
       - observability
     depends_on:
       jaeger:
         condition: service_healthy
       prometheus:
         condition: service_healthy
-    healthcheck:
-      test: ["CMD", "wget", "--spider", "-q", "http://localhost:13133/"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
+    restart: unless-stopped
 
   # Grafana - Visualization and dashboards
   grafana:
@@ -117,8 +118,7 @@ services:
     networks:
       - observability
     depends_on:
-      otel-collector:
-        condition: service_healthy
+      - otel-collector
     restart: unless-stopped
 
   # gRPC Client - Demo client making requests to server
@@ -128,7 +128,6 @@ services:
       dockerfile: demo/grpc/client/Dockerfile
     container_name: grpc-client
     environment:
-      - GRPC_SERVER_ADDRESS=grpc-server:50051
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317
       - OTEL_EXPORTER_OTLP_PROTOCOL=grpc
       - OTEL_SERVICE_NAME=grpc-client
@@ -141,21 +140,80 @@ services:
       - otel-collector
     restart: unless-stopped
 
-  # k6 - Load testing (optional, comment out if not needed)
-  k6:
+  # HTTP Server - Demo HTTP application with compile-time instrumentation
+  http-server:
+    build:
+      context: ../../..
+      dockerfile: demo/http/server/Dockerfile
+    container_name: http-server
+    ports:
+      - "8080:8080"
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317
+      - OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+      - OTEL_SERVICE_NAME=http-server
+      - OTEL_RESOURCE_ATTRIBUTES=service.namespace=demo,service.version=1.0.0
+      - OTEL_LOG_LEVEL=info
+    networks:
+      - observability
+    depends_on:
+      - otel-collector
+    restart: unless-stopped
+
+  # HTTP Client - Demo client making requests to HTTP server
+  http-client:
+    build:
+      context: ../../..
+      dockerfile: demo/http/client/Dockerfile
+    container_name: http-client
+    command: ["-addr", "http://http-server:8080", "-count", "10000", "-method", "GET"]
+    environment:
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317
+      - OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+      - OTEL_SERVICE_NAME=http-client
+      - OTEL_RESOURCE_ATTRIBUTES=service.namespace=demo,service.version=1.0.0
+      - OTEL_LOG_LEVEL=info
+    networks:
+      - observability
+    depends_on:
+      - http-server
+      - otel-collector
+    restart: unless-stopped
+
+  # k6 gRPC Load Testing - Generates continuous load against gRPC server
+  k6-grpc:
     image: grafana/k6:1.3.0
-    container_name: k6
+    container_name: k6-grpc
     command: run --quiet /scripts/grpc-load-test.js
     volumes:
       - ./k6:/scripts:ro
+      - ../../grpc/server/greeter.proto:/proto/greeter.proto:ro
     networks:
       - observability
     depends_on:
       - grpc-server
     profiles:
       - load-testing
     environment:
-      - K6_OUT=json=/tmp/k6-results.json
+      - K6_OUT=json=/tmp/k6-grpc-results.json
+    restart: unless-stopped
+
+  # k6 HTTP Load Testing - Generates continuous load against HTTP server
+  k6-http:
+    image: grafana/k6:1.3.0
+    container_name: k6-http
+    command: run --quiet /scripts/http-load-test.js
+    volumes:
+      - ./k6:/scripts:ro
+    networks:
+      - observability
+    depends_on:
+      - http-server
+    profiles:
+      - load-testing
+    environment:
+      - K6_OUT=json=/tmp/k6-http-results.json
+    restart: unless-stopped
 
 networks:
   observability: