Merge branch 'master' into update-bridge-docs

web/pkg/command/health.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.

web/pkg/command/root.go

@@ -7,13 +7,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the web command.

web/pkg/command/server.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/web/pkg/config"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/web/pkg/server/debug"
 	"github.com/owncloud/ocis/web/pkg/server/http"
 	"github.com/owncloud/ocis/web/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
@@ -51,7 +51,7 @@ func Server(cfg *config.Config) *cli.Command {
 		Action: func(c *cli.Context) error {
 			logger := NewLogger(cfg)
 
-			if err := tracing.Configure(cfg, logger); err != nil {
+			if err := tracing.Configure(cfg); err != nil {
 				return err
 			}
 

web/pkg/flagset/flagset.go

@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
@@ -62,28 +62,28 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 		&cli.BoolFlag{
 			Name:        "tracing-enabled",
 			Usage:       "Enable sending traces",
-			EnvVars:     []string{"WEB_TRACING_ENABLED"},
+			EnvVars:     []string{"WEB_TRACING_ENABLED", "OCIS_TRACING_ENABLED"},
 			Destination: &cfg.Tracing.Enabled,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-type",
 			Value:       flags.OverrideDefaultString(cfg.Tracing.Type, "jaeger"),
 			Usage:       "Tracing backend type",
-			EnvVars:     []string{"WEB_TRACING_TYPE"},
+			EnvVars:     []string{"WEB_TRACING_TYPE", "OCIS_TRACING_TYPE"},
 			Destination: &cfg.Tracing.Type,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-endpoint",
 			Value:       flags.OverrideDefaultString(cfg.Tracing.Endpoint, ""),
 			Usage:       "Endpoint for the agent",
-			EnvVars:     []string{"WEB_TRACING_ENDPOINT"},
+			EnvVars:     []string{"WEB_TRACING_ENDPOINT", "OCIS_TRACING_ENDPOINT"},
 			Destination: &cfg.Tracing.Endpoint,
 		},
 		&cli.StringFlag{
 			Name:        "tracing-collector",
 			Value:       flags.OverrideDefaultString(cfg.Tracing.Collector, ""),
 			Usage:       "Endpoint for the collector",
-			EnvVars:     []string{"WEB_TRACING_COLLECTOR"},
+			EnvVars:     []string{"WEB_TRACING_COLLECTOR", "OCIS_TRACING_COLLECTOR"},
 			Destination: &cfg.Tracing.Collector,
 		},
 		&cli.StringFlag{

web/pkg/server/http/option.go

@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.

web/pkg/server/http/server.go

@@ -2,7 +2,7 @@ package http
 
 import (
 	"github.com/asim/go-micro/v3"
-	chimiddleware "github.com/go-chi/chi/middleware"
+	chimiddleware "github.com/go-chi/chi/v5/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/http"
 	webmid "github.com/owncloud/ocis/web/pkg/middleware"

web/pkg/service/v0/service.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-chi/chi"
+	"github.com/go-chi/chi/v5"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/web/pkg/assets"
 	"github.com/owncloud/ocis/web/pkg/config"
@@ -133,14 +133,21 @@ func (p Web) Static(ttl int) http.HandlerFunc {
 	if !strings.HasSuffix(rootWithSlash, "/") {
 		rootWithSlash = rootWithSlash + "/"
 	}
+	assets := assets.New(
+		assets.Logger(p.logger),
+		assets.Config(p.config),
+	)
+
+	notFoundFunc := func(w http.ResponseWriter, r *http.Request) {
+		// TODO: replace the redirect with a not found page containing a link to the Web UI
+		http.Redirect(w, r, rootWithSlash, http.StatusTemporaryRedirect)
+	}
 
 	static := http.StripPrefix(
 		rootWithSlash,
-		http.FileServer(
-			assets.New(
-				assets.Logger(p.logger),
-				assets.Config(p.config),
-			),
+		interceptNotFound(
+			http.FileServer(assets),
+			notFoundFunc,
 		),
 	)
 
@@ -157,16 +164,11 @@ func (p Web) Static(ttl int) http.HandlerFunc {
 				rootWithSlash,
 				http.StatusMovedPermanently,
 			)
-
 			return
 		}
 
 		if r.URL.Path != rootWithSlash && strings.HasSuffix(r.URL.Path, "/") {
-			http.NotFound(
-				w,
-				r,
-			)
-
+			notFoundFunc(w, r)
 			return
 		}
 
@@ -182,3 +184,32 @@ func (p Web) Static(ttl int) http.HandlerFunc {
 		static.ServeHTTP(w, r)
 	}
 }
+
+func interceptNotFound(h http.Handler, notFoundFunc func(http.ResponseWriter, *http.Request)) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		notFoundInterceptor := &NotFoundInterceptor{ResponseWriter: w}
+		h.ServeHTTP(notFoundInterceptor, r)
+		if notFoundInterceptor.status == http.StatusNotFound {
+			notFoundFunc(w, r)
+		}
+	}
+}
+
+type NotFoundInterceptor struct {
+	http.ResponseWriter
+	status int
+}
+
+func (w *NotFoundInterceptor) WriteHeader(status int) {
+	w.status = status
+	if status != http.StatusNotFound {
+		w.ResponseWriter.WriteHeader(status)
+	}
+}
+
+func (w *NotFoundInterceptor) Write(p []byte) (int, error) {
+	if w.status != http.StatusNotFound {
+		return w.ResponseWriter.Write(p)
+	}
+	return len(p), nil
+}

web/pkg/tracing/tracing.go

@@ -1,90 +1,23 @@
 package tracing
 
 import (
-	"time"
-
-	"contrib.go.opencensus.io/exporter/jaeger"
-	"contrib.go.opencensus.io/exporter/ocagent"
-	"contrib.go.opencensus.io/exporter/zipkin"
-	openzipkin "github.com/openzipkin/zipkin-go"
-	zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
-	"github.com/owncloud/ocis/ocis-pkg/log"
+	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
 	"github.com/owncloud/ocis/web/pkg/config"
-	"go.opencensus.io/stats/view"
-	"go.opencensus.io/trace"
+	"go.opentelemetry.io/otel/trace"
 )
 
-func Configure(cfg *config.Config, logger log.Logger) error {
+var (
+	// TraceProvider is the global trace provider for the web service.
+	TraceProvider = trace.NewNoopTracerProvider()
+)
+
+func Configure(cfg *config.Config) error {
+	var err error
 	if cfg.Tracing.Enabled {
-		switch t := cfg.Tracing.Type; t {
-		case "agent":
-			exporter, err := ocagent.NewExporter(
-				ocagent.WithReconnectionPeriod(5*time.Second),
-				ocagent.WithAddress(cfg.Tracing.Endpoint),
-				ocagent.WithServiceName(cfg.Tracing.Service),
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create agent tracing")
-				return err
-			}
-			trace.RegisterExporter(exporter)
-			view.RegisterExporter(exporter)
-		case "jaeger":
-			exporter, err := jaeger.NewExporter(
-				jaeger.Options{
-					AgentEndpoint:     cfg.Tracing.Endpoint,
-					CollectorEndpoint: cfg.Tracing.Collector,
-					Process: jaeger.Process{
-						ServiceName: cfg.Tracing.Service,
-					},
-				},
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create jaeger tracing")
-				return err
-			}
-			trace.RegisterExporter(exporter)
-		case "zipkin":
-			endpoint, err := openzipkin.NewEndpoint(
-				cfg.Tracing.Service,
-				cfg.Tracing.Endpoint,
-			)
-			if err != nil {
-				logger.Error().
-					Err(err).
-					Str("endpoint", cfg.Tracing.Endpoint).
-					Str("collector", cfg.Tracing.Collector).
-					Msg("Failed to create zipkin tracing")
-				return err
-			}
-			exporter := zipkin.NewExporter(
-				zipkinhttp.NewReporter(
-					cfg.Tracing.Collector,
-				),
-				endpoint,
-			)
-			trace.RegisterExporter(exporter)
-		default:
-			logger.Warn().
-				Str("type", t).
-				Msg("Unknown tracing backend")
+		if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, "web", cfg.Tracing.Type); err != nil {
+			return err
 		}
-		trace.ApplyConfig(
-			trace.Config{
-				DefaultSampler: trace.AlwaysSample(),
-			},
-		)
-	} else {
-		logger.Debug().
-			Msg("Tracing is not enabled")
 	}
+
 	return nil
 }