Merge pull request #2416 from flow-php/otel-collector-version

chore: update otel collector version

Author: norberttech

.github/workflows/job-tests.yml

@@ -65,7 +65,7 @@ jobs:
           docker run -d --name otel-collector \
             -p 4317:4317 -p 4318:4318 -p 8888:8888 -p 13133:13133 \
             -v ${{ github.workspace }}/docker/otel-collector-test-config.yaml:/etc/otelcol-contrib/config.yaml:ro \
-            otel/opentelemetry-collector-contrib:0.144.0
+            otel/opentelemetry-collector-contrib:0.153.0
           # Wait for container to be ready
           for i in {1..30}; do
             if curl -sf http://localhost:13133/ > /dev/null 2>&1; then

compose.yml.dist

@@ -98,7 +98,7 @@ services:
         networks:
             - flow-php
     otel-collector:
-        image: otel/opentelemetry-collector-contrib:0.144.0
+        image: otel/opentelemetry-collector-contrib:0.153.0
         container_name: flow-php-otel-collector
         command: ["--config=/etc/otel-collector-config.yaml"]
         ports:

src/bridge/telemetry/otlp/tests/Flow/Bridge/Telemetry/OTLP/Tests/Integration/CollectorMetrics.php

@@ -17,8 +17,9 @@
  * Helper class to query OTEL Collector's Prometheus metrics endpoint.
  *
  * Used to verify that telemetry data flows through the collector.
- * Queries `otelcol_exporter_sent_*_total` metrics which indicate data was
+ * Queries `otelcol_exporter_sent_*` metrics which indicate data was
  * successfully exported (more reliable than receiver metrics in v0.115+).
+ * Collector v0.153.0 drops the `_total` suffix on these counters.
  * The collector exposes internal metrics at port 8888.
  */
 final readonly class CollectorMetrics
@@ -31,17 +32,17 @@ public function __construct(
 
     public function getAcceptedLogRecords(): int
     {
-        return $this->getMetricValue('otelcol_exporter_sent_log_records_total');
+        return $this->getMetricValue('otelcol_exporter_sent_log_records');
     }
 
     public function getAcceptedMetricPoints(): int
     {
-        return $this->getMetricValue('otelcol_exporter_sent_metric_points_total');
+        return $this->getMetricValue('otelcol_exporter_sent_metric_points');
     }
 
     public function getAcceptedSpans(): int
     {
-        return $this->getMetricValue('otelcol_exporter_sent_spans_total');
+        return $this->getMetricValue('otelcol_exporter_sent_spans');
     }
 
     /**
@@ -53,7 +54,7 @@ public function getAcceptedSpans(): int
      */
     public function waitForLogRecords(int $threshold, int $timeoutMs = 5000, int $pollIntervalMs = 10): int
     {
-        return $this->waitForMetric('otelcol_exporter_sent_log_records_total', $threshold, $timeoutMs, $pollIntervalMs);
+        return $this->waitForMetric('otelcol_exporter_sent_log_records', $threshold, $timeoutMs, $pollIntervalMs);
     }
 
     /**
@@ -65,12 +66,7 @@ public function waitForLogRecords(int $threshold, int $timeoutMs = 5000, int $po
      */
     public function waitForMetricPoints(int $threshold, int $timeoutMs = 5000, int $pollIntervalMs = 10): int
     {
-        return $this->waitForMetric(
-            'otelcol_exporter_sent_metric_points_total',
-            $threshold,
-            $timeoutMs,
-            $pollIntervalMs,
-        );
+        return $this->waitForMetric('otelcol_exporter_sent_metric_points', $threshold, $timeoutMs, $pollIntervalMs);
     }
 
     /**
@@ -82,7 +78,7 @@ public function waitForMetricPoints(int $threshold, int $timeoutMs = 5000, int $
      */
     public function waitForSpans(int $threshold, int $timeoutMs = 5000, int $pollIntervalMs = 10): int
     {
-        return $this->waitForMetric('otelcol_exporter_sent_spans_total', $threshold, $timeoutMs, $pollIntervalMs);
+        return $this->waitForMetric('otelcol_exporter_sent_spans', $threshold, $timeoutMs, $pollIntervalMs);
     }
 
     private function getMetricValue(string $metricName): int