chore(deps): Bumping deps

Signed-off-by: Vincent Boutour <[email protected]>

cmd/fibr/client.go

@@ -40,11 +40,9 @@ func newClient(ctx context.Context, config configuration) (client, error) {
 	output.prometheus = prometheus.New(config.prometheus)
 	output.health = health.New(config.health)
 
-	prometheusRegisterer := output.prometheus.Registerer()
+	output.redis = redis.New(config.redis, output.tracer.GetTracer("redis"))
 
-	output.redis = redis.New(config.redis, prometheusRegisterer, output.tracer.GetTracer("redis"))
-
-	output.amqp, err = amqp.New(config.amqp, prometheusRegisterer, output.tracer.GetTracer("amqp"))
+	output.amqp, err = amqp.New(config.amqp, output.prometheus.Registerer(), output.tracer.GetTracer("amqp"))
 	if err != nil && !errors.Is(err, amqp.ErrNoConfig) {
 		return output, fmt.Errorf("amqp: %w", err)
 	}

go.mod

@@ -3,12 +3,12 @@ module github.com/ViBiOh/fibr
 go 1.20
 
 require (
-	github.com/ViBiOh/ChatPotte v0.2.28
+	github.com/ViBiOh/ChatPotte v0.2.29
 	github.com/ViBiOh/absto v1.2.8
-	github.com/ViBiOh/auth/v2 v2.14.22
+	github.com/ViBiOh/auth/v2 v2.14.23
 	github.com/ViBiOh/exas v0.6.0
 	github.com/ViBiOh/flags v1.2.0
-	github.com/ViBiOh/httputils/v4 v4.53.8
+	github.com/ViBiOh/httputils/v4 v4.54.0
 	github.com/ViBiOh/vith v0.5.10
 	github.com/golang/mock v1.6.0
 	github.com/prometheus/client_golang v1.14.0
@@ -22,6 +22,7 @@ require (
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
@@ -30,6 +31,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.16.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
@@ -48,12 +50,17 @@ require (
 	github.com/tdewolff/parse/v2 v2.6.4 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
-	go.opentelemetry.io/otel/exporters/jaeger v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
 	go.opentelemetry.io/otel/metric v0.37.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.14.0 // indirect
+	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/term v0.5.0 // indirect
+	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
+	google.golang.org/grpc v1.53.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )

infra/web.yaml

@@ -50,7 +50,7 @@ spec:
       FIBR_THUMBNAIL_LARGE_SIZE: '1000'
       FIBR_THUMBNAIL_MIN_BITRATE: '30000000'
       FIBR_THUMBNAIL_URL: http://vith
-      FIBR_TRACER_URL: http://jaeger.monitoring:14268/api/traces
+      FIBR_TRACER_URL: otel-collector.monitoring:4317
       OTEL_SERVICE_NAME: fibr
     secrets:
       FIBR_AMQP_URI: AgCn+G//duuL91upLK4W7Vqby4UJiXLMH2gTbgzui1vayxC4ea1pTEJlH56IMb72eI4tdMTcrc5dDB9sbA6k9Zmp12KESxAcdaTwT+6Z2UPiDcXF6wTJObJtn3CRYlWGroCZV5+9BXXTGp1jHaeYoNsooGOTTUqj3ninO0nDB3Nei3OWVIU/LC6C6JvBNIwaPA+dPwih76lfgu1jDSls8InmI8Go223O2jmHfBLSxXLZlrlUPlM2MD+X3wOV2g8Y04ditLfNMCYFV6nA5zI35hwK5j60+NVR8K4uaUnNYGCetm2pfqQ6lXPJeLfguFM5oa9Wal83ZY4UxogDnw+/lkgwCLaR/ZzjCtORqa9Qpv1Duy5K3NSnEpmcmqZ6z+eKu2Y+AKqVS8GVSYlqEwGAYiNGBvG3esjrMh/WrK7MJKK0rWF7mmDtb/42oyBWYp4gme4dODye/sn+Bt7ZBTvi8v1YrqW93xWx9DM4u9L8klgkZCf1KNRRb2N5zfmKGHkkW05jCAGv8XqmPy25ra3Ti+VTqRSgdKgCOEF7g/syFPEWLrQIbNvpParEzKOqBOzRjzjQ6WXm+yPlPXRkxcZZNDCFl7NnLQ2+zAtFzu5oQMpivgIucT+qIDSxMDa2msJUmcXP4JWjFCeTa9JU4jAbuviH6skUYJPQsTE3H+bBGEEeZLl9m1jbOGtAUV6p3EY/PvRVtsQCXX536i9p2CigQ3nU6PqA1XFvOetFn8xrKOFZTE6agZ0pfwOrQHZo38nlevJrwDM=

pkg/crud/browse.go

@@ -17,7 +17,7 @@ import (
 
 func (a App) browse(ctx context.Context, request provider.Request, item absto.Item, message renderer.Message) (renderer.Page, error) {
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "browse", trace.WithSpanKind(trace.SpanKindInternal))
-	defer end()
+	defer end(nil)
 
 	var (
 		previous provider.RenderItem
@@ -68,7 +68,7 @@ func (a App) browse(ctx context.Context, request provider.Request, item absto.It
 
 func (a App) getFilesPreviousAndNext(ctx context.Context, item absto.Item, request provider.Request) (items []absto.Item, previous provider.RenderItem, next provider.RenderItem) {
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "get_previous_next", trace.WithSpanKind(trace.SpanKindInternal))
-	defer end()
+	defer end(nil)
 
 	var err error
 	items, err = a.storageApp.List(ctx, item.Dir())

pkg/crud/delete.go

@@ -6,9 +6,9 @@ import (
 	"net/http"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
-	"github.com/ViBiOh/httputils/v4/pkg/tracer"
 )
 
 func (a App) Delete(w http.ResponseWriter, r *http.Request, request provider.Request) {
@@ -47,7 +47,7 @@ func (a App) Delete(w http.ResponseWriter, r *http.Request, request provider.Req
 		provider.SetPrefsCookie(w, request)
 	}
 
-	go a.notify(tracer.CopyToBackground(ctx), provider.NewDeleteEvent(request, info, a.rendererApp))
+	go a.notify(cntxt.WithoutDeadline(ctx), provider.NewDeleteEvent(request, info, a.rendererApp))
 
 	a.rendererApp.Redirect(w, r, fmt.Sprintf("?d=%s", request.Display), renderer.NewSuccessMessage("%s successfully deleted", info.Name))
 }

pkg/crud/get.go

@@ -16,6 +16,7 @@ import (
 	"github.com/ViBiOh/fibr/pkg/geo"
 	"github.com/ViBiOh/fibr/pkg/metadata"
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/query"
@@ -74,7 +75,7 @@ func (a App) handleFile(w http.ResponseWriter, r *http.Request, request provider
 	if query.GetBool(r, "browser") {
 		provider.SetPrefsCookie(w, request)
 
-		go a.notify(tracer.CopyToBackground(r.Context()), provider.NewAccessEvent(item, r))
+		go a.notify(cntxt.WithoutDeadline(r.Context()), provider.NewAccessEvent(item, r))
 
 		return a.browse(r.Context(), request, item, message)
 	}
@@ -83,8 +84,10 @@ func (a App) handleFile(w http.ResponseWriter, r *http.Request, request provider
 }
 
 func (a App) serveFile(w http.ResponseWriter, r *http.Request, item absto.Item) error {
+	var err error
+
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "file", trace.WithSpanKind(trace.SpanKindInternal))
-	defer end()
+	defer end(&err)
 
 	etag, ok := provider.EtagMatch(w, r, sha.New(item))
 	if ok {
@@ -129,7 +132,7 @@ func (a App) handleDir(w http.ResponseWriter, r *http.Request, request provider.
 		return errorReturn(request, err)
 	}
 
-	go a.notify(tracer.CopyToBackground(r.Context()), provider.NewAccessEvent(item, r))
+	go a.notify(cntxt.WithoutDeadline(r.Context()), provider.NewAccessEvent(item, r))
 
 	if query.GetBool(r, "search") {
 		return a.search(r, request, item, items)
@@ -146,7 +149,7 @@ func (a App) handleDir(w http.ResponseWriter, r *http.Request, request provider.
 
 func (a App) listFiles(r *http.Request, request provider.Request, item absto.Item) (items []absto.Item, err error) {
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "files", trace.WithAttributes(attribute.String("item", item.Pathname)))
-	defer end()
+	defer end(&err)
 
 	if query.GetBool(r, "search") {
 		items, err = a.searchApp.Files(r, request)
@@ -181,7 +184,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 	}
 
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "geojson", trace.WithSpanKind(trace.SpanKindInternal))
-	defer end()
+	defer end(nil)
 
 	var hash string
 	if query.GetBool(r, "search") {

pkg/crud/list.go

@@ -27,7 +27,7 @@ func listLogger(pathname string) logger.Provider {
 
 func (a App) list(ctx context.Context, request provider.Request, message renderer.Message, item absto.Item, files []absto.Item) (renderer.Page, error) {
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "list", trace.WithAttributes(attribute.String("item", item.Pathname)))
-	defer end()
+	defer end(nil)
 
 	wg := concurrent.NewSimple()
 

pkg/crud/post.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
-	"github.com/ViBiOh/httputils/v4/pkg/tracer"
 )
 
 func parseMultipart(r *http.Request) (map[string]string, *multipart.Part, error) {
@@ -175,7 +175,7 @@ func (a App) handlePostDescription(w http.ResponseWriter, r *http.Request, reque
 		return
 	}
 
-	go a.notify(tracer.CopyToBackground(ctx), provider.NewDescriptionEvent(item, a.bestSharePath(item.Pathname), description, a.rendererApp))
+	go a.notify(cntxt.WithoutDeadline(ctx), provider.NewDescriptionEvent(item, a.bestSharePath(item.Pathname), description, a.rendererApp))
 
 	a.rendererApp.Redirect(w, r, fmt.Sprintf("?d=%s#%s", request.Display, item.ID), renderer.NewSuccessMessage("Description successfully edited"))
 }

pkg/crud/regenerate.go

@@ -7,10 +7,10 @@ import (
 
 	absto "github.com/ViBiOh/absto/pkg/model"
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
-	"github.com/ViBiOh/httputils/v4/pkg/tracer"
 )
 
 func (a App) regenerate(w http.ResponseWriter, r *http.Request, request provider.Request) {
@@ -54,7 +54,7 @@ func (a App) regenerate(w http.ResponseWriter, r *http.Request, request provider
 		for _, directory := range directories {
 			a.notify(ctx, provider.NewStartEvent(directory))
 		}
-	}(tracer.CopyToBackground(ctx))
+	}(cntxt.WithoutDeadline(ctx))
 
 	a.rendererApp.Redirect(w, r, "?stats", renderer.NewSuccessMessage("Regeneration of %s in progress...", subset))
 }

pkg/crud/rename.go

@@ -9,9 +9,9 @@ import (
 
 	absto "github.com/ViBiOh/absto/pkg/model"
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
-	"github.com/ViBiOh/httputils/v4/pkg/tracer"
 )
 
 func (a App) doRename(ctx context.Context, oldPath, newPath string, oldItem absto.Item) (absto.Item, error) {
@@ -24,7 +24,7 @@ func (a App) doRename(ctx context.Context, oldPath, newPath string, oldItem abst
 		return absto.Item{}, fmt.Errorf("get info of new item: %w", err)
 	}
 
-	go a.notify(tracer.CopyToBackground(ctx), provider.NewRenameEvent(oldItem, newItem, a.bestSharePath(newPath), a.rendererApp))
+	go a.notify(cntxt.WithoutDeadline(ctx), provider.NewRenameEvent(oldItem, newItem, a.bestSharePath(newPath), a.rendererApp))
 
 	return newItem, nil
 }

pkg/crud/search.go

@@ -12,7 +12,7 @@ import (
 
 func (a App) search(r *http.Request, request provider.Request, item absto.Item, files []absto.Item) (renderer.Page, error) {
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "search")
-	defer end()
+	defer end(nil)
 
 	metadatas, err := a.metadataApp.GetAllMetadataFor(ctx, files...)
 	if err != nil {

pkg/crud/story.go

@@ -16,7 +16,7 @@ import (
 
 func (a App) story(r *http.Request, request provider.Request, item absto.Item, files []absto.Item) (renderer.Page, error) {
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "story", trace.WithAttributes(attribute.String("item", item.Pathname)))
-	defer end()
+	defer end(nil)
 
 	items := make([]provider.StoryItem, 0, len(files))
 	var cover cover

pkg/crud/upload.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/renderer"
@@ -39,7 +40,7 @@ func (a App) saveUploadedFile(ctx context.Context, request provider.Request, inp
 			} else {
 				a.notify(ctx, provider.NewUploadEvent(request, info, a.bestSharePath(filePath), a.rendererApp))
 			}
-		}(tracer.CopyToBackground(ctx))
+		}(cntxt.WithoutDeadline(ctx))
 	}
 
 	return fileName, err
@@ -84,7 +85,7 @@ func (a App) upload(w http.ResponseWriter, r *http.Request, request provider.Req
 	}
 
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "upload")
-	defer end()
+	defer end(nil)
 
 	filename, err := a.saveUploadedFile(ctx, request, values["filename"], values["size"], file)
 	if err != nil {

pkg/crud/upload_chunk.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/ViBiOh/fibr/pkg/provider"
+	"github.com/ViBiOh/httputils/v4/pkg/cntxt"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	"github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/httputils/v4/pkg/sha"
@@ -70,7 +71,7 @@ func (a App) uploadChunk(w http.ResponseWriter, r *http.Request, request provide
 
 func (a App) mergeChunk(w http.ResponseWriter, r *http.Request, request provider.Request, values map[string]string) {
 	ctx, end := tracer.StartSpan(r.Context(), a.tracer, "merge_chunk")
-	defer end()
+	defer end(nil)
 
 	fileName, err := safeFilename(values["filename"])
 	if err != nil {
@@ -114,7 +115,7 @@ func (a App) mergeChunk(w http.ResponseWriter, r *http.Request, request provider
 			} else {
 				a.notify(ctx, provider.NewUploadEvent(request, info, a.bestSharePath(filePath), a.rendererApp))
 			}
-		}(tracer.CopyToBackground(ctx))
+		}(cntxt.WithoutDeadline(ctx))
 	}
 
 	if err = os.RemoveAll(tempFolder); err != nil {

pkg/metadata/aggregate.go

@@ -22,20 +22,22 @@ func redisKey(item absto.Item) string {
 	return version.Redis("exif:" + item.ID)
 }
 
-func (a App) GetMetadataFor(ctx context.Context, item absto.Item) (provider.Metadata, error) {
+func (a App) GetMetadataFor(ctx context.Context, item absto.Item) (metadata provider.Metadata, err error) {
 	if item.IsDir {
 		return provider.Metadata{}, nil
 	}
 
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "get_metadata")
-	defer end()
+	defer end(&err)
 
 	return a.exifCacheApp.Get(ctx, item)
 }
 
 func (a App) GetAllMetadataFor(ctx context.Context, items ...absto.Item) (map[string]provider.Metadata, error) {
+	var err error
+
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "get_all_metadata")
-	defer end()
+	defer end(&err)
 
 	exifs, err := a.exifCacheApp.List(ctx, onListError, items...)
 	if err != nil {
@@ -54,20 +56,22 @@ func (a App) GetAllMetadataFor(ctx context.Context, items ...absto.Item) (map[st
 	return output, nil
 }
 
-func (a App) GetAggregateFor(ctx context.Context, item absto.Item) (provider.Aggregate, error) {
+func (a App) GetAggregateFor(ctx context.Context, item absto.Item) (aggregate provider.Aggregate, err error) {
 	if !item.IsDir {
 		return provider.Aggregate{}, nil
 	}
 
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "get_aggregate")
-	defer end()
+	defer end(&err)
 
 	return a.aggregateCacheApp.Get(ctx, item)
 }
 
 func (a App) GetAllAggregateFor(ctx context.Context, items ...absto.Item) (map[string]provider.Aggregate, error) {
+	var err error
+
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "get_all_aggregate")
-	defer end()
+	defer end(&err)
 
 	exifs, err := a.aggregateCacheApp.List(ctx, onListError, items...)
 	if err != nil {

pkg/metadata/amqp.go

@@ -12,12 +12,14 @@ import (
 )
 
 func (a App) AMQPHandler(ctx context.Context, message amqp.Delivery) error {
+	var err error
+
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "amqp")
-	defer end()
+	defer end(&err)
 
 	var resp provider.ExifResponse
 
-	if err := json.Unmarshal(message.Body, &resp); err != nil {
+	if err = json.Unmarshal(message.Body, &resp); err != nil {
 		return fmt.Errorf("decode: %w", err)
 	}
 

pkg/provider/event.go

@@ -344,7 +344,7 @@ func (e EventBus) Start(ctx context.Context, storageApp absto.Storage, renamers
 			consumer(ctx, event)
 		}
 
-		end()
+		end(nil)
 		e.increaseMetric(event, "done")
 	}
 }