fix: rm opencensus

Author: noah

cmd/server/db.go

@@ -1,50 +1,20 @@
 package main
 
 import (
-	"context"
 	"database/sql"
-	"database/sql/driver"
 	"fmt"
 
-	"contrib.go.opencensus.io/integrations/ocsql"
 	"entgo.io/ent/dialect"
 	entsql "entgo.io/ent/dialect/sql"
-	"github.com/go-sql-driver/mysql"
 
 	"github.com/gitploy-io/gitploy/ent"
 )
 
-type (
-	MySQLConnector struct {
-		dsn string
-	}
-)
-
-func (c MySQLConnector) Connect(context.Context) (driver.Conn, error) {
-	return c.Driver().Open(c.dsn)
-}
-
-func (c MySQLConnector) Driver() driver.Driver {
-	return ocsql.Wrap(
-		mysql.MySQLDriver{},
-		ocsql.WithAllTraceOptions(),
-		ocsql.WithRowsClose(false),
-		ocsql.WithRowsNext(false),
-		ocsql.WithDisableErrSkip(true),
-	)
-}
-
 func OpenDB(driver string, dsn string) (*ent.Client, error) {
-	if driver == dialect.SQLite {
+	if driver == dialect.SQLite || driver == dialect.MySQL {
 		return ent.Open(driver, dsn)
 	}
 
-	if driver == dialect.MySQL {
-		db := sql.OpenDB(MySQLConnector{dsn})
-		drv := entsql.OpenDB(dialect.MySQL, db)
-		return ent.NewClient(ent.Driver(drv)), nil
-	}
-
 	if driver == dialect.Postgres {
 		db, err := sql.Open("pgx", dsn)
 		if err != nil {

cmd/server/main.go

@@ -16,6 +16,7 @@ import (
 	"github.com/gitploy-io/gitploy/internal/pkg/store"
 	"github.com/gitploy-io/gitploy/internal/server"
 
+	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/jackc/pgx/v4/stdlib"
 	_ "github.com/mattn/go-sqlite3"
 )

go.mod

@@ -3,7 +3,6 @@ module github.com/gitploy-io/gitploy
 go 1.15
 
 require (
-	contrib.go.opencensus.io/integrations/ocsql v0.1.7
 	entgo.io/ent v0.9.0
 	github.com/AlekSi/pointer v1.1.0
 	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef

go.sum

@@ -31,8 +31,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-contrib.go.opencensus.io/integrations/ocsql v0.1.7 h1:G3k7C0/W44zcqkpRSFyjU9f6HZkbwIrL//qqnlqWZ60=
-contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 entgo.io/ent v0.9.0 h1:2S1zfpMMW6p+wctj6kcYUprNPNjLWFW06T5MdyAfmWc=
 entgo.io/ent v0.9.0/go.mod h1:6NUeTfUN5mp5YN+5tgoH1SlakSvYPTBOYotSOvaI4ak=
@@ -132,7 +130,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -427,7 +424,6 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=

internal/server/web/index.go

@@ -149,8 +149,8 @@ func (w *Web) Signin(c *gin.Context) {
 		}
 
 		if u, err = w.i.CreateUser(ctx, u); err != nil {
-			w.log.Error("It has failed to save a new user.", zap.Error(err))
-			c.String(http.StatusInternalServerError, "It has failed to save a new user.")
+			w.log.Error("It has failed to create a new user.", zap.Error(err))
+			c.String(http.StatusInternalServerError, "It has failed to sign in.")
 			return
 		}
 	} else if err != nil {
@@ -160,7 +160,7 @@ func (w *Web) Signin(c *gin.Context) {
 	} else {
 		if u, _ = w.i.UpdateUser(ctx, u); err != nil {
 			w.log.Error("It has failed to update the user.", zap.Error(err))
-			c.String(http.StatusInternalServerError, "It has failed to update the user.")
+			c.String(http.StatusInternalServerError, "It has failed to sign in.")
 			return
 		}
 	}