Merge branch 'main' into usama.saqib/rr-refactor

Author: usamasaqib

.cargo/audit.toml

@@ -1,7 +1,8 @@
 [advisories]
 ignore = [
     "RUSTSEC-2020-0159",
-    "RUSTSEC-2026-0001",  # rkyv 0.7.46 UB in Arc/Rc - transitive via rust_decimal <- byte-unit
+    "RUSTSEC-2026-0001",  # rkyv 0.7.46 UB in Arc/Rc - optional dep of rust_decimal <- byte-unit, never compiled
+    "RUSTSEC-2026-0235",  # rkyv 0.7.46 OOB read - optional dep of rust_decimal <- byte-unit, never compiled
     "RUSTSEC-2024-0436",  # paste unmaintained - transitive via parquet
 ]
 

CHANGELOG.md

@@ -5,6 +5,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+
+## [0.33.0]
+### Changed
+- **Breaking Change**: Datadog blackhole now records received series under the
+  `target/` prefix, matching the prometheus and expvar target metrics
+  collectors. The `record` policy still matches on the unprefixed series name.
+- **Breaking Change**: Datadog blackhole does not record any target metrics by
+  default.
+
+### Added
+- Datadog blackhole now accepts a `record` policy (`all` / `disabled` /
+  `series_to_keep: [...]`) controlling which received series are recorded as
+  capture metrics.
+- OpenTelemetry metric payloads now prefix generated metric names with their
+  metric kind to simplify intake debugging.
+- OpenTelemetry cumulative metric generation now updates cumulative sums using
+  aggregation temporality, preserves cumulative histogram min/max bounds, and
+  supports configurable histogram count limits. Cumulative explicit histograms
+  now retain their state across payload generations.
+- HTTP blackhole now supports an `openmetrics` body variant for generated
+  Prometheus/OpenMetrics scrape responses.
 - Updated to rand 0.10.x
 - `dogstatsd` generator now supports configurable pools for the `|c:` (container
   ID), `|e:` (external data), and `|card:` (cardinality) origin detection
@@ -13,7 +34,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   metric, or omits the field entirely if the pool is empty.
 - `dogstatsd` generator now supports DogStatsD protocol v1.3 `|T` timestamps
   for count and gauge metrics via `timestamp.range` and `timestamp.probability`.
-- Fixed: `dogstatsd` tag generation would silently fail with a misleading
+
+### Fixed
+- `dogstatsd` tag generation would silently fail with a misleading
   `StringGenerate` error for any `tag_length` whose range collapses after
   reserving one byte for the `:` separator -- every constant or single-value
   range (e.g. `Constant(3)`, `Constant(4)`, `Inclusive { min: 100, max: 100 }`)
@@ -22,7 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   returns a `Validation` error naming the offending range instead of the opaque
   `StringGenerate`.
 
-## Removed
+### Removed
 - Removed no longer used `smaps.private_hugetlb.by_pathname` procfs observer
   metric.
 - Removed no longer used `smaps.swap_pss.by_pathname` procfs observer metric.

Cargo.lock

@@ -18,7 +18,7 @@ ENV CARGO_INCREMENTAL=0
 WORKDIR /app
 RUN apt-get update && apt-get install -y \
     pkg-config=1.8.1-1 \
-    libssl-dev=3.0.18-1~deb12u2 \
+    libssl-dev=3.0.20-1~deb12u2 \
     protobuf-compiler=3.21.12-3 \
     fuse3=3.14.0-4 \
     libfuse3-dev=3.14.0-4 \
@@ -56,7 +56,7 @@ ENV SCCACHE_REGION=${SCCACHE_REGION}
 WORKDIR /app
 RUN apt-get update && apt-get install -y \
     pkg-config=1.8.1-1 \
-    libssl-dev=3.0.18-1~deb12u2 \
+    libssl-dev=3.0.20-1~deb12u2 \
     protobuf-compiler=3.21.12-3 \
     fuse3=3.14.0-4 \
     libfuse3-dev=3.14.0-4 \

Dockerfile

@@ -1 +1 @@
-otel_metrics_grpc: 1a99c0f4baf2470e547d0038dcaa6e7f134a1a31ae9dea50460e21f5e4e3a562 entropy=6.7343
+otel_metrics_grpc: 3cd72bf5b323d0482a620db2383d4f81e257a91eeb58090888bc5b2a27502b57 entropy=6.8202

ci/fingerprints/otel_metrics/fingerprint.txt

@@ -0,0 +1,27 @@
+blackhole:
+  - http:
+      binding_addr: "127.0.0.1:9100"
+      concurrent_requests_max: 1000
+      response_delay_millis: 100
+      body_variant:
+        openmetrics:
+          metric_name_prefix: "om_scale"
+          include_help: true
+          include_type: true
+          counters:
+            count: 240
+          gauges:
+            count: 180
+          histograms:
+            count: 20
+            buckets: ["0.005", "0.01", "0.025", "0.05", "0.1", "0.25", "0.5", "1", "2.5", "5"]
+          summaries:
+            count: 40
+            quantiles: ["0.5", "0.75", "0.9", "0.95", "0.99"]
+          labels:
+            services: ["checkout", "catalog", "payments", "fulfillment", "search"]
+            regions: ["us-east-1", "us-west-2", "eu-central-1", "ap-southeast-1"]
+            methods: ["GET", "POST", "PUT", "DELETE"]
+            status_classes: ["2xx", "3xx", "4xx", "5xx"]
+            consumers: ["consumer-00", "consumer-01", "consumer-02", "consumer-03"]
+            route_count: 60

examples/lading-openmetrics.yaml

@@ -1,6 +1,6 @@
 [package]
 name = "lading"
-version = "0.32.0"
+version = "0.33.0"
 authors = [
   "Brian L. Troutwine <brian.troutwine@datadoghq.com>",
   "George Hahn <george.hahn@datadoghq.com>",