Migrate frontend to new service tracing setup.

This alters the frontend to use the new service tracing setup.

vendor/github.com/cs3org/reva/v2/pkg/storage/fs/cephfs/cephfs.go

@@ -165,7 +165,7 @@ func (fs *cephfs) CreateDir(ctx context.Context, ref *provider.Reference) error
 }
 
 // TouchFile as defined in the storage.FS interface
-func (fs *cephfs) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool) error {
+func (fs *cephfs) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool, mtime string) error {
 	return fmt.Errorf("unimplemented: TouchFile")
 }
 

vendor/github.com/cs3org/reva/v2/pkg/storage/fs/nextcloud/nextcloud.go

@@ -266,7 +266,7 @@ func (nc *StorageDriver) CreateDir(ctx context.Context, ref *provider.Reference)
 }
 
 // TouchFile as defined in the storage.FS interface
-func (nc *StorageDriver) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool) error {
+func (nc *StorageDriver) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool, mtime string) error {
 	return fmt.Errorf("unimplemented: TouchFile")
 }
 

vendor/github.com/cs3org/reva/v2/pkg/storage/fs/owncloudsql/owncloudsql.go

@@ -794,7 +794,7 @@ func (fs *owncloudsqlfs) CreateDir(ctx context.Context, ref *provider.Reference)
 }
 
 // TouchFile as defined in the storage.FS interface
