feat: Docker & cAdvisor. Fixing CPU usage on MacOS

Author: zeroc0d3

.github/workflows/ci.yml

@@ -310,10 +310,19 @@ jobs:
         run: make deps
 
       - name: Run Gosec Security Scanner
-        uses: securego/gosec@master
+        uses: securego/gosec@v2.21.4
         with:
           args: '-no-fail -fmt sarif -out gosec-results.sarif ./...'
 
+      - name: Fix SARIF relationships
+        if: always()
+        run: |
+          if [ -f gosec-results.sarif ]; then
+            # Remove invalid relationships arrays using jq
+            jq 'walk(if type == "object" and has("relationships") then .relationships |= map(select(type == "object")) else . end)' gosec-results.sarif > gosec-results-fixed.sarif
+            mv gosec-results-fixed.sarif gosec-results.sarif
+          fi
+
       - name: Upload SARIF file
         uses: github/codeql-action/upload-sarif@v4
         if: always()

CHANGELOG.md

@@ -7,7 +7,7 @@
 
   <h3>TelemetryFlow Agent (OTEL Agent)</h3>
 
-[![Version](https://img.shields.io/badge/Version-1.1.4-orange.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/Version-1.1.5-orange.svg)](CHANGELOG.md)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Go Version](https://img.shields.io/badge/Go-1.24+-00ADD8?logo=go)](https://golang.org/)
 [![OTEL SDK](https://img.shields.io/badge/OpenTelemetry_SDK-1.39.0-blueviolet)](https://opentelemetry.io/)
@@ -24,6 +24,44 @@ All notable changes to TelemetryFlow Agent will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.1/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.5] - 2026-02-19
+
+### Added
+
+- **Docker Container Metrics Collector**: Native Docker Engine API collector replacing cAdvisor dependency
+  - Uses Docker SDK (`github.com/docker/docker`) with `ContainerStatsOneShot` for per-container metrics
+  - **CPU**: `container.cpu.usage_percent`, `container.cpu.usage_total`, `container.cpu.user`, `container.cpu.kernel`, `container.cpu.online_cpus`, `container.cpu.throttled_periods`, `container.cpu.throttled_time`
+  - **Memory**: `container.memory.usage`, `container.memory.working_set` (usage - inactive_file), `container.memory.limit`, `container.memory.max_usage`, `container.memory.rss`, `container.memory.cache`, `container.memory.usage_percent`
+  - **Network**: Per-interface `container.network.{rx,tx}_{bytes,packets,errors,dropped}`
+  - **Disk I/O**: `container.diskio.{read,write}_{bytes,ops}`
+  - **PIDs**: `container.pids.current`
+  - **State Summary**: `container.state.{running,stopped,paused,restarting,total}`
+  - Container filtering with regex include/exclude patterns
+  - Labels per metric: `container_id`, `container_name`, `image`, `status`
+  - CPU delta tracking for accurate percentage calculation
+- **cAdvisor Prometheus Scraper Collector**: Scrapes container metrics from cAdvisor's `/metrics` endpoint
+  - Parses Prometheus text format using `prometheus/common/expfmt`
+  - Collects `container_*` and `machine_*` metric families by default
+  - Supports all Prometheus types: counter, gauge, histogram, summary, untyped
+  - Optional `metric_names` allowlist for selective collection
+  - Custom labels injection from config
+  - Configurable endpoint, metrics path, timeout, and interval
+- **Tags and Labels Propagation**: Agent tags and custom labels now included in heartbeat and OTLP exports
+  - `tags` and `labels` fields added to heartbeat payload
+  - Tags/labels exported as OTEL resource attributes
+
+### Fixed
+
+- **CPU Usage on macOS**: Removed `omitempty` from float64 fields in `SystemInfoPayload` that caused valid 0.0 values (CPU idle, iowait, steal, etc.) to be dropped from JSON serialization, resulting in "NaN %" display in dashboard
+
+### Changed
+
+- **Alphabetical Ordering**: All collectors in `config.go`, `agent.go`, and `tfo-agent.yaml` are now sorted alphabetically (cAdvisor → Docker → eBPF → Kubernetes → Logs → Node Exporter → Process → System)
+
+### Dependencies
+
+- Added `github.com/docker/docker v27.5.1+incompatible` for Docker Engine API
+
 ## [1.1.4] - 2026-02-11
 
 ### Added
@@ -316,6 +354,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 | Version | Date       | OTEL SDK | Description                                                                                               |
 | ------- | ---------- | -------- | --------------------------------------------------------------------------------------------------------- |
+| 1.1.5   | 2026-02-19 | v1.39.0  | Docker container collector, cAdvisor scraper, CPU fix macOS, tags/labels propagation                       |
 | 1.1.4   | 2026-02-11 | v1.39.0  | eBPF collector (28 metrics), Cilium Hubble integration, 6 BPF programs, kernel-level observability        |
 | 1.1.3   | 2026-02-04 | v1.39.0  | Network retransmit metrics, container name/image detection, page faults, IOPS, system calls               |
 | 1.1.2   | 2026-01-03 | v1.39.0  | OSS observability (SigNoz, Coroot, HyperDX, OpenObserve, Netdata), APM (Dynatrace, Instana, ManageEngine) |

CONTRIBUTING.md

@@ -7,7 +7,7 @@
 
   <h3>TelemetryFlow Agent (OTEL Agent)</h3>
 
-[![Version](https://img.shields.io/badge/Version-1.1.3-orange.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/Version-1.1.5-orange.svg)](CHANGELOG.md)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Go Version](https://img.shields.io/badge/Go-1.24+-00ADD8?logo=go)](https://golang.org/)
 [![OTEL SDK](https://img.shields.io/badge/OpenTelemetry_SDK-1.39.0-blueviolet)](https://opentelemetry.io/)

Dockerfile

@@ -27,7 +27,7 @@
 FROM golang:1.24-alpine AS builder
 
 # Build arguments
-ARG VERSION=1.1.3
+ARG VERSION=1.1.5
 ARG GIT_COMMIT=unknown
 ARG GIT_BRANCH=unknown
 ARG BUILD_TIME=unknown
@@ -69,7 +69,7 @@ FROM alpine:3.21
 # =============================================================================
 LABEL org.opencontainers.image.title="TelemetryFlow Agent" \
     org.opencontainers.image.description="Enterprise telemetry collection agent for metrics, logs, and traces - Community Enterprise Observability Platform (CEOP)" \
-    org.opencontainers.image.version="1.1.3" \
+    org.opencontainers.image.version="1.1.5" \
     org.opencontainers.image.vendor="TelemetryFlow" \
     org.opencontainers.image.authors="DevOpsCorner Indonesia <support@devopscorner.id>" \
     org.opencontainers.image.url="https://telemetryflow.id" \

Makefile

@@ -10,7 +10,7 @@
 # =============================================================================
 PRODUCT_NAME := TelemetryFlow Agent
 BINARY_NAME := tfo-agent
-VERSION ?= 1.1.2
+VERSION ?= 1.1.5
 OTEL_SDK_VERSION := 1.39.0
 GIT_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "unknown")

README.md

@@ -7,7 +7,7 @@
 
   <h3>TelemetryFlow Agent (OTEL Agent)</h3>
 
-[![Version](https://img.shields.io/badge/Version-1.1.4-orange.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/Version-1.1.5-orange.svg)](CHANGELOG.md)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Go Version](https://img.shields.io/badge/Go-1.24+-00ADD8?logo=go)](https://golang.org/)
 [![OTEL SDK](https://img.shields.io/badge/OpenTelemetry_SDK-1.39.0-blueviolet)](https://opentelemetry.io/)
@@ -32,7 +32,7 @@ TFO-Agent is fully aligned with the TelemetryFlow ecosystem, sharing the same Op
 
 ```mermaid
 graph LR
-    subgraph "TelemetryFlow Ecosystem v1.1.4"
+    subgraph "TelemetryFlow Ecosystem v1.1.5"
         subgraph "Instrumentation"
             SDK[TFO-Go-SDK<br/>OTEL SDK v1.39.0]
         end
@@ -59,7 +59,7 @@ graph LR
 
 | Component         | Version | OTEL Base          | Description                 |
 | ----------------- | ------- | ------------------ | --------------------------- |
-| **TFO-Agent**     | v1.1.4  | SDK v1.39.0        | Telemetry collection agent  |
+| **TFO-Agent**     | v1.1.5  | SDK v1.39.0        | Telemetry collection agent  |
 | **TFO-Go-SDK**    | v1.1.3  | SDK v1.39.0        | Go instrumentation SDK      |
 | **TFO-Collector** | v1.1.3  | Collector v0.142.0 | Central telemetry collector |
 
@@ -81,6 +81,8 @@ graph LR
 ### System Monitoring
 
 - **System Metrics Collection**: CPU, memory, disk, and network metrics
+- **Docker Container Monitoring**: Per-container CPU, memory, network, disk I/O, and PID metrics via Docker Engine API
+- **cAdvisor Metrics Scraping**: Prometheus endpoint scraper for cAdvisor container metrics
 - **Process Monitoring**: Track running processes
 - **Resource Detection**: Auto-detect host, OS, and container info
 
@@ -139,11 +141,11 @@ docker-compose down
 ```bash
 # Build image
 docker build \
-  --build-arg VERSION=1.1.4 \
+  --build-arg VERSION=1.1.5 \
   --build-arg GIT_COMMIT=$(git rev-parse --short HEAD) \
   --build-arg GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) \
   --build-arg BUILD_TIME=$(date -u '+%Y-%m-%dT%H:%M:%SZ') \
-  -t telemetryflow/telemetryflow-agent:1.1.4 .
+  -t telemetryflow/telemetryflow-agent:1.1.5 .
 
 # Run container
 docker run -d --name tfo-agent \
@@ -153,7 +155,7 @@ docker run -d --name tfo-agent \
   -p 13133:13133 \
   -v /path/to/config.yaml:/etc/tfo-agent/tfo-agent.yaml:ro \
   -v /var/lib/tfo-agent:/var/lib/tfo-agent \
-  telemetryflow/telemetryflow-agent:1.1.4
+  telemetryflow/telemetryflow-agent:1.1.5
 ```
 
 ### OTEL Collector Ports
@@ -198,7 +200,7 @@ POST http://localhost:4318/v1/logs
 Create configuration file at `/etc/tfo-agent/tfo-agent.yaml`:
 
 ```yaml
-# TelemetryFlow Platform Configuration (v1.1.4+)
+# TelemetryFlow Platform Configuration (v1.1.5+)
 telemetryflow:
   api_key_id: "${TELEMETRYFLOW_API_KEY_ID}"
   api_key_secret: "${TELEMETRYFLOW_API_KEY_SECRET}"
@@ -287,10 +289,12 @@ tfo-agent/
 │   ├── agent/             # Core agent lifecycle
 │   ├── buffer/            # Disk-backed retry buffer
 │   ├── collector/         # Metric collectors
-│   │   ├── system/        # System metrics collector
+│   │   ├── cadvisor/      # cAdvisor Prometheus scraper collector
+│   │   ├── docker/        # Docker container metrics collector
+│   │   ├── ebpf/          # eBPF kernel-level metrics collector
 │   │   ├── kubernetes/    # Kubernetes metrics collector
 │   │   ├── nodeexporter/  # Node Exporter metrics collector
-│   │   └── ebpf/          # eBPF kernel-level metrics collector
+│   │   └── system/        # System metrics collector
 │   ├── config/            # Configuration management
 │   ├── exporter/          # OTLP data exporters
 │   └── version/           # Version and banner info
@@ -351,6 +355,25 @@ p.Start()
 | `system.network.bytes_sent` | counter | Total bytes sent         |
 | `system.network.bytes_recv` | counter | Total bytes received     |
 
+### Docker Container Metrics
+
+The Docker collector provides 32 per-container metrics via Docker Engine API:
+
+- **CPU**: `container.cpu.{usage_percent,usage_total,user,kernel,online_cpus,throttled_periods,throttled_time}`
+- **Memory**: `container.memory.{usage,working_set,limit,max_usage,rss,cache,usage_percent}`
+- **Network**: `container.network.{rx,tx}_{bytes,packets,errors,dropped}` (per-interface)
+- **Disk I/O**: `container.diskio.{read,write}_{bytes,ops}`
+- **PIDs**: `container.pids.current`
+- **State**: `container.state.{running,stopped,paused,restarting,total}`
+
+### cAdvisor Metrics
+
+The cAdvisor collector scrapes Prometheus metrics from a running cAdvisor instance:
+
+- Collects `container_*` and `machine_*` metric families
+- Supports counter, gauge, histogram, summary, and untyped metric types
+- Optional metric name allowlist for selective collection
+
 ### eBPF Metrics (Linux-only)
 
 The eBPF collector provides 28 kernel-level metrics across 7 categories:

SECURITY.md

@@ -7,7 +7,7 @@
 
   <h3>TelemetryFlow Agent (OTEL Agent)</h3>
 
-[![Version](https://img.shields.io/badge/Version-1.1.3-orange.svg)](CHANGELOG.md)
+[![Version](https://img.shields.io/badge/Version-1.1.5-orange.svg)](CHANGELOG.md)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Go Version](https://img.shields.io/badge/Go-1.24+-00ADD8?logo=go)](https://golang.org/)
 [![OTEL SDK](https://img.shields.io/badge/OpenTelemetry_SDK-1.39.0-blueviolet)](https://opentelemetry.io/)

configs/tfo-agent.default.yaml

@@ -42,9 +42,9 @@ agent:
   # Agent tags (for grouping and filtering in TFO Platform)
   tags:
     environment: "${TELEMETRYFLOW_ENVIRONMENT:-production}"
-    region: "${TELEMETRYFLOW_REGION:-us-east-1}"
-    cluster: "${TELEMETRYFLOW_CLUSTER:-main}"
-    datacenter: "${TELEMETRYFLOW_DATACENTER:-dc1}"
+    region: "${TELEMETRYFLOW_REGION:-ap-southeast-3}"
+    cluster: "${TELEMETRYFLOW_CLUSTER:-telemetryflow}"
+    datacenter: "${TELEMETRYFLOW_DATACENTER:-dc01}"
 
 # ─── Heartbeat Configuration ──────────────────────────────────────────────────
 heartbeat: