diff --git a/go.mod b/go.mod index c2697bb93d..d94611fcf7 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/minio/highwayhash v1.0.2 github.com/oklog/run v1.1.0 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 - github.com/parca-dev/parca v0.8.2-0.20220324174409-2d72b00e57c7 + github.com/parca-dev/parca v0.8.2-0.20220325092713-d5b753308e60 github.com/prometheus/client_golang v1.12.1 github.com/prometheus/common v0.32.1 github.com/prometheus/prometheus v1.8.2-0.20211217191541-41f1a8125e66 @@ -75,7 +75,7 @@ require ( github.com/dustin/go-humanize v1.0.0 // indirect github.com/go-delve/delve v1.8.2 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.2 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -120,8 +120,8 @@ require ( github.com/tencentyun/cos-go-sdk-v5 v0.7.34 // indirect github.com/thanos-io/objstore v0.0.0-20220324101945-f2f24637ce2e // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/otel v1.5.0 // indirect - go.opentelemetry.io/otel/trace v1.5.0 // indirect + go.opentelemetry.io/otel v1.6.0 // indirect + go.opentelemetry.io/otel/trace v1.6.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect diff --git a/go.sum b/go.sum index 2bf6b4d326..fb30bf49cd 100644 --- a/go.sum +++ b/go.sum @@ -532,8 +532,9 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.0.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -850,7 +851,6 @@ github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= @@ -1178,8 +1178,8 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/parca-dev/parca v0.8.2-0.20220324174409-2d72b00e57c7 h1:wBg3zFkh5wm+FUFzTz3cYC1otvrQ6hmrgJXA3+dsJFI= -github.com/parca-dev/parca v0.8.2-0.20220324174409-2d72b00e57c7/go.mod h1:qiHJdmM9rTA6tTuHjyjXQnWJsYKXZdlDbXjynVGAivU= +github.com/parca-dev/parca v0.8.2-0.20220325092713-d5b753308e60 h1:D7WUDRui9+gZFU/ToQNsMMfrBaagJx7PTnObaGSR7ok= +github.com/parca-dev/parca v0.8.2-0.20220325092713-d5b753308e60/go.mod h1:TCqKOFta68AKnbW2cX/oXTeAXswVKdlYb+pMGMphc1M= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= @@ -1458,14 +1458,16 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.30.0/go.mod h1:L02XUVEqBFpJPJmaKLi5sXFiMwzd152PNMsCThH7dHc= -go.opentelemetry.io/otel v1.5.0 h1:DhCU8oR2sJH9rfnwPdoV/+BJ7UIN5kXHL8DuSGrPU8E= go.opentelemetry.io/otel v1.5.0/go.mod h1:Jm/m+rNp/z0eqJc74H7LPwQ3G87qkU/AnnAydAjSAHk= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.5.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.5.0/go.mod h1:VoN81wyy6jVVCzHImh8S+IYhw+oAUj6XgEsTkP8DyrQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.5.0/go.mod h1:Es/Ag4ORtjwWCRjS0aEXgmxB5VqKQlnp481/P5aZyPQ= -go.opentelemetry.io/otel/sdk v1.5.0/go.mod h1:CU4J1v+7iEljnm1G14QjdFWOXUyYLHVh0Lh+/BTYyFg= -go.opentelemetry.io/otel/trace v1.5.0 h1:AKQZ9zJsBRFAp7zLdyGNkqG2rToCDIt3i5tcLzQlbmU= +go.opentelemetry.io/otel v1.6.0 h1:YV6GkGe/Ag2PKsm4rjlqdSNs0w0A5ZzxeGkxhx1T+t4= +go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.0/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.0/go.mod h1:pxcK3hnfqhlQkWtzzvqPOEvMxAdLlUmxK4H7CA6w15I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.0/go.mod h1:Yp+np0jiDujJ7horgIIxZkLlZv97ooiGkrNUTGHDcy0= +go.opentelemetry.io/otel/sdk v1.6.0/go.mod h1:PjLRUfDsoPy0zl7yrDGSUqjj43tL7rEtFdCEiGlxXRM= go.opentelemetry.io/otel/trace v1.5.0/go.mod h1:sq55kfhjXYr1zVSyexg0w1mpa03AYXR5eyTkB9NPPdE= +go.opentelemetry.io/otel/trace v1.6.0 h1:NDzPermp9ISkhxIaJXjBTi2O60xOSHDHP/EezjOL2wo= +go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.starlark.net v0.0.0-20200821142938-949cc6f4b097/go.mod h1:f0znQkUKRrkk36XxWbGjMqQM8wGv/xHBVE2qc3B5oFU= diff --git a/pkg/debuginfo/debuginfo.go b/pkg/debuginfo/debuginfo.go index 7d71493f3c..6966b71432 100644 --- a/pkg/debuginfo/debuginfo.go +++ b/pkg/debuginfo/debuginfo.go @@ -25,7 +25,7 @@ import ( "github.com/go-kit/log/level" "github.com/goburrow/cache" "github.com/parca-dev/parca/pkg/debuginfo" - "github.com/parca-dev/parca/pkg/file" + "github.com/parca-dev/parca/pkg/hash" "github.com/parca-dev/parca-agent/pkg/objectfile" ) @@ -145,7 +145,7 @@ func (di *DebugInfo) exists(ctx context.Context, buildID, filePath string) bool return true } - h, err := file.Hash(filePath) + h, err := hash.File(filePath) if err != nil { level.Debug(logger).Log("msg", "failed to hash file", "err", err) } diff --git a/pkg/debuginfo/upload.go b/pkg/debuginfo/upload.go index 49656968a9..b26c07d024 100644 --- a/pkg/debuginfo/upload.go +++ b/pkg/debuginfo/upload.go @@ -26,7 +26,7 @@ import ( "github.com/go-kit/log/level" "github.com/hashicorp/go-multierror" "github.com/parca-dev/parca/pkg/debuginfo" - "github.com/parca-dev/parca/pkg/file" + "github.com/parca-dev/parca/pkg/hash" ) // Uploader uploads debug information to the Parca server. @@ -76,7 +76,7 @@ func (u *Uploader) Upload(ctx context.Context, buildID, filePath string) error { default: } - h, err := file.Hash(filePath) + h, err := hash.File(filePath) if err != nil { return fmt.Errorf("failed to hash file %s: %w", filePath, err) }