Full rebrand across cosmetic branding, code identifiers, and infrastructure/data-plane naming, using the supplied Cairn OBS logo package. Cosmetic: favicon/logo swap (also closes a stale license-audit finding -- the old favicon was SvelteKit's unreplaced scaffold logo), new centered welcome landing page, larger/legible sidebar logo, page titles, CLAUDE.md/README/docs prose. Code identifiers: Go module path github.com/sentry/sentry -> github.com/cairnobs/cairnobs across all 13 modules and ~91 files (protoc regenerated); Rust crates sentry-agent/sentry-parser/sentry-search -> cairnobs-*; CLI sentryctl -> cairnobsctl; Terraform provider fully renamed (sentry_dashboard etc. -> cairnobs_dashboard, provider type, env vars); every session/auth cookie name; agent config paths and Windows service identity. Deliberately preserved: the gRPC wire protocol's protobuf packages (sentry.logs.v1, sentry.agent.v1) and their Go import directory (proto/sentry/...) -- renaming the wire-level package would break every currently-deployed agent binary (confirmed two real hosts, including mail.inbuxa.com, are actively streaming through this exact contract) until rebuilt and redeployed in lockstep with an ingest cutover. Only the Go module path wrapping the generated code changes. Infrastructure: every docker-compose container name (root and three component-level compose files); the Helm chart (directory, Chart.yaml, named-template helpers, all templates, values.yaml image repos); Kubernetes Operator (CRD group sentry.io -> cairnobs.io, both CRD YAML files, Go identifiers, RBAC markers); the coupled enterprise/tenantcrd package. Caught and fixed real path-coupling bugs along the way: the Helm chart's search/ingest volume mounts and the dev-only-credential detection constant vs. docker-compose.yml's literal values had to move together or a security warning would have silently stopped firing. Data plane: Postgres database sentry_metadata -> cairnobs_metadata and role sentry -> cairnobs; ClickHouse database sentry -> cairnobs; Kafka topic sentry.logs.raw -> cairnobs.logs.raw and its consumer groups. Source-level defaults, docker-compose.yml, and every migrate.sh/ provision script default updated together; already-applied migration files left untouched per this repo's immutable-migration convention. Verified at every layer: all 13 Go modules build/vet/test clean, both Rust workspaces (agent, search) build/clippy/test clean, npm run check/ build clean, docker compose config validates on all four compose files. Live-verified against a real docker stack multiple times through this work, including a final fresh-volume run confirming the actual renamed Postgres database/role, ClickHouse database, and Kafka topic all work end to end with a real login and query, zero console errors.
139 lines
4.6 KiB
Rust
139 lines
4.6 KiB
Rust
use crate::pb::LogRecord;
|
|
use std::time::{Duration, Instant};
|
|
|
|
/// Buffers `LogRecord`s and signals when to flush, either because the
|
|
/// buffer hit `max_size` (checked on every push) or because
|
|
/// `flush_interval` elapsed since the last flush (checked by the caller via
|
|
/// `poll_timeout` on a timer tick). Not thread-safe by design — one
|
|
/// batcher per agent, driven from a single async task's select loop.
|
|
pub struct Batcher {
|
|
max_size: usize,
|
|
flush_interval: Duration,
|
|
buf: Vec<LogRecord>,
|
|
last_flush: Instant,
|
|
}
|
|
|
|
impl Batcher {
|
|
pub fn new(max_size: usize, flush_interval: Duration) -> Self {
|
|
Self {
|
|
max_size,
|
|
flush_interval,
|
|
buf: Vec::with_capacity(max_size),
|
|
last_flush: Instant::now(),
|
|
}
|
|
}
|
|
|
|
/// Push a record. Returns the drained batch if this push filled the
|
|
/// buffer to `max_size`.
|
|
pub fn push(&mut self, record: LogRecord) -> Option<Vec<LogRecord>> {
|
|
self.buf.push(record);
|
|
if self.buf.len() >= self.max_size {
|
|
Some(self.drain())
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Call periodically (e.g. from a timer tick). Returns the drained
|
|
/// batch if the flush interval has elapsed and there's anything
|
|
/// buffered.
|
|
pub fn poll_timeout(&mut self) -> Option<Vec<LogRecord>> {
|
|
if !self.buf.is_empty() && self.last_flush.elapsed() >= self.flush_interval {
|
|
Some(self.drain())
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Unconditionally drains whatever is buffered, ignoring both
|
|
/// `max_size` and `flush_interval` -- for shutdown and for a
|
|
/// config hot-reload replacing this `Batcher` outright (Phase:
|
|
/// agent management's remote config editing), neither of which
|
|
/// should silently drop records just because the timeout hadn't
|
|
/// elapsed yet.
|
|
pub fn flush_all(&mut self) -> Option<Vec<LogRecord>> {
|
|
if self.buf.is_empty() {
|
|
None
|
|
} else {
|
|
Some(self.drain())
|
|
}
|
|
}
|
|
|
|
fn drain(&mut self) -> Vec<LogRecord> {
|
|
self.last_flush = Instant::now();
|
|
std::mem::replace(&mut self.buf, Vec::with_capacity(self.max_size))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
fn rec(msg: &str) -> LogRecord {
|
|
LogRecord {
|
|
timestamp_unix_nano: 0,
|
|
host: "h".into(),
|
|
service: "s".into(),
|
|
severity: 0,
|
|
message: msg.into(),
|
|
attributes: Default::default(),
|
|
record_id: String::new(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn flushes_on_size() {
|
|
let mut b = Batcher::new(2, Duration::from_secs(999));
|
|
assert!(b.push(rec("a")).is_none());
|
|
let batch = b.push(rec("b")).expect("should flush at max_size");
|
|
assert_eq!(batch.len(), 2);
|
|
assert_eq!(batch[0].message, "a");
|
|
assert_eq!(batch[1].message, "b");
|
|
}
|
|
|
|
#[test]
|
|
fn buffer_empty_after_size_flush() {
|
|
let mut b = Batcher::new(1, Duration::from_secs(999));
|
|
b.push(rec("a")).expect("flush at max_size 1");
|
|
assert!(b.poll_timeout().is_none(), "buffer should be empty post-flush");
|
|
}
|
|
|
|
#[test]
|
|
fn flushes_on_timeout() {
|
|
let mut b = Batcher::new(100, Duration::from_millis(10));
|
|
assert!(b.push(rec("a")).is_none());
|
|
std::thread::sleep(Duration::from_millis(30));
|
|
let batch = b.poll_timeout().expect("should flush after timeout");
|
|
assert_eq!(batch.len(), 1);
|
|
}
|
|
|
|
#[test]
|
|
fn no_flush_when_buffer_empty() {
|
|
let mut b = Batcher::new(10, Duration::from_millis(1));
|
|
std::thread::sleep(Duration::from_millis(5));
|
|
assert!(b.poll_timeout().is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn no_flush_before_timeout_elapsed() {
|
|
let mut b = Batcher::new(10, Duration::from_secs(999));
|
|
b.push(rec("a"));
|
|
assert!(b.poll_timeout().is_none());
|
|
}
|
|
|
|
// Regression test: shutdown used to call poll_timeout(), which
|
|
// silently drops anything buffered before flush_interval elapses --
|
|
// real data loss on a graceful shutdown that happened to land
|
|
// between flushes. flush_all() is what shutdown (and hot-reload)
|
|
// must use instead.
|
|
#[test]
|
|
fn flush_all_drains_regardless_of_timeout() {
|
|
let mut b = Batcher::new(10, Duration::from_secs(999));
|
|
b.push(rec("a"));
|
|
assert!(b.poll_timeout().is_none(), "sanity: timeout hasn't elapsed");
|
|
let batch = b.flush_all().expect("flush_all should drain unconditionally");
|
|
assert_eq!(batch.len(), 1);
|
|
assert!(b.flush_all().is_none(), "buffer should be empty after draining");
|
|
}
|
|
}
|