Skip to content

use bin search + typed instead of tuple #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

use bin search + typed instead of tuple #123

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5430e86
use bin search + typed instead of tuple
blindspotbounty Jun 6, 2025
2e2cfb9
assert -> if
blindspotbounty Jun 6, 2025
d9a9dac
Merge branch 'main' into histogram-use-bin-search
blindspotbounty Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions Sources/Prometheus/Histogram.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,28 @@ public final class Histogram<Value: Bucketable>: Sendable {

@usableFromInline
struct State: Sendable {
@usableFromInline var buckets: [(Value, Int)]
@usableFromInline
struct ValueCount: Sendable {
@usableFromInline
let value: Value
@usableFromInline
var count: Int

@usableFromInline
init(value: Value, count: Int) {
self.value = value
self.count = count
}
}
@usableFromInline var buckets: [ValueCount]
@usableFromInline var sum: Value
@usableFromInline var count: Int

@inlinable
init(buckets: [Value]) {
self.sum = .zero
self.count = 0
self.buckets = buckets.map { ($0, 0) }
self.buckets = buckets.map { .init(value: $0, count: 0) }
}
}

Expand All @@ -58,11 +71,25 @@ public final class Histogram<Value: Bucketable>: Sendable {

public func record(_ value: Value) {
self.box.withLockedValue { state in
for i in state.buckets.startIndex..<state.buckets.endIndex {
if state.buckets[i].0 >= value {
state.buckets[i].1 += 1

var count = state.buckets.count
var left = state.buckets.startIndex

while count > 0 {
let half = count / 2
let mid = state.buckets.index(left, offsetBy: half)
if state.buckets[mid].value >= value {
count = half
} else {
left = state.buckets.index(after: mid)
count -= half + 1
}
}

if state.buckets.indices.contains(left) {
state.buckets[left].count += 1
}

state.sum += value
state.count += 1
}
Expand Down Expand Up @@ -96,10 +123,10 @@ extension Histogram: PrometheusMetric {
buffer.append(UInt8(ascii: #","#))
}
buffer.append(contentsOf: #"le=""#.utf8)
buffer.append(contentsOf: "\(bucket.0.bucketRepresentation)".utf8)
buffer.append(contentsOf: "\(bucket.value.bucketRepresentation)".utf8)
buffer.append(UInt8(ascii: #"""#))
buffer.append(contentsOf: #"} "#.utf8)
buffer.append(contentsOf: "\(bucket.1)".utf8)
buffer.append(contentsOf: "\(bucket.count)".utf8)
buffer.append(contentsOf: #"\#n"#.utf8)
}

Expand Down