From 6f8ac18c480baec85df2ba4528159cebac50d65a Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Sun, 4 Oct 2020 20:57:31 +0530 Subject: [PATCH 01/14] adding support to gormio --- .gitignore | 1 + module/apmgormio/apmgorm_test.go | 265 +++++++++++++++ module/apmgormio/context.go | 168 ++++++++++ module/apmgormio/dialects/mysql/init.go | 26 ++ module/apmgormio/dialects/postgres/init.go | 26 ++ module/apmgormio/dialects/sqlite/init.go | 26 ++ module/apmgormio/doc.go | 21 ++ module/apmgormio/go.mod | 19 ++ module/apmgormio/go.sum | 358 +++++++++++++++++++++ module/apmgormio/open.go | 82 +++++ 10 files changed, 992 insertions(+) create mode 100644 module/apmgormio/apmgorm_test.go create mode 100644 module/apmgormio/context.go create mode 100644 module/apmgormio/dialects/mysql/init.go create mode 100644 module/apmgormio/dialects/postgres/init.go create mode 100644 module/apmgormio/dialects/sqlite/init.go create mode 100644 module/apmgormio/doc.go create mode 100644 module/apmgormio/go.mod create mode 100644 module/apmgormio/go.sum create mode 100644 module/apmgormio/open.go diff --git a/.gitignore b/.gitignore index d5a32627a..192a538ed 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ *.out docs/html build +.idea diff --git a/module/apmgormio/apmgorm_test.go b/module/apmgormio/apmgorm_test.go new file mode 100644 index 000000000..3411df7f2 --- /dev/null +++ b/module/apmgormio/apmgorm_test.go @@ -0,0 +1,265 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// +build go1.9 + +package apmgormio_test + +import ( + "context" + "go.elastic.co/apm/module/apmgormio" + "gorm.io/driver/mysql" + "gorm.io/driver/postgres" + "gorm.io/driver/sqlite" + "gorm.io/gorm/logger" + "os" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "gorm.io/gorm" + + "go.elastic.co/apm/apmtest" + _ "go.elastic.co/apm/module/apmgormio/dialects/mysql" + _ "go.elastic.co/apm/module/apmgormio/dialects/postgres" + _ "go.elastic.co/apm/module/apmgormio/dialects/sqlite" + "go.elastic.co/apm/module/apmsql" +) + +type Product struct { + gorm.Model + Code string + Price uint +} + +func TestWithContext(t *testing.T) { + t.Run("sqlite3", func(t *testing.T) { + testWithContext(t, + apmsql.DSNInfo{Database: ":memory:"}, + sqlite.Open(":memory:"), &gorm.Config{}, + ) + }) + + if os.Getenv("PGHOST") == "" { + t.Logf("PGHOST not specified, skipping") + } else { + t.Run("postgres", func(t *testing.T) { + testWithContext(t, + apmsql.DSNInfo{ + Address: os.Getenv("PGHOST"), + Port: 5432, + Database: "test_db", + User: "postgres", + }, + postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}, + ) + }) + } + + if mysqlHost := os.Getenv("MYSQL_HOST"); mysqlHost == "" { + t.Logf("MYSQL_HOST not specified, skipping") + } else { + t.Run("mysql", func(t *testing.T) { + testWithContext(t, + apmsql.DSNInfo{ + Address: mysqlHost, + Port: 3306, + Database: "test_db", + User: "root", + }, + mysql.Open("root:hunter2@tcp("+mysqlHost+")/test_db?parseTime=true"), &gorm.Config{}, + ) + }) + } +} + +func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialector, config *gorm.Config) { + _, spans, errors := apmtest.WithTransaction(func(ctx context.Context) { + db, err := apmgormio.Open(dialect, config) + require.NoError(t, err) + ddb, _ := db.DB() + defer ddb.Close() + + db = db.WithContext(ctx) + + if db.Migrator().HasTable(&Product{}) { + db.Migrator().DropTable(&Product{}) + } + db.AutoMigrate(&Product{}) + db.Create(&Product{Code: "L1212", Price: 1000}) + + var product Product + var count int64 + assert.NoError(t, db.Model(&product).Count(&count).Error) + assert.Equal(t, 1, count) + assert.NoError(t, db.First(&product, "code = ?", "L1212").Error) + assert.NoError(t, db.Model(&product).Update("Price", 2000).Error) + assert.NoError(t, db.Delete(&product).Error) // soft + assert.NoError(t, db.Unscoped().Delete(&product).Error) // hard + }) + require.NotEmpty(t, spans) + assert.Empty(t, errors) + + spanNames := make([]string, len(spans)) + for i, span := range spans { + spanNames[i] = span.Name + require.NotNil(t, span.Context) + require.NotNil(t, span.Context.Database) + assert.Equal(t, dsnInfo.Database, span.Context.Database.Instance) + assert.NotEmpty(t, span.Context.Database.Statement) + assert.Equal(t, "sql", span.Context.Database.Type) + assert.Equal(t, dsnInfo.User, span.Context.Database.User) + if dsnInfo.Address == "" { + assert.Nil(t, span.Context.Destination) + } else { + assert.Equal(t, dsnInfo.Address, span.Context.Destination.Address) + assert.Equal(t, dsnInfo.Port, span.Context.Destination.Port) + } + } + assert.Equal(t, []string{ + "INSERT INTO products", + "SELECT FROM products", // count + "SELECT FROM products", + "UPDATE products", + "UPDATE products", // soft delete + "DELETE FROM products", + }, spanNames) +} + +// TestWithContextNoTransaction checks that using WithContext without +// a transaction won't cause any issues. +func TestWithContextNoTransaction(t *testing.T) { + db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + require.NoError(t, err) + ddb, _ := db.DB() + defer ddb.Close() + + db = db.WithContext(context.Background()) + if db.Migrator().HasTable(&Product{}) { + db.Migrator().DropTable(&Product{}) + } + db.AutoMigrate(&Product{}) + db.Create(&Product{Code: "L1212", Price: 1000}) + + var product Product + assert.NoError(t, db.Where("code=?", "L1212").First(&product).Error) +} + +func TestWithContextNonSampled(t *testing.T) { + os.Setenv("ELASTIC_APM_TRANSACTION_SAMPLE_RATE", "0") + defer os.Unsetenv("ELASTIC_APM_TRANSACTION_SAMPLE_RATE") + + db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + + require.NoError(t, err) + + ddb, _ := db.DB() + defer ddb.Close() + + if db.Migrator().HasTable(&Product{}) { + db.Migrator().DropTable(&Product{}) + } + db.AutoMigrate(&Product{}) + + _, spans, _ := apmtest.WithTransaction(func(ctx context.Context) { + db = db.WithContext(ctx) + db.Create(&Product{Code: "L1212", Price: 1000}) + }) + require.Empty(t, spans) +} + +func TestCaptureErrors(t *testing.T) { + t.Run("sqlite3", func(t *testing.T) { + db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + require.NoError(t, err) + + ddb, _ := db.DB() + defer ddb.Close() + + testCaptureErrors(t, db) + }) + + if os.Getenv("PGHOST") == "" { + t.Logf("PGHOST not specified, skipping") + } else { + t.Run("postgres", func(t *testing.T) { + db, err := apmgormio.Open(postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}) + require.NoError(t, err) + + ddb, _ := db.DB() + defer ddb.Close() + + testCaptureErrors(t, db) + }) + } +} + +func testCaptureErrors(t *testing.T, db *gorm.DB) { + db.Config.Logger = logger.Default.LogMode(logger.Silent) + if db.Migrator().HasTable(&Product{}) { + db.Migrator().DropTable(&Product{}) + } + db.AutoMigrate(&Product{}) + + _, spans, errors := apmtest.WithTransaction(func(ctx context.Context) { + db = db.WithContext(ctx) + + // gorm.ErrRecordNotFound should not cause an error + db.Where("code=?", "L1212").First(&Product{}) + + // The postgres dialect will use QueryRow when inserting, in order to fetch + // the inserted row ID. By using "ON CONFLICT (id) DO NOTHING", no row will + // be inserted, and QueryRow will return sql.ErrNoRows. This should not be + // reported as an error. + product := Product{ + Model: gorm.Model{ + ID: 1001, + }, + Code: "1001", + Price: 1001, + } + require.NoError(t, db.Create(&product).Error) + db.Set("gorm:insert_option", "ON CONFLICT (id) DO NOTHING").Create(&product) + + // invalid SQL should + db.Where("bananas").First(&Product{}) + }) + assert.Len(t, spans, 4) + require.Len(t, errors, 1) + assert.Regexp(t, `.*bananas.*`, errors[0].Exception.Message) +} + +func TestOpenWithDriver(t *testing.T) { + db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + + require.NoError(t, err) + + ddb, _ := db.DB() + defer ddb.Close() + + if db.Migrator().HasTable(&Product{}) { + db.Migrator().DropTable(&Product{}) + } + db.AutoMigrate(&Product{}) + + _, spans, _ := apmtest.WithTransaction(func(ctx context.Context) { + db = db.WithContext(ctx) + db.Create(&Product{Code: "L1212", Price: 1000}) + }) + require.Len(t, spans, 1) + assert.Equal(t, ":memory:", spans[0].Context.Database.Instance) +} diff --git a/module/apmgormio/context.go b/module/apmgormio/context.go new file mode 100644 index 000000000..8eda9c243 --- /dev/null +++ b/module/apmgormio/context.go @@ -0,0 +1,168 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// +build go1.9 + +package apmgormio + +import ( + "context" + "database/sql" + "errors" + "fmt" + "strings" + + "gorm.io/gorm" + + "go.elastic.co/apm" + "go.elastic.co/apm/module/apmsql" +) + +func scopeContext(scope *gorm.DB) (context.Context, bool) { + if scope.Statement == nil { + return nil, false + } + ctx := scope.Statement.Context + return ctx, ctx != nil +} + +func registerCallbacks(db *gorm.DB, dsnInfo apmsql.DSNInfo) { + driverName := db.Dialector.Name() + switch driverName { + case "postgres": + driverName = "postgresql" + } + spanTypePrefix := fmt.Sprintf("db.%s.", driverName) + querySpanType := spanTypePrefix + "query" + execSpanType := spanTypePrefix + "exec" + + const callbackPrefix = "elasticapm" + + // Create Callbacks + _ = db.Callback().Create(). + Before("gorm:create"). + Register(fmt.Sprintf("%s:before:%s", callbackPrefix, execSpanType), newBeforeCallback(execSpanType)) + + _ = db.Callback().Create(). + After("gorm:create"). + Register(fmt.Sprintf("%s:after:%s", callbackPrefix, execSpanType), newAfterCallback(dsnInfo)) + + // Delete Callbacks + _ = db.Callback().Delete(). + Before("gorm:delete"). + Register(fmt.Sprintf("%s:before:%s", callbackPrefix, execSpanType), newBeforeCallback(execSpanType)) + + _ = db.Callback().Delete(). + After("gorm:delete"). + Register(fmt.Sprintf("%s:after:%s", callbackPrefix, execSpanType), newAfterCallback(dsnInfo)) + + // Update Callbacks + _ = db.Callback().Update(). + Before("gorm:update"). + Register(fmt.Sprintf("%s:before:%s", callbackPrefix, execSpanType), newBeforeCallback(execSpanType)) + + _ = db.Callback().Update(). + After("gorm:update"). + Register(fmt.Sprintf("%s:after:%s", callbackPrefix, execSpanType), newAfterCallback(dsnInfo)) + + // Query Callbacks + _ = db.Callback().Query(). + Before("gorm:query"). + Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) + + _ = db.Callback().Query(). + After("gorm:query"). + Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) + + // Row Query Callbacks + _ = db.Callback().Row(). + Before("gorm:row_query"). + Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) + + _ = db.Callback().Row(). + After("gorm:row_query"). + Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) + + // Raw Query Callbacks + _ = db.Callback().Row(). + Before("gorm:raw_query"). + Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) + + _ = db.Callback().Row(). + After("gorm:raw_query"). + Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) +} + +func newBeforeCallback(spanType string) func(*gorm.DB) { + return func(scope *gorm.DB) { + ctx, ok := scopeContext(scope) + if !ok { + return + } + span, ctx := apm.StartSpan(ctx, "", spanType) + if span.Dropped() { + span.End() + ctx = nil + } + scope.Statement.Context = ctx + } +} + +func newAfterCallback(dsnInfo apmsql.DSNInfo) func(*gorm.DB) { + return func(scope *gorm.DB) { + ctx, ok := scopeContext(scope) + if !ok { + return + } + span := apm.SpanFromContext(ctx) + if span == nil { + return + } + + statement := scope.Statement.SQL.String() + span.Name = apmsql.QuerySignature(statement) + span.Context.SetDestinationAddress(dsnInfo.Address, dsnInfo.Port) + span.Context.SetDatabase(apm.DatabaseSpanContext{ + Instance: dsnInfo.Database, + Statement: statement, + Type: "sql", + User: dsnInfo.User, + }) + defer span.End() + + // Capture errors, except for "record not found", which may be expected. + for _, err := range extractErrors(scope) { + if err == gorm.ErrRecordNotFound || err == sql.ErrNoRows { + continue + } + if e := apm.CaptureError(ctx, err); e != nil { + e.Send() + } + } + } +} + +func extractErrors(db *gorm.DB) []error { + if db.Error == nil { + return nil + } + var errs []error + for _, err := range strings.Split(db.Error.Error(), "; ") { + errs = append(errs, errors.New(err)) + } + return errs +} diff --git a/module/apmgormio/dialects/mysql/init.go b/module/apmgormio/dialects/mysql/init.go new file mode 100644 index 000000000..e4eb14c67 --- /dev/null +++ b/module/apmgormio/dialects/mysql/init.go @@ -0,0 +1,26 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// Package apmgormmysql imports the gorm mysql dialect package, +// and also registers the mysql driver with apmsql. +package apmgormiomysql + +import ( + _ "gorm.io/driver/mysql" // import the mysql dialect + + _ "go.elastic.co/apm/module/apmsql/mysql" // register mysql with apmsql +) diff --git a/module/apmgormio/dialects/postgres/init.go b/module/apmgormio/dialects/postgres/init.go new file mode 100644 index 000000000..821903a05 --- /dev/null +++ b/module/apmgormio/dialects/postgres/init.go @@ -0,0 +1,26 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// Package apmgormpostgres imports the gorm postgres dialect package, +// and also registers the lib/pq driver with apmsql. +package apmgormpostgres + +import ( + _ "gorm.io/driver/postgres" // import the postgres dialect + + _ "go.elastic.co/apm/module/apmsql/pq" // register lib/pq with apmsql +) diff --git a/module/apmgormio/dialects/sqlite/init.go b/module/apmgormio/dialects/sqlite/init.go new file mode 100644 index 000000000..e24837861 --- /dev/null +++ b/module/apmgormio/dialects/sqlite/init.go @@ -0,0 +1,26 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// Package apmgormsqlite imports the gorm sqlite dialect package, +// and also registers the sqlite3 driver with apmsql. +package apmgormsqlite + +import ( + _ "gorm.io/driver/sqlite" // import the sqlite dialect + + _ "go.elastic.co/apm/module/apmsql/sqlite3" // register sqlite3 with apmsql +) diff --git a/module/apmgormio/doc.go b/module/apmgormio/doc.go new file mode 100644 index 000000000..920ccdc82 --- /dev/null +++ b/module/apmgormio/doc.go @@ -0,0 +1,21 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// +build go1.9 + +// Package apmgorm provides wrappers for tracing GORM operations. +package apmgormio diff --git a/module/apmgormio/go.mod b/module/apmgormio/go.mod new file mode 100644 index 000000000..175982edc --- /dev/null +++ b/module/apmgormio/go.mod @@ -0,0 +1,19 @@ +module go.elastic.co/apm/module/apmgormio + +require ( + cloud.google.com/go v0.40.0 // indirect + github.com/jinzhu/gorm v1.9.10 + github.com/pkg/errors v0.8.1 + github.com/stretchr/testify v1.5.1 + go.elastic.co/apm v1.8.0 + go.elastic.co/apm/module/apmsql v1.8.0 + gorm.io/driver/mysql v1.0.2 + gorm.io/driver/postgres v1.0.2 + gorm.io/driver/sqlite v1.1.3 +) + +replace go.elastic.co/apm => ../.. + +replace go.elastic.co/apm/module/apmsql => ../apmsql + +go 1.13 diff --git a/module/apmgormio/go.sum b/module/apmgormio/go.sum new file mode 100644 index 000000000..0797e3197 --- /dev/null +++ b/module/apmgormio/go.sum @@ -0,0 +1,358 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.40.0 h1:FjSY7bOj+WzJe6TZRVtXI2b9kAYvtNg4lMbcH2+MUkk= +cloud.google.com/go v0.40.0/go.mod h1:Tk58MuI9rbLMKlAjeO/bDnteAx7tX2gJIXw4T5Jwlro= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/cucumber/godog v0.8.1 h1:lVb+X41I4YDreE+ibZ50bdXmySxgRviYFgKY6Aw4XE8= +github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA= +github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/elastic/go-sysinfo v1.1.1 h1:ZVlaLDyhVkDfjwPGU55CQRCRolNpc7P0BbyhhQZQmMI= +github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= +github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY= +github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +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= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.7.0 h1:pwjzcYyfmz/HQOQlENvG1OcDqauTGaqlVahq934F0/U= +github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA= +github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.5 h1:NUbEWPmCQZbMmYlTjVoNPhc0CfnYyz2bfUAh6A5ZVJM= +github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.5.0 h1:jzBqRk2HFG2CV4AIwgCI2PwTgm6UUoCAK2ofHHRirtc= +github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.9.0 h1:6STjDqppM2ROy5p1wNDcsC7zJTjSHeuCsguZmXyzx7c= +github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jinzhu/gorm v1.9.10 h1:HvrsqdhCW78xpJF67g1hMxS6eCToo9PZH4LDB8WKPac= +github.com/jinzhu/gorm v1.9.10/go.mod h1:Kh6hTsSGffh4ui079FHrR5Gg+5D0hgihqDcsDN2BBJY= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= +github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4= +github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= +github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.14.3 h1:j7a/xn1U6TKA/PHHxqZuzh64CdtRc7rU9M+AvkOl5bA= +github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= +github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/santhosh-tekuri/jsonschema v1.2.4 h1:hNhW8e7t+H1vgY+1QeEQpveR6D4+OwKPXCfD2aieJis= +github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4= +go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +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= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e h1:9vRrk9YW2BTzLP0VCB9ZDjU4cPqkg+IDWL7XgxA1yxQ= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gorm.io/driver/mysql v1.0.2 h1:xm21Um8cR/Cg+nMwSrajf8aBUxOIC+WmH72ir/ByYR8= +gorm.io/driver/mysql v1.0.2/go.mod h1:T+Fv7Rq/8+lpS3X1KKVUbj8Y/SzbPa5esK9KpPAKXR8= +gorm.io/driver/postgres v1.0.2 h1:mB5JjD4QglbCTdMT1aZDxQzHr87XDK1qh0MKIU3P96g= +gorm.io/driver/postgres v1.0.2/go.mod h1:FvRSYfBI9jEp6ZSjlpS9qNcSjxwYxFc03UOTrHdvvYA= +gorm.io/driver/sqlite v1.1.3 h1:BYfdVuZB5He/u9dt4qDpZqiqDJ6KhPqs5QUqsr/Eeuc= +gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB45c= +gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v1.20.2 h1:bZzSEnq7NDGsrd+n3evOOedDrY5oLM5QPlCjZJUK2ro= +gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M= +howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/module/apmgormio/open.go b/module/apmgormio/open.go new file mode 100644 index 000000000..21ac24795 --- /dev/null +++ b/module/apmgormio/open.go @@ -0,0 +1,82 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// +build go1.9 + +package apmgormio + +import ( + "github.com/pkg/errors" + "gorm.io/driver/sqlite" + "gorm.io/gorm" + + "go.elastic.co/apm/module/apmsql" + "gorm.io/driver/mysql" + "gorm.io/driver/postgres" +) + +// Open returns a *gorm.DB for the given dialect and arguments. +// The returned *gorm.DB will have callbacks registered with +// RegisterCallbacks, such that CRUD operations will be reported +// as spans. +// +// Open accepts the following signatures: +// - a datasource name (i.e. the second argument to sql.Open) +// - a driver name and a datasource name +// - a *sql.DB, or some other type with the same interface +// +// If a driver and datasource name are supplied, and the appropriate +// apmgorm/dialects package has been imported (or the driver has +// otherwise been registered with apmsql), then the datasource name +// will be parsed for inclusion in the span context. +func Open(dialect gorm.Dialector, config *gorm.Config) (*gorm.DB, error) { + dsn, err := extractDsn(dialect) + if err != nil { + return nil, err + } + + db, err := gorm.Open(dialect, config) + if err != nil { + return nil, errors.WithStack(err) + } + registerCallbacks(db, apmsql.DriverDSNParser(dialect.Name())(dsn)) + return db, nil +} + +func extractDsn(dialect gorm.Dialector) (string, error) { + switch dialect.Name() { + case mysql.Dialector{}.Name(): + if driver, ok := dialect.(mysql.Dialector); !ok { + return "", errors.New("unable to cast dialect") + } else { + return driver.DSN, nil + } + case postgres.Dialector{}.Name(): + if driver, ok := dialect.(postgres.Dialector); !ok { + return "", errors.New("unable to cast dialect") + } else { + return driver.DSN, nil + } + case sqlite.Dialector{}.Name(): + if driver, ok := dialect.(sqlite.Dialector); !ok { + return "", errors.New("unable to cast dialect") + } else { + return driver.DSN, nil + } + } + return "", errors.New("dialect not supported") +} From bd91be7c217a1387d21cbf794d734e0524b36585 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Sun, 4 Oct 2020 20:59:07 +0530 Subject: [PATCH 02/14] removing unused deps --- module/apmgormio/go.mod | 3 +- module/apmgormio/go.sum | 129 ---------------------------------------- 2 files changed, 1 insertion(+), 131 deletions(-) diff --git a/module/apmgormio/go.mod b/module/apmgormio/go.mod index 175982edc..705f08303 100644 --- a/module/apmgormio/go.mod +++ b/module/apmgormio/go.mod @@ -1,8 +1,6 @@ module go.elastic.co/apm/module/apmgormio require ( - cloud.google.com/go v0.40.0 // indirect - github.com/jinzhu/gorm v1.9.10 github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.5.1 go.elastic.co/apm v1.8.0 @@ -10,6 +8,7 @@ require ( gorm.io/driver/mysql v1.0.2 gorm.io/driver/postgres v1.0.2 gorm.io/driver/sqlite v1.1.3 + gorm.io/gorm v1.20.2 ) replace go.elastic.co/apm => ../.. diff --git a/module/apmgormio/go.sum b/module/apmgormio/go.sum index 0797e3197..4c4f1aca5 100644 --- a/module/apmgormio/go.sum +++ b/module/apmgormio/go.sum @@ -1,20 +1,6 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0 h1:eOI3/cP2VTU6uZLDYAoic+eyzzB9YyGmJ7eIjl8rOPg= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.40.0 h1:FjSY7bOj+WzJe6TZRVtXI2b9kAYvtNg4lMbcH2+MUkk= -cloud.google.com/go v0.40.0/go.mod h1:Tk58MuI9rbLMKlAjeO/bDnteAx7tX2gJIXw4T5Jwlro= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -25,50 +11,20 @@ github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAEl github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA= -github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/elastic/go-sysinfo v1.1.1 h1:ZVlaLDyhVkDfjwPGU55CQRCRolNpc7P0BbyhhQZQmMI= github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7aSY= github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= -github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -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= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -122,22 +78,15 @@ github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dv github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jinzhu/gorm v1.9.10 h1:HvrsqdhCW78xpJF67g1hMxS6eCToo9PZH4LDB8WKPac= -github.com/jinzhu/gorm v1.9.10/go.mod h1:Kh6hTsSGffh4ui079FHrR5Gg+5D0hgihqDcsDN2BBJY= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= -github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -147,8 +96,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= -github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -164,30 +111,15 @@ github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK86 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.3 h1:j7a/xn1U6TKA/PHHxqZuzh64CdtRc7rU9M+AvkOl5bA= github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= @@ -198,7 +130,6 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -215,8 +146,6 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4= go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= 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= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -225,9 +154,7 @@ go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKY go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -236,48 +163,23 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -287,19 +189,12 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -312,30 +207,11 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.6.0/go.mod h1:btoxGiFvQNVUZQ8W08zLtrVS08CNpINPEfxXxgJL1Q4= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -348,11 +224,6 @@ gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB4 gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v1.20.2 h1:bZzSEnq7NDGsrd+n3evOOedDrY5oLM5QPlCjZJUK2ro= gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From 22b67632276a70be38de3ddf05d4220dc0264555 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Sun, 4 Oct 2020 21:30:05 +0530 Subject: [PATCH 03/14] callback rename --- module/apmgormio/context.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/apmgormio/context.go b/module/apmgormio/context.go index 8eda9c243..c376fdb1d 100644 --- a/module/apmgormio/context.go +++ b/module/apmgormio/context.go @@ -90,20 +90,20 @@ func registerCallbacks(db *gorm.DB, dsnInfo apmsql.DSNInfo) { // Row Query Callbacks _ = db.Callback().Row(). - Before("gorm:row_query"). + Before("gorm:row"). Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) _ = db.Callback().Row(). - After("gorm:row_query"). + After("gorm:row"). Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) // Raw Query Callbacks _ = db.Callback().Row(). - Before("gorm:raw_query"). + Before("gorm:raw"). Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) _ = db.Callback().Row(). - After("gorm:raw_query"). + After("gorm:raw"). Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) } From 1832bb86fe71be0a7f323fea4364346ce5afa9eb Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Mon, 5 Oct 2020 08:57:46 +0530 Subject: [PATCH 04/14] adding plugin and renaming package to gormv2 --- .../{apmgormio => apmgormv2}/apmgorm_test.go | 22 ++++---- module/{apmgormio => apmgormv2}/context.go | 2 +- .../dialects/mysql/init.go | 4 +- .../dialects/postgres/init.go | 4 +- .../dialects/sqlite/init.go | 4 +- module/{apmgormio => apmgormv2}/doc.go | 2 +- module/{apmgormio => apmgormv2}/go.mod | 2 +- module/{apmgormio => apmgormv2}/go.sum | 0 module/{apmgormio => apmgormv2}/open.go | 18 +++---- module/apmgormv2/plugin.go | 51 +++++++++++++++++++ 10 files changed, 78 insertions(+), 31 deletions(-) rename module/{apmgormio => apmgormv2}/apmgorm_test.go (92%) rename module/{apmgormio => apmgormv2}/context.go (99%) rename module/{apmgormio => apmgormv2}/dialects/mysql/init.go (91%) rename module/{apmgormio => apmgormv2}/dialects/postgres/init.go (91%) rename module/{apmgormio => apmgormv2}/dialects/sqlite/init.go (91%) rename module/{apmgormio => apmgormv2}/doc.go (97%) rename module/{apmgormio => apmgormv2}/go.mod (89%) rename module/{apmgormio => apmgormv2}/go.sum (100%) rename module/{apmgormio => apmgormv2}/open.go (87%) create mode 100644 module/apmgormv2/plugin.go diff --git a/module/apmgormio/apmgorm_test.go b/module/apmgormv2/apmgorm_test.go similarity index 92% rename from module/apmgormio/apmgorm_test.go rename to module/apmgormv2/apmgorm_test.go index 3411df7f2..22a37518c 100644 --- a/module/apmgormio/apmgorm_test.go +++ b/module/apmgormv2/apmgorm_test.go @@ -17,11 +17,11 @@ // +build go1.9 -package apmgormio_test +package apmgormv2_test import ( "context" - "go.elastic.co/apm/module/apmgormio" + "go.elastic.co/apm/module/apmgormv2" "gorm.io/driver/mysql" "gorm.io/driver/postgres" "gorm.io/driver/sqlite" @@ -34,9 +34,9 @@ import ( "gorm.io/gorm" "go.elastic.co/apm/apmtest" - _ "go.elastic.co/apm/module/apmgormio/dialects/mysql" - _ "go.elastic.co/apm/module/apmgormio/dialects/postgres" - _ "go.elastic.co/apm/module/apmgormio/dialects/sqlite" + _ "go.elastic.co/apm/module/apmgormv2/dialects/mysql" + _ "go.elastic.co/apm/module/apmgormv2/dialects/postgres" + _ "go.elastic.co/apm/module/apmgormv2/dialects/sqlite" "go.elastic.co/apm/module/apmsql" ) @@ -89,7 +89,7 @@ func TestWithContext(t *testing.T) { func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialector, config *gorm.Config) { _, spans, errors := apmtest.WithTransaction(func(ctx context.Context) { - db, err := apmgormio.Open(dialect, config) + db, err := apmgormv2.Open(dialect, config) require.NoError(t, err) ddb, _ := db.DB() defer ddb.Close() @@ -143,7 +143,7 @@ func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialecto // TestWithContextNoTransaction checks that using WithContext without // a transaction won't cause any issues. func TestWithContextNoTransaction(t *testing.T) { - db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) ddb, _ := db.DB() defer ddb.Close() @@ -163,7 +163,7 @@ func TestWithContextNonSampled(t *testing.T) { os.Setenv("ELASTIC_APM_TRANSACTION_SAMPLE_RATE", "0") defer os.Unsetenv("ELASTIC_APM_TRANSACTION_SAMPLE_RATE") - db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) @@ -184,7 +184,7 @@ func TestWithContextNonSampled(t *testing.T) { func TestCaptureErrors(t *testing.T) { t.Run("sqlite3", func(t *testing.T) { - db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) ddb, _ := db.DB() @@ -197,7 +197,7 @@ func TestCaptureErrors(t *testing.T) { t.Logf("PGHOST not specified, skipping") } else { t.Run("postgres", func(t *testing.T) { - db, err := apmgormio.Open(postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}) + db, err := apmgormv2.Open(postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}) require.NoError(t, err) ddb, _ := db.DB() @@ -244,7 +244,7 @@ func testCaptureErrors(t *testing.T, db *gorm.DB) { } func TestOpenWithDriver(t *testing.T) { - db, err := apmgormio.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) diff --git a/module/apmgormio/context.go b/module/apmgormv2/context.go similarity index 99% rename from module/apmgormio/context.go rename to module/apmgormv2/context.go index c376fdb1d..65eb89ca2 100644 --- a/module/apmgormio/context.go +++ b/module/apmgormv2/context.go @@ -17,7 +17,7 @@ // +build go1.9 -package apmgormio +package apmgormv2 import ( "context" diff --git a/module/apmgormio/dialects/mysql/init.go b/module/apmgormv2/dialects/mysql/init.go similarity index 91% rename from module/apmgormio/dialects/mysql/init.go rename to module/apmgormv2/dialects/mysql/init.go index e4eb14c67..094ac00c6 100644 --- a/module/apmgormio/dialects/mysql/init.go +++ b/module/apmgormv2/dialects/mysql/init.go @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -// Package apmgormmysql imports the gorm mysql dialect package, +// Package apmgormv2mysql imports the gorm mysql dialect package, // and also registers the mysql driver with apmsql. -package apmgormiomysql +package apmgormv2mysql import ( _ "gorm.io/driver/mysql" // import the mysql dialect diff --git a/module/apmgormio/dialects/postgres/init.go b/module/apmgormv2/dialects/postgres/init.go similarity index 91% rename from module/apmgormio/dialects/postgres/init.go rename to module/apmgormv2/dialects/postgres/init.go index 821903a05..e00b5e959 100644 --- a/module/apmgormio/dialects/postgres/init.go +++ b/module/apmgormv2/dialects/postgres/init.go @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -// Package apmgormpostgres imports the gorm postgres dialect package, +// Package apmgormv2postgres imports the gorm postgres dialect package, // and also registers the lib/pq driver with apmsql. -package apmgormpostgres +package apmgormv2postgres import ( _ "gorm.io/driver/postgres" // import the postgres dialect diff --git a/module/apmgormio/dialects/sqlite/init.go b/module/apmgormv2/dialects/sqlite/init.go similarity index 91% rename from module/apmgormio/dialects/sqlite/init.go rename to module/apmgormv2/dialects/sqlite/init.go index e24837861..a3b735188 100644 --- a/module/apmgormio/dialects/sqlite/init.go +++ b/module/apmgormv2/dialects/sqlite/init.go @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -// Package apmgormsqlite imports the gorm sqlite dialect package, +// Package apmgormv2sqlite imports the gorm sqlite dialect package, // and also registers the sqlite3 driver with apmsql. -package apmgormsqlite +package apmgormv2sqlite import ( _ "gorm.io/driver/sqlite" // import the sqlite dialect diff --git a/module/apmgormio/doc.go b/module/apmgormv2/doc.go similarity index 97% rename from module/apmgormio/doc.go rename to module/apmgormv2/doc.go index 920ccdc82..ac5aa836c 100644 --- a/module/apmgormio/doc.go +++ b/module/apmgormv2/doc.go @@ -18,4 +18,4 @@ // +build go1.9 // Package apmgorm provides wrappers for tracing GORM operations. -package apmgormio +package apmgormv2 diff --git a/module/apmgormio/go.mod b/module/apmgormv2/go.mod similarity index 89% rename from module/apmgormio/go.mod rename to module/apmgormv2/go.mod index 705f08303..c3ea707de 100644 --- a/module/apmgormio/go.mod +++ b/module/apmgormv2/go.mod @@ -1,4 +1,4 @@ -module go.elastic.co/apm/module/apmgormio +module go.elastic.co/apm/module/apmgormv2 require ( github.com/pkg/errors v0.8.1 diff --git a/module/apmgormio/go.sum b/module/apmgormv2/go.sum similarity index 100% rename from module/apmgormio/go.sum rename to module/apmgormv2/go.sum diff --git a/module/apmgormio/open.go b/module/apmgormv2/open.go similarity index 87% rename from module/apmgormio/open.go rename to module/apmgormv2/open.go index 21ac24795..da3669b6d 100644 --- a/module/apmgormio/open.go +++ b/module/apmgormv2/open.go @@ -17,14 +17,13 @@ // +build go1.9 -package apmgormio +package apmgormv2 import ( "github.com/pkg/errors" "gorm.io/driver/sqlite" "gorm.io/gorm" - "go.elastic.co/apm/module/apmsql" "gorm.io/driver/mysql" "gorm.io/driver/postgres" ) @@ -35,28 +34,25 @@ import ( // as spans. // // Open accepts the following signatures: -// - a datasource name (i.e. the second argument to sql.Open) -// - a driver name and a datasource name -// - a *sql.DB, or some other type with the same interface +// - a gorm.Dialect +// - a *gorm.Config // // If a driver and datasource name are supplied, and the appropriate // apmgorm/dialects package has been imported (or the driver has // otherwise been registered with apmsql), then the datasource name // will be parsed for inclusion in the span context. func Open(dialect gorm.Dialector, config *gorm.Config) (*gorm.DB, error) { - dsn, err := extractDsn(dialect) - if err != nil { - return nil, err - } - db, err := gorm.Open(dialect, config) if err != nil { return nil, errors.WithStack(err) } - registerCallbacks(db, apmsql.DriverDSNParser(dialect.Name())(dsn)) + if err := db.Use(NewPlugin()); err != nil { + return nil, err + } return db, nil } +// Extracts dsn with given gorm.Dialector func extractDsn(dialect gorm.Dialector) (string, error) { switch dialect.Name() { case mysql.Dialector{}.Name(): diff --git a/module/apmgormv2/plugin.go b/module/apmgormv2/plugin.go new file mode 100644 index 000000000..02e46f921 --- /dev/null +++ b/module/apmgormv2/plugin.go @@ -0,0 +1,51 @@ +// Licensed to Elasticsearch B.V. under one or more contributor +// license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright +// ownership. Elasticsearch B.V. licenses this file to you under +// the Apache License, Version 2.0 (the "License"); you may +// not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +// +build go1.9 + +package apmgormv2 + +import ( + "go.elastic.co/apm/module/apmsql" + "gorm.io/gorm" +) + +// Plugin struct +// - It can be used with existing *gorm.DB using db.Use(NewPlugin()) +type Plugin struct { +} + +// NewPlugin plugin constructor +func NewPlugin() *Plugin { + return &Plugin{} +} + +// Name name of plugin +func (p Plugin) Name() string { + return "elasticapm" +} + +// Initialize to register callbacks +func (p Plugin) Initialize(db *gorm.DB) error { + dialect := db.Dialector + dsn, err := extractDsn(dialect) + if err != nil { + return err + } + registerCallbacks(db, apmsql.DriverDSNParser(dialect.Name())(dsn)) + return nil +} From 36ae537ade3a354d03ffa3846301fdbaaa2b03b5 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Mon, 5 Oct 2020 09:50:26 +0530 Subject: [PATCH 05/14] move to apmsql --- module/apmgormv2/open.go | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/module/apmgormv2/open.go b/module/apmgormv2/open.go index da3669b6d..67d0dc916 100644 --- a/module/apmgormv2/open.go +++ b/module/apmgormv2/open.go @@ -20,7 +20,9 @@ package apmgormv2 import ( + "database/sql" "github.com/pkg/errors" + "go.elastic.co/apm/module/apmsql" "gorm.io/driver/sqlite" "gorm.io/gorm" @@ -42,10 +44,31 @@ import ( // otherwise been registered with apmsql), then the datasource name // will be parsed for inclusion in the span context. func Open(dialect gorm.Dialector, config *gorm.Config) (*gorm.DB, error) { + if err := initDialect(dialect); err != nil { + return nil, errors.WithStack(err) + } + db, err := gorm.Open(dialect, config) + if err != nil { return nil, errors.WithStack(err) } + + if dialect.Name() == (sqlite.Dialector{}.Name()) { + dsn, err := extractDsn(dialect) + if err != nil { + return nil, err + } + conn, err := apmsql.Open(dialect.Name(), dsn) + if err != nil { + return nil, err + } + if oldConn, ok := db.ConnPool.(*sql.DB); ok { + _ = oldConn.Close() + } + db.ConnPool = conn + } + if err := db.Use(NewPlugin()); err != nil { return nil, err } @@ -76,3 +99,31 @@ func extractDsn(dialect gorm.Dialector) (string, error) { } return "", errors.New("dialect not supported") } + +func initDialect(dialect gorm.Dialector) error { + dsn, err := extractDsn(dialect) + if err != nil { + return err + } + conn, err := apmsql.Open(dialect.Name(), dsn) + if err != nil { + return err + } + switch dialect.Name() { + case mysql.Dialector{}.Name(): + if driver, ok := dialect.(mysql.Dialector); !ok { + return errors.New("unable to cast dialect") + } else { + driver.Conn = conn + } + case postgres.Dialector{}.Name(): + if driver, ok := dialect.(postgres.Dialector); !ok { + return errors.New("unable to cast dialect") + } else { + driver.Conn = conn + } + case sqlite.Dialector{}.Name(): + return nil + } + return errors.New("invalid dialect") +} From a5903a0d9ae2a3c3faa79336c11ac3a1a5786410 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Tue, 6 Oct 2020 10:50:41 +0530 Subject: [PATCH 06/14] create apm dialects --- module/apmgormv2/apmgorm_test.go | 22 ++- module/apmgormv2/context.go | 168 --------------------- module/apmgormv2/dialects/mysql/init.go | 17 ++- module/apmgormv2/dialects/postgres/init.go | 18 ++- module/apmgormv2/dialects/sqlite/init.go | 15 +- module/apmgormv2/go.mod | 3 +- module/apmgormv2/go.sum | 5 +- module/apmgormv2/open.go | 129 ---------------- module/apmgormv2/plugin.go | 51 ------- 9 files changed, 59 insertions(+), 369 deletions(-) delete mode 100644 module/apmgormv2/context.go delete mode 100644 module/apmgormv2/open.go delete mode 100644 module/apmgormv2/plugin.go diff --git a/module/apmgormv2/apmgorm_test.go b/module/apmgormv2/apmgorm_test.go index 22a37518c..55de6cb9a 100644 --- a/module/apmgormv2/apmgorm_test.go +++ b/module/apmgormv2/apmgorm_test.go @@ -21,10 +21,6 @@ package apmgormv2_test import ( "context" - "go.elastic.co/apm/module/apmgormv2" - "gorm.io/driver/mysql" - "gorm.io/driver/postgres" - "gorm.io/driver/sqlite" "gorm.io/gorm/logger" "os" "testing" @@ -34,9 +30,9 @@ import ( "gorm.io/gorm" "go.elastic.co/apm/apmtest" - _ "go.elastic.co/apm/module/apmgormv2/dialects/mysql" - _ "go.elastic.co/apm/module/apmgormv2/dialects/postgres" - _ "go.elastic.co/apm/module/apmgormv2/dialects/sqlite" + mysql "go.elastic.co/apm/module/apmgormv2/dialects/mysql" + postgres "go.elastic.co/apm/module/apmgormv2/dialects/postgres" + sqlite "go.elastic.co/apm/module/apmgormv2/dialects/sqlite" "go.elastic.co/apm/module/apmsql" ) @@ -89,7 +85,7 @@ func TestWithContext(t *testing.T) { func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialector, config *gorm.Config) { _, spans, errors := apmtest.WithTransaction(func(ctx context.Context) { - db, err := apmgormv2.Open(dialect, config) + db, err := gorm.Open(dialect, config) require.NoError(t, err) ddb, _ := db.DB() defer ddb.Close() @@ -143,7 +139,7 @@ func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialecto // TestWithContextNoTransaction checks that using WithContext without // a transaction won't cause any issues. func TestWithContextNoTransaction(t *testing.T) { - db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) ddb, _ := db.DB() defer ddb.Close() @@ -163,7 +159,7 @@ func TestWithContextNonSampled(t *testing.T) { os.Setenv("ELASTIC_APM_TRANSACTION_SAMPLE_RATE", "0") defer os.Unsetenv("ELASTIC_APM_TRANSACTION_SAMPLE_RATE") - db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) @@ -184,7 +180,7 @@ func TestWithContextNonSampled(t *testing.T) { func TestCaptureErrors(t *testing.T) { t.Run("sqlite3", func(t *testing.T) { - db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) ddb, _ := db.DB() @@ -197,7 +193,7 @@ func TestCaptureErrors(t *testing.T) { t.Logf("PGHOST not specified, skipping") } else { t.Run("postgres", func(t *testing.T) { - db, err := apmgormv2.Open(postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}) + db, err := gorm.Open(postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}) require.NoError(t, err) ddb, _ := db.DB() @@ -244,7 +240,7 @@ func testCaptureErrors(t *testing.T, db *gorm.DB) { } func TestOpenWithDriver(t *testing.T) { - db, err := apmgormv2.Open(sqlite.Open(":memory:"), &gorm.Config{}) + db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{}) require.NoError(t, err) diff --git a/module/apmgormv2/context.go b/module/apmgormv2/context.go deleted file mode 100644 index 65eb89ca2..000000000 --- a/module/apmgormv2/context.go +++ /dev/null @@ -1,168 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -// +build go1.9 - -package apmgormv2 - -import ( - "context" - "database/sql" - "errors" - "fmt" - "strings" - - "gorm.io/gorm" - - "go.elastic.co/apm" - "go.elastic.co/apm/module/apmsql" -) - -func scopeContext(scope *gorm.DB) (context.Context, bool) { - if scope.Statement == nil { - return nil, false - } - ctx := scope.Statement.Context - return ctx, ctx != nil -} - -func registerCallbacks(db *gorm.DB, dsnInfo apmsql.DSNInfo) { - driverName := db.Dialector.Name() - switch driverName { - case "postgres": - driverName = "postgresql" - } - spanTypePrefix := fmt.Sprintf("db.%s.", driverName) - querySpanType := spanTypePrefix + "query" - execSpanType := spanTypePrefix + "exec" - - const callbackPrefix = "elasticapm" - - // Create Callbacks - _ = db.Callback().Create(). - Before("gorm:create"). - Register(fmt.Sprintf("%s:before:%s", callbackPrefix, execSpanType), newBeforeCallback(execSpanType)) - - _ = db.Callback().Create(). - After("gorm:create"). - Register(fmt.Sprintf("%s:after:%s", callbackPrefix, execSpanType), newAfterCallback(dsnInfo)) - - // Delete Callbacks - _ = db.Callback().Delete(). - Before("gorm:delete"). - Register(fmt.Sprintf("%s:before:%s", callbackPrefix, execSpanType), newBeforeCallback(execSpanType)) - - _ = db.Callback().Delete(). - After("gorm:delete"). - Register(fmt.Sprintf("%s:after:%s", callbackPrefix, execSpanType), newAfterCallback(dsnInfo)) - - // Update Callbacks - _ = db.Callback().Update(). - Before("gorm:update"). - Register(fmt.Sprintf("%s:before:%s", callbackPrefix, execSpanType), newBeforeCallback(execSpanType)) - - _ = db.Callback().Update(). - After("gorm:update"). - Register(fmt.Sprintf("%s:after:%s", callbackPrefix, execSpanType), newAfterCallback(dsnInfo)) - - // Query Callbacks - _ = db.Callback().Query(). - Before("gorm:query"). - Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) - - _ = db.Callback().Query(). - After("gorm:query"). - Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) - - // Row Query Callbacks - _ = db.Callback().Row(). - Before("gorm:row"). - Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) - - _ = db.Callback().Row(). - After("gorm:row"). - Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) - - // Raw Query Callbacks - _ = db.Callback().Row(). - Before("gorm:raw"). - Register(fmt.Sprintf("%s:before:%s", callbackPrefix, querySpanType), newBeforeCallback(querySpanType)) - - _ = db.Callback().Row(). - After("gorm:raw"). - Register(fmt.Sprintf("%s:after:%s", callbackPrefix, querySpanType), newAfterCallback(dsnInfo)) -} - -func newBeforeCallback(spanType string) func(*gorm.DB) { - return func(scope *gorm.DB) { - ctx, ok := scopeContext(scope) - if !ok { - return - } - span, ctx := apm.StartSpan(ctx, "", spanType) - if span.Dropped() { - span.End() - ctx = nil - } - scope.Statement.Context = ctx - } -} - -func newAfterCallback(dsnInfo apmsql.DSNInfo) func(*gorm.DB) { - return func(scope *gorm.DB) { - ctx, ok := scopeContext(scope) - if !ok { - return - } - span := apm.SpanFromContext(ctx) - if span == nil { - return - } - - statement := scope.Statement.SQL.String() - span.Name = apmsql.QuerySignature(statement) - span.Context.SetDestinationAddress(dsnInfo.Address, dsnInfo.Port) - span.Context.SetDatabase(apm.DatabaseSpanContext{ - Instance: dsnInfo.Database, - Statement: statement, - Type: "sql", - User: dsnInfo.User, - }) - defer span.End() - - // Capture errors, except for "record not found", which may be expected. - for _, err := range extractErrors(scope) { - if err == gorm.ErrRecordNotFound || err == sql.ErrNoRows { - continue - } - if e := apm.CaptureError(ctx, err); e != nil { - e.Send() - } - } - } -} - -func extractErrors(db *gorm.DB) []error { - if db.Error == nil { - return nil - } - var errs []error - for _, err := range strings.Split(db.Error.Error(), "; ") { - errs = append(errs, errors.New(err)) - } - return errs -} diff --git a/module/apmgormv2/dialects/mysql/init.go b/module/apmgormv2/dialects/mysql/init.go index 094ac00c6..a7eccbe8f 100644 --- a/module/apmgormv2/dialects/mysql/init.go +++ b/module/apmgormv2/dialects/mysql/init.go @@ -20,7 +20,22 @@ package apmgormv2mysql import ( - _ "gorm.io/driver/mysql" // import the mysql dialect + "go.elastic.co/apm/module/apmsql" + "gorm.io/driver/mysql" + "gorm.io/gorm" _ "go.elastic.co/apm/module/apmsql/mysql" // register mysql with apmsql ) + +// Open creates a dialect with apmsql +func Open(dsn string) gorm.Dialector { + driverName := mysql.Dialector{}.Name() + dialect := &mysql.Dialector{ + Config: &mysql.Config{ + DriverName: apmsql.DriverPrefix + driverName, + DSN: dsn, + }, + } + + return dialect +} diff --git a/module/apmgormv2/dialects/postgres/init.go b/module/apmgormv2/dialects/postgres/init.go index e00b5e959..e0e6ba87a 100644 --- a/module/apmgormv2/dialects/postgres/init.go +++ b/module/apmgormv2/dialects/postgres/init.go @@ -20,7 +20,23 @@ package apmgormv2postgres import ( - _ "gorm.io/driver/postgres" // import the postgres dialect + "go.elastic.co/apm/module/apmsql" + "gorm.io/driver/postgres" + "gorm.io/gorm" _ "go.elastic.co/apm/module/apmsql/pq" // register lib/pq with apmsql ) + +// Open creates a dialect with apmsql +func Open(dsn string) gorm.Dialector { + driverName := postgres.Dialector{}.Name() + + dialect := &postgres.Dialector{ + Config: &postgres.Config{ + DriverName: apmsql.DriverPrefix + driverName, + DSN: dsn, + }, + } + + return dialect +} diff --git a/module/apmgormv2/dialects/sqlite/init.go b/module/apmgormv2/dialects/sqlite/init.go index a3b735188..2d84ebfbd 100644 --- a/module/apmgormv2/dialects/sqlite/init.go +++ b/module/apmgormv2/dialects/sqlite/init.go @@ -20,7 +20,20 @@ package apmgormv2sqlite import ( - _ "gorm.io/driver/sqlite" // import the sqlite dialect + "gorm.io/driver/sqlite" + "gorm.io/gorm" _ "go.elastic.co/apm/module/apmsql/sqlite3" // register sqlite3 with apmsql ) + +// Open creates a dialect with apmsql +func Open(dsn string) gorm.Dialector { + driverName := sqlite.Dialector{}.Name() + + dialect := &sqlite.Dialector{ + DSN: dsn, + DriverName: driverName, + } + + return dialect +} diff --git a/module/apmgormv2/go.mod b/module/apmgormv2/go.mod index c3ea707de..11641d2c9 100644 --- a/module/apmgormv2/go.mod +++ b/module/apmgormv2/go.mod @@ -1,13 +1,12 @@ module go.elastic.co/apm/module/apmgormv2 require ( - github.com/pkg/errors v0.8.1 github.com/stretchr/testify v1.5.1 go.elastic.co/apm v1.8.0 go.elastic.co/apm/module/apmsql v1.8.0 gorm.io/driver/mysql v1.0.2 gorm.io/driver/postgres v1.0.2 - gorm.io/driver/sqlite v1.1.3 + gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d gorm.io/gorm v1.20.2 ) diff --git a/module/apmgormv2/go.sum b/module/apmgormv2/go.sum index 4c4f1aca5..1f114cfd7 100644 --- a/module/apmgormv2/go.sum +++ b/module/apmgormv2/go.sum @@ -219,9 +219,8 @@ gorm.io/driver/mysql v1.0.2 h1:xm21Um8cR/Cg+nMwSrajf8aBUxOIC+WmH72ir/ByYR8= gorm.io/driver/mysql v1.0.2/go.mod h1:T+Fv7Rq/8+lpS3X1KKVUbj8Y/SzbPa5esK9KpPAKXR8= gorm.io/driver/postgres v1.0.2 h1:mB5JjD4QglbCTdMT1aZDxQzHr87XDK1qh0MKIU3P96g= gorm.io/driver/postgres v1.0.2/go.mod h1:FvRSYfBI9jEp6ZSjlpS9qNcSjxwYxFc03UOTrHdvvYA= -gorm.io/driver/sqlite v1.1.3 h1:BYfdVuZB5He/u9dt4qDpZqiqDJ6KhPqs5QUqsr/Eeuc= -gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB45c= -gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d h1:oT3yy0p2Z+MkLvaQlkY4g2jpO16E3nA8wU7+1DSdJUk= +gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d/go.mod h1:DV58HRJvX3ANmQbY3Lkhohs+CtWo2aiJ4n0OPwzSrDI= gorm.io/gorm v1.20.2 h1:bZzSEnq7NDGsrd+n3evOOedDrY5oLM5QPlCjZJUK2ro= gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= diff --git a/module/apmgormv2/open.go b/module/apmgormv2/open.go deleted file mode 100644 index 67d0dc916..000000000 --- a/module/apmgormv2/open.go +++ /dev/null @@ -1,129 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -// +build go1.9 - -package apmgormv2 - -import ( - "database/sql" - "github.com/pkg/errors" - "go.elastic.co/apm/module/apmsql" - "gorm.io/driver/sqlite" - "gorm.io/gorm" - - "gorm.io/driver/mysql" - "gorm.io/driver/postgres" -) - -// Open returns a *gorm.DB for the given dialect and arguments. -// The returned *gorm.DB will have callbacks registered with -// RegisterCallbacks, such that CRUD operations will be reported -// as spans. -// -// Open accepts the following signatures: -// - a gorm.Dialect -// - a *gorm.Config -// -// If a driver and datasource name are supplied, and the appropriate -// apmgorm/dialects package has been imported (or the driver has -// otherwise been registered with apmsql), then the datasource name -// will be parsed for inclusion in the span context. -func Open(dialect gorm.Dialector, config *gorm.Config) (*gorm.DB, error) { - if err := initDialect(dialect); err != nil { - return nil, errors.WithStack(err) - } - - db, err := gorm.Open(dialect, config) - - if err != nil { - return nil, errors.WithStack(err) - } - - if dialect.Name() == (sqlite.Dialector{}.Name()) { - dsn, err := extractDsn(dialect) - if err != nil { - return nil, err - } - conn, err := apmsql.Open(dialect.Name(), dsn) - if err != nil { - return nil, err - } - if oldConn, ok := db.ConnPool.(*sql.DB); ok { - _ = oldConn.Close() - } - db.ConnPool = conn - } - - if err := db.Use(NewPlugin()); err != nil { - return nil, err - } - return db, nil -} - -// Extracts dsn with given gorm.Dialector -func extractDsn(dialect gorm.Dialector) (string, error) { - switch dialect.Name() { - case mysql.Dialector{}.Name(): - if driver, ok := dialect.(mysql.Dialector); !ok { - return "", errors.New("unable to cast dialect") - } else { - return driver.DSN, nil - } - case postgres.Dialector{}.Name(): - if driver, ok := dialect.(postgres.Dialector); !ok { - return "", errors.New("unable to cast dialect") - } else { - return driver.DSN, nil - } - case sqlite.Dialector{}.Name(): - if driver, ok := dialect.(sqlite.Dialector); !ok { - return "", errors.New("unable to cast dialect") - } else { - return driver.DSN, nil - } - } - return "", errors.New("dialect not supported") -} - -func initDialect(dialect gorm.Dialector) error { - dsn, err := extractDsn(dialect) - if err != nil { - return err - } - conn, err := apmsql.Open(dialect.Name(), dsn) - if err != nil { - return err - } - switch dialect.Name() { - case mysql.Dialector{}.Name(): - if driver, ok := dialect.(mysql.Dialector); !ok { - return errors.New("unable to cast dialect") - } else { - driver.Conn = conn - } - case postgres.Dialector{}.Name(): - if driver, ok := dialect.(postgres.Dialector); !ok { - return errors.New("unable to cast dialect") - } else { - driver.Conn = conn - } - case sqlite.Dialector{}.Name(): - return nil - } - return errors.New("invalid dialect") -} diff --git a/module/apmgormv2/plugin.go b/module/apmgormv2/plugin.go deleted file mode 100644 index 02e46f921..000000000 --- a/module/apmgormv2/plugin.go +++ /dev/null @@ -1,51 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -// +build go1.9 - -package apmgormv2 - -import ( - "go.elastic.co/apm/module/apmsql" - "gorm.io/gorm" -) - -// Plugin struct -// - It can be used with existing *gorm.DB using db.Use(NewPlugin()) -type Plugin struct { -} - -// NewPlugin plugin constructor -func NewPlugin() *Plugin { - return &Plugin{} -} - -// Name name of plugin -func (p Plugin) Name() string { - return "elasticapm" -} - -// Initialize to register callbacks -func (p Plugin) Initialize(db *gorm.DB) error { - dialect := db.Dialector - dsn, err := extractDsn(dialect) - if err != nil { - return err - } - registerCallbacks(db, apmsql.DriverDSNParser(dialect.Name())(dsn)) - return nil -} From 903ff57470f07878a2ebd6c6b0f71e0bf656d368 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Tue, 6 Oct 2020 10:57:07 +0530 Subject: [PATCH 07/14] renaming packages --- module/apmgormv2/dialects/mysql/init.go | 4 ++-- module/apmgormv2/dialects/postgres/init.go | 4 ++-- module/apmgormv2/dialects/sqlite/init.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/apmgormv2/dialects/mysql/init.go b/module/apmgormv2/dialects/mysql/init.go index a7eccbe8f..1b0d0f932 100644 --- a/module/apmgormv2/dialects/mysql/init.go +++ b/module/apmgormv2/dialects/mysql/init.go @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -// Package apmgormv2mysql imports the gorm mysql dialect package, +// Package apmmysql imports the gorm mysql dialect package, // and also registers the mysql driver with apmsql. -package apmgormv2mysql +package apmmysql import ( "go.elastic.co/apm/module/apmsql" diff --git a/module/apmgormv2/dialects/postgres/init.go b/module/apmgormv2/dialects/postgres/init.go index e0e6ba87a..09f19f06e 100644 --- a/module/apmgormv2/dialects/postgres/init.go +++ b/module/apmgormv2/dialects/postgres/init.go @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -// Package apmgormv2postgres imports the gorm postgres dialect package, +// Package apmpostgres imports the gorm postgres dialect package, // and also registers the lib/pq driver with apmsql. -package apmgormv2postgres +package apmgpostgres import ( "go.elastic.co/apm/module/apmsql" diff --git a/module/apmgormv2/dialects/sqlite/init.go b/module/apmgormv2/dialects/sqlite/init.go index 2d84ebfbd..272039bca 100644 --- a/module/apmgormv2/dialects/sqlite/init.go +++ b/module/apmgormv2/dialects/sqlite/init.go @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -// Package apmgormv2sqlite imports the gorm sqlite dialect package, +// Package apmsqlite imports the gorm sqlite dialect package, // and also registers the sqlite3 driver with apmsql. -package apmgormv2sqlite +package apmsqlite import ( "gorm.io/driver/sqlite" From dcc8944f8b643868cd634a4a3939cd28b551857d Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Tue, 6 Oct 2020 11:18:01 +0530 Subject: [PATCH 08/14] renaming to driver and adding readme --- module/apmgormv2/README.md | 20 +++++++++++++++++++ module/apmgormv2/apmgorm_test.go | 6 +++--- .../{dialects => driver}/mysql/init.go | 0 .../{dialects => driver}/postgres/init.go | 0 .../{dialects => driver}/sqlite/init.go | 0 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 module/apmgormv2/README.md rename module/apmgormv2/{dialects => driver}/mysql/init.go (100%) rename module/apmgormv2/{dialects => driver}/postgres/init.go (100%) rename module/apmgormv2/{dialects => driver}/sqlite/init.go (100%) diff --git a/module/apmgormv2/README.md b/module/apmgormv2/README.md new file mode 100644 index 000000000..869b0fecc --- /dev/null +++ b/module/apmgormv2/README.md @@ -0,0 +1,20 @@ +# apmgormv2 + +Package apmgormv2 provides drivers to gorm.io/gorm +for tracing database operations as spans of a transaction traced +by Elastic APM. + +## Usage + +Swap `gorm.io/driver/*` to `go.elastic.co/apm/module/apmgormv2/driver/*` + +Example :- + +```golang +import ( + mysql "go.elastic.co/apm/module/apmgormv2/driver/mysql" + "gorm.io/gorm" +) + +db, err := gorm.Open(mysql.Open("dsn"), &gorm.Config{}) +``` \ No newline at end of file diff --git a/module/apmgormv2/apmgorm_test.go b/module/apmgormv2/apmgorm_test.go index 55de6cb9a..d88631c88 100644 --- a/module/apmgormv2/apmgorm_test.go +++ b/module/apmgormv2/apmgorm_test.go @@ -30,9 +30,9 @@ import ( "gorm.io/gorm" "go.elastic.co/apm/apmtest" - mysql "go.elastic.co/apm/module/apmgormv2/dialects/mysql" - postgres "go.elastic.co/apm/module/apmgormv2/dialects/postgres" - sqlite "go.elastic.co/apm/module/apmgormv2/dialects/sqlite" + mysql "go.elastic.co/apm/module/apmgormv2/driver/mysql" + postgres "go.elastic.co/apm/module/apmgormv2/driver/postgres" + sqlite "go.elastic.co/apm/module/apmgormv2/driver/sqlite" "go.elastic.co/apm/module/apmsql" ) diff --git a/module/apmgormv2/dialects/mysql/init.go b/module/apmgormv2/driver/mysql/init.go similarity index 100% rename from module/apmgormv2/dialects/mysql/init.go rename to module/apmgormv2/driver/mysql/init.go diff --git a/module/apmgormv2/dialects/postgres/init.go b/module/apmgormv2/driver/postgres/init.go similarity index 100% rename from module/apmgormv2/dialects/postgres/init.go rename to module/apmgormv2/driver/postgres/init.go diff --git a/module/apmgormv2/dialects/sqlite/init.go b/module/apmgormv2/driver/sqlite/init.go similarity index 100% rename from module/apmgormv2/dialects/sqlite/init.go rename to module/apmgormv2/driver/sqlite/init.go From 3874c18cb9bf7a0def983a1b289b4e744d03f4a6 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Tue, 6 Oct 2020 15:48:18 +0530 Subject: [PATCH 09/14] removing postgres, fix sqlite, fix test cases --- module/apmgormv2/apmgorm_test.go | 49 ++++-------------------- module/apmgormv2/driver/postgres/init.go | 42 -------------------- module/apmgormv2/driver/sqlite/init.go | 4 +- 3 files changed, 10 insertions(+), 85 deletions(-) delete mode 100644 module/apmgormv2/driver/postgres/init.go diff --git a/module/apmgormv2/apmgorm_test.go b/module/apmgormv2/apmgorm_test.go index d88631c88..ac0de676e 100644 --- a/module/apmgormv2/apmgorm_test.go +++ b/module/apmgormv2/apmgorm_test.go @@ -23,6 +23,7 @@ import ( "context" "gorm.io/gorm/logger" "os" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -31,7 +32,6 @@ import ( "go.elastic.co/apm/apmtest" mysql "go.elastic.co/apm/module/apmgormv2/driver/mysql" - postgres "go.elastic.co/apm/module/apmgormv2/driver/postgres" sqlite "go.elastic.co/apm/module/apmgormv2/driver/sqlite" "go.elastic.co/apm/module/apmsql" ) @@ -50,22 +50,6 @@ func TestWithContext(t *testing.T) { ) }) - if os.Getenv("PGHOST") == "" { - t.Logf("PGHOST not specified, skipping") - } else { - t.Run("postgres", func(t *testing.T) { - testWithContext(t, - apmsql.DSNInfo{ - Address: os.Getenv("PGHOST"), - Port: 5432, - Database: "test_db", - User: "postgres", - }, - postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}, - ) - }) - } - if mysqlHost := os.Getenv("MYSQL_HOST"); mysqlHost == "" { t.Logf("MYSQL_HOST not specified, skipping") } else { @@ -101,7 +85,7 @@ func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialecto var product Product var count int64 assert.NoError(t, db.Model(&product).Count(&count).Error) - assert.Equal(t, 1, count) + assert.Equal(t, int64(1), count) assert.NoError(t, db.First(&product, "code = ?", "L1212").Error) assert.NoError(t, db.Model(&product).Update("Price", 2000).Error) assert.NoError(t, db.Delete(&product).Error) // soft @@ -110,9 +94,11 @@ func testWithContext(t *testing.T, dsnInfo apmsql.DSNInfo, dialect gorm.Dialecto require.NotEmpty(t, spans) assert.Empty(t, errors) - spanNames := make([]string, len(spans)) - for i, span := range spans { - spanNames[i] = span.Name + var spanNames []string + for _, span := range spans { + if strings.Contains(span.Name, "products") && span.Action != "prepare" { + spanNames = append(spanNames, span.Name) + } require.NotNil(t, span.Context) require.NotNil(t, span.Context.Database) assert.Equal(t, dsnInfo.Database, span.Context.Database.Instance) @@ -188,20 +174,6 @@ func TestCaptureErrors(t *testing.T) { testCaptureErrors(t, db) }) - - if os.Getenv("PGHOST") == "" { - t.Logf("PGHOST not specified, skipping") - } else { - t.Run("postgres", func(t *testing.T) { - db, err := gorm.Open(postgres.Open("user=postgres password=hunter2 dbname=test_db sslmode=disable"), &gorm.Config{}) - require.NoError(t, err) - - ddb, _ := db.DB() - defer ddb.Close() - - testCaptureErrors(t, db) - }) - } } func testCaptureErrors(t *testing.T, db *gorm.DB) { @@ -217,10 +189,6 @@ func testCaptureErrors(t *testing.T, db *gorm.DB) { // gorm.ErrRecordNotFound should not cause an error db.Where("code=?", "L1212").First(&Product{}) - // The postgres dialect will use QueryRow when inserting, in order to fetch - // the inserted row ID. By using "ON CONFLICT (id) DO NOTHING", no row will - // be inserted, and QueryRow will return sql.ErrNoRows. This should not be - // reported as an error. product := Product{ Model: gorm.Model{ ID: 1001, @@ -229,12 +197,11 @@ func testCaptureErrors(t *testing.T, db *gorm.DB) { Price: 1001, } require.NoError(t, db.Create(&product).Error) - db.Set("gorm:insert_option", "ON CONFLICT (id) DO NOTHING").Create(&product) // invalid SQL should db.Where("bananas").First(&Product{}) }) - assert.Len(t, spans, 4) + assert.Len(t, spans, 3) require.Len(t, errors, 1) assert.Regexp(t, `.*bananas.*`, errors[0].Exception.Message) } diff --git a/module/apmgormv2/driver/postgres/init.go b/module/apmgormv2/driver/postgres/init.go deleted file mode 100644 index 09f19f06e..000000000 --- a/module/apmgormv2/driver/postgres/init.go +++ /dev/null @@ -1,42 +0,0 @@ -// Licensed to Elasticsearch B.V. under one or more contributor -// license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright -// ownership. Elasticsearch B.V. licenses this file to you under -// the Apache License, Version 2.0 (the "License"); you may -// not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -// Package apmpostgres imports the gorm postgres dialect package, -// and also registers the lib/pq driver with apmsql. -package apmgpostgres - -import ( - "go.elastic.co/apm/module/apmsql" - "gorm.io/driver/postgres" - "gorm.io/gorm" - - _ "go.elastic.co/apm/module/apmsql/pq" // register lib/pq with apmsql -) - -// Open creates a dialect with apmsql -func Open(dsn string) gorm.Dialector { - driverName := postgres.Dialector{}.Name() - - dialect := &postgres.Dialector{ - Config: &postgres.Config{ - DriverName: apmsql.DriverPrefix + driverName, - DSN: dsn, - }, - } - - return dialect -} diff --git a/module/apmgormv2/driver/sqlite/init.go b/module/apmgormv2/driver/sqlite/init.go index 272039bca..cc11d0424 100644 --- a/module/apmgormv2/driver/sqlite/init.go +++ b/module/apmgormv2/driver/sqlite/init.go @@ -20,6 +20,7 @@ package apmsqlite import ( + "go.elastic.co/apm/module/apmsql" "gorm.io/driver/sqlite" "gorm.io/gorm" @@ -28,11 +29,10 @@ import ( // Open creates a dialect with apmsql func Open(dsn string) gorm.Dialector { - driverName := sqlite.Dialector{}.Name() dialect := &sqlite.Dialector{ DSN: dsn, - DriverName: driverName, + DriverName: apmsql.DriverPrefix + sqlite.DriverName, } return dialect From 90861a5ca4944529f1af3137e934c02d06a992da Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Tue, 6 Oct 2020 15:50:27 +0530 Subject: [PATCH 10/14] removing postgres deps --- module/apmgormv2/go.mod | 2 +- module/apmgormv2/go.sum | 135 ---------------------------------------- 2 files changed, 1 insertion(+), 136 deletions(-) diff --git a/module/apmgormv2/go.mod b/module/apmgormv2/go.mod index 11641d2c9..ece3a06ff 100644 --- a/module/apmgormv2/go.mod +++ b/module/apmgormv2/go.mod @@ -4,8 +4,8 @@ require ( github.com/stretchr/testify v1.5.1 go.elastic.co/apm v1.8.0 go.elastic.co/apm/module/apmsql v1.8.0 + golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect gorm.io/driver/mysql v1.0.2 - gorm.io/driver/postgres v1.0.2 gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d gorm.io/gorm v1.20.2 ) diff --git a/module/apmgormv2/go.sum b/module/apmgormv2/go.sum index 1f114cfd7..7e60a22f5 100644 --- a/module/apmgormv2/go.sum +++ b/module/apmgormv2/go.sum @@ -1,11 +1,5 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= -github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/cucumber/godog v0.8.1 h1:lVb+X41I4YDreE+ibZ50bdXmySxgRviYFgKY6Aw4XE8= github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -17,66 +11,10 @@ github.com/elastic/go-windows v1.0.0 h1:qLURgZFkkrYyTTkvYpsZIgf83AUsdIHfvlJaqaZ7 github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= -github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= -github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= -github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= -github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= -github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= -github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= -github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= -github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= -github.com/jackc/pgconn v1.7.0 h1:pwjzcYyfmz/HQOQlENvG1OcDqauTGaqlVahq934F0/U= -github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA= -github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= -github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= -github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= -github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= -github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= -github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= -github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= -github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= -github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.0.5 h1:NUbEWPmCQZbMmYlTjVoNPhc0CfnYyz2bfUAh6A5ZVJM= -github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= -github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= -github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= -github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= -github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= -github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= -github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= -github.com/jackc/pgtype v1.5.0 h1:jzBqRk2HFG2CV4AIwgCI2PwTgm6UUoCAK2ofHHRirtc= -github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= -github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= -github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= -github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= -github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= -github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= -github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= -github.com/jackc/pgx/v4 v4.9.0 h1:6STjDqppM2ROy5p1wNDcsC7zJTjSHeuCsguZmXyzx7c= -github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms= -github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= -github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= @@ -84,29 +22,13 @@ github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E= github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 h1:rp+c0RAYOWj8l6qbCUTSiRLG/iKnW3K3/QfPPuSsBt4= github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.3 h1:j7a/xn1U6TKA/PHHxqZuzh64CdtRc7rU9M+AvkOl5bA= @@ -120,22 +42,9 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3 h1:CTwfnzjQ+8dS6MhHHu4YswVAD99sL2wjPqP+VkURmKE= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= -github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/santhosh-tekuri/jsonschema v1.2.4 h1:hNhW8e7t+H1vgY+1QeEQpveR6D4+OwKPXCfD2aieJis= github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= -github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= @@ -143,66 +52,27 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.elastic.co/fastjson v1.1.0 h1:3MrGBWWVIxe/xvsbpghtkFoPciPhOCmjsR/HfwEeQR4= go.elastic.co/fastjson v1.1.0/go.mod h1:boNGISWMjQsUPy/t6yqt2/1Wx4YNPSe+mZjlyw9vKKI= -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= -go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= -go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e h1:9vRrk9YW2BTzLP0VCB9ZDjU4cPqkg+IDWL7XgxA1yxQ= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= @@ -210,19 +80,14 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gorm.io/driver/mysql v1.0.2 h1:xm21Um8cR/Cg+nMwSrajf8aBUxOIC+WmH72ir/ByYR8= gorm.io/driver/mysql v1.0.2/go.mod h1:T+Fv7Rq/8+lpS3X1KKVUbj8Y/SzbPa5esK9KpPAKXR8= -gorm.io/driver/postgres v1.0.2 h1:mB5JjD4QglbCTdMT1aZDxQzHr87XDK1qh0MKIU3P96g= -gorm.io/driver/postgres v1.0.2/go.mod h1:FvRSYfBI9jEp6ZSjlpS9qNcSjxwYxFc03UOTrHdvvYA= gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d h1:oT3yy0p2Z+MkLvaQlkY4g2jpO16E3nA8wU7+1DSdJUk= gorm.io/driver/sqlite v1.1.4-0.20200928065301-698e250a3b0d/go.mod h1:DV58HRJvX3ANmQbY3Lkhohs+CtWo2aiJ4n0OPwzSrDI= gorm.io/gorm v1.20.2 h1:bZzSEnq7NDGsrd+n3evOOedDrY5oLM5QPlCjZJUK2ro= gorm.io/gorm v1.20.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M= howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= From 3d16e656015c1bce80c856e50a3cc4d21aae2f65 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Wed, 7 Oct 2020 09:04:09 +0530 Subject: [PATCH 11/14] fmt fix and adding build constraints --- module/apmgormv2/apmgorm_test.go | 5 +++-- module/apmgormv2/doc.go | 2 +- module/apmgormv2/driver/mysql/init.go | 5 ++++- module/apmgormv2/driver/sqlite/init.go | 7 +++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/module/apmgormv2/apmgorm_test.go b/module/apmgormv2/apmgorm_test.go index ac0de676e..382391293 100644 --- a/module/apmgormv2/apmgorm_test.go +++ b/module/apmgormv2/apmgorm_test.go @@ -15,17 +15,18 @@ // specific language governing permissions and limitations // under the License. -// +build go1.9 +// +build go1.14 package apmgormv2_test import ( "context" - "gorm.io/gorm/logger" "os" "strings" "testing" + "gorm.io/gorm/logger" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/module/apmgormv2/doc.go b/module/apmgormv2/doc.go index ac5aa836c..a1b59bd9c 100644 --- a/module/apmgormv2/doc.go +++ b/module/apmgormv2/doc.go @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -// +build go1.9 +// +build go1.14 // Package apmgorm provides wrappers for tracing GORM operations. package apmgormv2 diff --git a/module/apmgormv2/driver/mysql/init.go b/module/apmgormv2/driver/mysql/init.go index 1b0d0f932..21e4a42af 100644 --- a/module/apmgormv2/driver/mysql/init.go +++ b/module/apmgormv2/driver/mysql/init.go @@ -15,15 +15,18 @@ // specific language governing permissions and limitations // under the License. +// +build go1.14 + // Package apmmysql imports the gorm mysql dialect package, // and also registers the mysql driver with apmsql. package apmmysql import ( - "go.elastic.co/apm/module/apmsql" "gorm.io/driver/mysql" "gorm.io/gorm" + "go.elastic.co/apm/module/apmsql" + _ "go.elastic.co/apm/module/apmsql/mysql" // register mysql with apmsql ) diff --git a/module/apmgormv2/driver/sqlite/init.go b/module/apmgormv2/driver/sqlite/init.go index cc11d0424..517d59aa5 100644 --- a/module/apmgormv2/driver/sqlite/init.go +++ b/module/apmgormv2/driver/sqlite/init.go @@ -15,15 +15,18 @@ // specific language governing permissions and limitations // under the License. +// +build go1.14 + // Package apmsqlite imports the gorm sqlite dialect package, // and also registers the sqlite3 driver with apmsql. package apmsqlite import ( - "go.elastic.co/apm/module/apmsql" "gorm.io/driver/sqlite" "gorm.io/gorm" + "go.elastic.co/apm/module/apmsql" + _ "go.elastic.co/apm/module/apmsql/sqlite3" // register sqlite3 with apmsql ) @@ -31,7 +34,7 @@ import ( func Open(dsn string) gorm.Dialector { dialect := &sqlite.Dialector{ - DSN: dsn, + DSN: dsn, DriverName: apmsql.DriverPrefix + sqlite.DriverName, } From a93c5873ddf291b1921b8a06cdc90d4bf0d8edc6 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Wed, 7 Oct 2020 09:07:27 +0530 Subject: [PATCH 12/14] adding module to dockerfile --- scripts/Dockerfile-testing | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/Dockerfile-testing b/scripts/Dockerfile-testing index fe393834b..2b76a0bfc 100644 --- a/scripts/Dockerfile-testing +++ b/scripts/Dockerfile-testing @@ -19,6 +19,7 @@ COPY module/apmgoredis/go.mod module/apmgoredis/go.sum /go/src/go.elastic.co/apm COPY module/apmgoredisv8/go.mod module/apmgoredisv8/go.sum /go/src/go.elastic.co/apm/module/apmgoredisv8/ COPY module/apmgorilla/go.mod module/apmgorilla/go.sum /go/src/go.elastic.co/apm/module/apmgorilla/ COPY module/apmgorm/go.mod module/apmgorm/go.sum /go/src/go.elastic.co/apm/module/apmgorm/ +COPY module/apmgormv2/go.mod module/apmgormv2/go.sum /go/src/go.elastic.co/apm/module/apmgormv2/ COPY module/apmgrpc/go.mod module/apmgrpc/go.sum /go/src/go.elastic.co/apm/module/apmgrpc/ COPY module/apmhttp/go.mod module/apmhttp/go.sum /go/src/go.elastic.co/apm/module/apmhttp/ COPY module/apmhttprouter/go.mod module/apmhttprouter/go.sum /go/src/go.elastic.co/apm/module/apmhttprouter/ @@ -52,6 +53,7 @@ RUN cd /go/src/go.elastic.co/apm/module/apmgoredis && go mod download RUN cd /go/src/go.elastic.co/apm/module/apmgoredisv8 && go mod download RUN cd /go/src/go.elastic.co/apm/module/apmgorilla && go mod download RUN cd /go/src/go.elastic.co/apm/module/apmgorm && go mod download +RUN cd /go/src/go.elastic.co/apm/module/apmgormv2 && go mod download RUN cd /go/src/go.elastic.co/apm/module/apmgrpc && go mod download RUN cd /go/src/go.elastic.co/apm/module/apmhttp && go mod download RUN cd /go/src/go.elastic.co/apm/module/apmhttprouter && go mod download From 29ffa5df143b0d62c343454b6fc6876a66c45583 Mon Sep 17 00:00:00 2001 From: Deepak Kumar T P Date: Wed, 7 Oct 2020 09:23:50 +0530 Subject: [PATCH 13/14] fix docs --- module/apmgormv2/doc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/apmgormv2/doc.go b/module/apmgormv2/doc.go index a1b59bd9c..d1652e544 100644 --- a/module/apmgormv2/doc.go +++ b/module/apmgormv2/doc.go @@ -17,5 +17,5 @@ // +build go1.14 -// Package apmgorm provides wrappers for tracing GORM operations. +// Package apmgormv2 provides wrappers for tracing GORM operations. package apmgormv2 From de875c97717fbe7197ef2750b829a0eea8f8e282 Mon Sep 17 00:00:00 2001 From: Deepak Kumar Date: Wed, 7 Oct 2020 12:16:35 +0530 Subject: [PATCH 14/14] fix vet Co-authored-by: Andrew Wilkins --- module/apmgormv2/doc.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/module/apmgormv2/doc.go b/module/apmgormv2/doc.go index d1652e544..a0056afa5 100644 --- a/module/apmgormv2/doc.go +++ b/module/apmgormv2/doc.go @@ -15,7 +15,5 @@ // specific language governing permissions and limitations // under the License. -// +build go1.14 - // Package apmgormv2 provides wrappers for tracing GORM operations. package apmgormv2