Skip to content
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

Jump to bottom

Add more prometheus metrics #141

Merged
merged 10 commits into from
Feb 18, 2024
Merged

Add more prometheus metrics #141

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6fbba22
progress
msbarry Feb 14, 2024
cc756c6
inflight->hit
msbarry Feb 15, 2024
e63f756
exclude directory deserialization from bucket timing
msbarry Feb 15, 2024
c6b4d4d
include bucket request type in counter stat
msbarry Feb 15, 2024
a9ea374
limit not found cardinality, include bucket request status code
msbarry Feb 16, 2024
d16c6b7
fix
msbarry Feb 16, 2024
a91a3d0
track number of dir misses on tile requests
msbarry Feb 16, 2024
6ee9eb0
undo misses
msbarry Feb 16, 2024
05ede4a
cleanup
msbarry Feb 16, 2024
77ba3a4
include kind on cache requests
msbarry Feb 17, 2024
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
Prev Previous commit
Next Next commit
include bucket request type in counter stat
  • Loading branch information
@msbarry
msbarry committed Feb 15, 2024
commit c6b4d4d7bd29b4f587fc7d90a2a1f2ba83f4f900
13 changes: 8 additions & 5 deletions pmtiles/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,23 @@ func (server *Server) Start() {
inflight[key] = []request{req}
server.metrics.cacheRequest(key.name, "miss")
go func() {
status := "ok"
tracker := server.metrics.startBucketRequest(key.name)
defer func() { tracker.finish(status) }()
var result cachedValue
isRoot := (key.offset == 0 && key.length == 0)

offset := int64(key.offset)
length := int64(key.length)

kind := "leaf"
if isRoot {
offset = 0
length = 16384
kind = "root"
}

status := "ok"
tracker := server.metrics.startBucketRequest(key.name, kind)
defer func() { tracker.finish(status) }()

server.logger.Printf("fetching %s %d-%d", key.name, offset, length)
r, etag, err := server.bucket.NewRangeReaderEtag(ctx, key.name+".pmtiles", offset, length, key.etag)

Expand Down Expand Up @@ -252,7 +255,7 @@ func (server *Server) getHeaderMetadataAttempt(ctx context.Context, name, purgeE
}

status := "ok"
tracker := server.metrics.startBucketRequest(name)
tracker := server.metrics.startBucketRequest(name, "metadata")
defer func() { tracker.finish(status) }()
r, _, err := server.bucket.NewRangeReaderEtag(ctx, name+".pmtiles", int64(header.MetadataOffset), int64(header.MetadataLength), rootValue.etag)
if isRefreshRequredError(err) {
Expand Down Expand Up @@ -390,7 +393,7 @@ func (server *Server) getTileAttempt(ctx context.Context, httpHeaders map[string

if entry.RunLength > 0 {
status := "ok"
tracker := server.metrics.startBucketRequest(name)
tracker := server.metrics.startBucketRequest(name, "tile")
defer func() { tracker.finish(status) }()
r, _, err := server.bucket.NewRangeReaderEtag(ctx, name+".pmtiles", int64(header.TileDataOffset+entry.Offset), int64(entry.Length), rootValue.etag)
if isRefreshRequredError(err) {
Expand Down
12 changes: 6 additions & 6 deletions pmtiles/server_metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,18 @@ type bucketRequestTracker struct {
start time.Time
metrics *metrics
archive string
kind string
}

func (m *metrics) startBucketRequest(archive string) *bucketRequestTracker {
return &bucketRequestTracker{start: time.Now(), metrics: m, archive: archive}
func (m *metrics) startBucketRequest(archive, kind string) *bucketRequestTracker {
return &bucketRequestTracker{start: time.Now(), metrics: m, archive: archive, kind: kind}
}

func (r *bucketRequestTracker) finish(status string) {
if !r.finished {
r.finished = true
labels := []string{r.archive, status}
r.metrics.bucketRequests.WithLabelValues(labels...).Inc()
r.metrics.bucketRequestDuration.WithLabelValues(labels...).Observe(time.Since(r.start).Seconds())
r.metrics.bucketRequests.WithLabelValues(r.archive, r.kind, status).Inc()
r.metrics.bucketRequestDuration.WithLabelValues(r.archive, status).Observe(time.Since(r.start).Seconds())
}
}

Expand Down Expand Up @@ -191,7 +191,7 @@ func createMetrics(scope string, logger *log.Logger) *metrics {
Subsystem: scope,
Name: "bucket_requests_total",
Help: "Requests to the underlying bucket",
}, []string{"archive", "status"})),
}, []string{"archive", "kind", "status"})),
bucketRequestDuration: register(logger, prometheus.NewHistogramVec(prometheus.HistogramOpts{
Namespace: namespace,
Subsystem: scope,
Expand Down
Loading