-func (fs *owncloudsqlfs) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool) error {
+func (fs *owncloudsqlfs) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool, mtime string) error {
 	ip, err := fs.resolve(ctx, ref)
 	if err != nil {
 		return err
@@ -830,15 +830,25 @@ func (fs *owncloudsqlfs) TouchFile(ctx context.Context, ref *provider.Reference,
 	if err != nil {
 		return err
 	}
-	mtime := time.Now().Unix()
+	storageMtime := time.Now().Unix()
+	mt := storageMtime
+	if mtime != "" {
+		t, err := strconv.Atoi(mtime)
+		if err != nil {
+			log.Info().
+				Str("owncloudsql", ip).
+				Msg("error mtime conversion. mtine set to system time")
+		}
+		mt = time.Unix(int64(t), 0).Unix()
+	}
 
 	data := map[string]interface{}{
 		"path":          fs.toDatabasePath(ip),
 		"etag":          calcEtag(ctx, fi),
 		"mimetype":      mime.Detect(false, ip),
 		"permissions":   int(conversions.RoleFromResourcePermissions(parentPerms, false).OCSPermissions()), // inherit permissions of parent
-		"mtime":         mtime,
-		"storage_mtime": mtime,
+		"mtime":         mt,
+		"storage_mtime": storageMtime,
 	}
 	storageID, err := fs.getStorage(ctx, ip)
 	if err != nil {

vendor/github.com/cs3org/reva/v2/pkg/storage/fs/s3/s3.go

@@ -348,7 +348,7 @@ func (fs *s3FS) CreateDir(ctx context.Context, ref *provider.Reference) error {
 }
 
 // TouchFile as defined in the storage.FS interface
-func (fs *s3FS) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool) error {
+func (fs *s3FS) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool, mtime string) error {
 	return fmt.Errorf("unimplemented: TouchFile")
 }
 

vendor/github.com/cs3org/reva/v2/pkg/storage/storage.go

@@ -38,7 +38,7 @@ type FS interface {
 	GetHome(ctx context.Context) (string, error)
 	CreateHome(ctx context.Context) error
 	CreateDir(ctx context.Context, ref *provider.Reference) error
-	TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool) error
+	TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool, mtime string) error
 	Delete(ctx context.Context, ref *provider.Reference) error
 	Move(ctx context.Context, oldRef, newRef *provider.Reference) error
 	GetMD(ctx context.Context, ref *provider.Reference, mdKeys, fieldMask []string) (*provider.ResourceInfo, error)

vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/decomposedfs.go

@@ -76,7 +76,7 @@ type Tree interface {
 	ListFolder(ctx context.Context, node *node.Node) ([]*node.Node, error)
 	// CreateHome(owner *userpb.UserId) (n *node.Node, err error)
 	CreateDir(ctx context.Context, node *node.Node) (err error)
-	TouchFile(ctx context.Context, node *node.Node, markprocessing bool) error
+	TouchFile(ctx context.Context, node *node.Node, markprocessing bool, mtime string) error
 	// CreateReference(ctx context.Context, node *node.Node, targetURI *url.URL) error
 	Move(ctx context.Context, oldNode *node.Node, newNode *node.Node) (err error)
 	Delete(ctx context.Context, node *node.Node) (err error)
@@ -616,7 +616,7 @@ func (fs *Decomposedfs) CreateDir(ctx context.Context, ref *provider.Reference)
 }
 
 // TouchFile as defined in the storage.FS interface
-func (fs *Decomposedfs) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool) error {
+func (fs *Decomposedfs) TouchFile(ctx context.Context, ref *provider.Reference, markprocessing bool, mtime string) error {
 	parentRef := &provider.Reference{
 		ResourceId: ref.ResourceId,
 		Path:       path.Dir(ref.Path),
@@ -655,7 +655,7 @@ func (fs *Decomposedfs) TouchFile(ctx context.Context, ref *provider.Reference,
 	if err := n.CheckLock(ctx); err != nil {
 		return err
 	}
-	return fs.tp.TouchFile(ctx, n, markprocessing)
+	return fs.tp.TouchFile(ctx, n, markprocessing, mtime)
 }
 
 // CreateReference creates a reference as a node folder with the target stored in extended attributes

vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree/tree.go

@@ -128,7 +128,7 @@ func (t *Tree) GetMD(ctx context.Context, n *node.Node) (os.FileInfo, error) {
 }
 
 // TouchFile creates a new empty file
-func (t *Tree) TouchFile(ctx context.Context, n *node.Node, markprocessing bool) error {
+func (t *Tree) TouchFile(ctx context.Context, n *node.Node, markprocessing bool, mtime string) error {
 	if n.Exists {
 		if markprocessing {
 			return n.SetXattr(prefixes.StatusPrefix, []byte(node.ProcessingStatus))
@@ -155,6 +155,11 @@ func (t *Tree) TouchFile(ctx context.Context, n *node.Node, markprocessing bool)
 	if markprocessing {
 		attributes[prefixes.StatusPrefix] = []byte(node.ProcessingStatus)
 	}
+	if mtime != "" {
+		if err := n.SetMtimeString(mtime); err != nil {
+			return errors.Wrap(err, "Decomposedfs: could not set mtime")
+		}
+	}
 	err = n.SetXattrs(attributes, true)
 	if err != nil {
 		return err

vendor/github.com/cs3org/reva/v2/pkg/storage/utils/eosfs/eosfs.go

@@ -21,6 +21,7 @@ package eosfs
 import (
 	"context"
 	"database/sql"
+	b64 "encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -33,8 +34,6 @@ import (
 	"strings"
 	"time"
 
-	b64 "encoding/base64"
-
 	"github.com/bluele/gcache"
 	grouppb "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
@@ -1673,7 +1672,7 @@ func (fs *eosfs) CreateDir(ctx context.Context, ref *provider.Reference) error {
 }
 
 // TouchFile as defined in the storage.FS interface
-func (fs *eosfs) TouchFile(ctx context.Context, ref *provider.Reference, _ bool) error {
+func (fs *eosfs) TouchFile(ctx context.Context, ref *provider.Reference, _ bool, _ string) error {
 	log := appctx.GetLogger(ctx)
 
 	fn, auth, err := fs.resolveRefAndGetAuth(ctx, ref)

vendor/github.com/cs3org/reva/v2/pkg/storage/utils/localfs/localfs.go

@@ -806,7 +806,7 @@ func (fs *localfs) CreateDir(ctx context.Context, ref *provider.Reference) error
 }
 
 // TouchFile as defined in the storage.FS interface
-func (fs *localfs) TouchFile(ctx context.Context, ref *provider.Reference, _ bool) error {
+func (fs *localfs) TouchFile(ctx context.Context, ref *provider.Reference, _ bool, _ string) error {
 	return fmt.Errorf("unimplemented: TouchFile")
 }