mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-12 16:44:05 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

tsdb/tombstones: use Go standard errors package

Browse source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL 2023-11-11 19:19:50 +01:00 committed by GitHub
parent 39a35d92bc
commit 118460a64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tsdb/tombstones/tombstones.go
View file

@ -15,6 +15,7 @@ package tombstones
import ( import (
"encoding/binary" "encoding/binary"
"errors"
"fmt" "fmt"
"hash" "hash"
"hash/crc32" "hash/crc32"
@ -26,7 +27,6 @@ import (
"github.com/go-kit/log" "github.com/go-kit/log"
"github.com/go-kit/log/level" "github.com/go-kit/log/level"
"github.com/pkg/errors"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/tsdb/encoding" "github.com/prometheus/prometheus/tsdb/encoding"
@ -109,17 +109,17 @@ func WriteFile(logger log.Logger, dir string, tr Reader) (int64, error) {
bytes, err := Encode(tr) bytes, err := Encode(tr)
if err != nil { if err != nil {
return 0, errors.Wrap(err, "encoding tombstones") return 0, fmt.Errorf("encoding tombstones: %w", err)
} }
// Ignore first byte which is the format type. We do this for compatibility. // Ignore first byte which is the format type. We do this for compatibility.
if _, err := hash.Write(bytes[tombstoneFormatVersionSize:]); err != nil { if _, err := hash.Write(bytes[tombstoneFormatVersionSize:]); err != nil {
return 0, errors.Wrap(err, "calculating hash for tombstones") return 0, fmt.Errorf("calculating hash for tombstones: %w", err)
} }
n, err = f.Write(bytes) n, err = f.Write(bytes)
if err != nil { if err != nil {
return 0, errors.Wrap(err, "writing tombstones") return 0, fmt.Errorf("writing tombstones: %w", err)
} }
size += n size += n
@ -161,7 +161,7 @@ func Encode(tr Reader) ([]byte, error) {
func Decode(b []byte) (Reader, error) { func Decode(b []byte) (Reader, error) {
d := &encoding.Decbuf{B: b} d := &encoding.Decbuf{B: b}
if flag := d.Byte(); flag != tombstoneFormatV1 { if flag := d.Byte(); flag != tombstoneFormatV1 {
return nil, errors.Errorf("invalid tombstone format %x", flag) return nil, fmt.Errorf("invalid tombstone format %x", flag)
} }
if d.Err() != nil { if d.Err() != nil {
@ -199,7 +199,7 @@ func ReadTombstones(dir string) (Reader, int64, error) {
} }
if len(b) < tombstonesHeaderSize { if len(b) < tombstonesHeaderSize {
return nil, 0, errors.Wrap(encoding.ErrInvalidSize, "tombstones header") return nil, 0, fmt.Errorf("tombstones header", encoding.ErrInvalidSize)
} }
d := &encoding.Decbuf{B: b[:len(b)-tombstonesCRCSize]} d := &encoding.Decbuf{B: b[:len(b)-tombstonesCRCSize]}
@ -211,7 +211,7 @@ func ReadTombstones(dir string) (Reader, int64, error) {
hash := newCRC32() hash := newCRC32()
// Ignore first byte which is the format type. // Ignore first byte which is the format type.
if _, err := hash.Write(d.Get()[tombstoneFormatVersionSize:]); err != nil { if _, err := hash.Write(d.Get()[tombstoneFormatVersionSize:]); err != nil {
return nil, 0, errors.Wrap(err, "write to hash") return nil, 0, fmt.Errorf("write to hash: %w", err)
} }
if binary.BigEndian.Uint32(b[len(b)-tombstonesCRCSize:]) != hash.Sum32() { if binary.BigEndian.Uint32(b[len(b)-tombstonesCRCSize:]) != hash.Sum32() {
return nil, 0, errors.New("checksum did not match") return nil, 0, errors.New("checksum did not match")