chore: Enshrine defra logger names (#1410)

## Relevant issue(s)

Resolves #1148

## Description

Simple approach: just rename the loggers.

## How has this been tested?

CI & manual

api/http/handler_test.go

@@ -86,7 +86,7 @@ func TestNewHandlerWithLogger(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	assert.Equal(t, "defra.http", kv["logger"])
+	assert.Equal(t, "http", kv["logger"])
 }
 
 func TestGetJSON(t *testing.T) {

api/http/http.go

@@ -15,4 +15,4 @@ package http
 
 import "github.com/sourcenetwork/defradb/logging"
 
-var log = logging.MustNewLogger("defra.http")
+var log = logging.MustNewLogger("http")

api/http/logger_test.go

@@ -96,7 +96,7 @@ func TestLoggerKeyValueOutput(t *testing.T) {
 	// check that everything is as expected
 	assert.Equal(t, "{\"data\":{\"response\":\"pong\"}}", rec2.Body.String())
 	assert.Equal(t, "INFO", kv["level"])
-	assert.Equal(t, "defra.http", kv["logger"])
+	assert.Equal(t, "http", kv["logger"])
 	assert.Equal(t, "Request", kv["msg"])
 	assert.Equal(t, "GET", kv["Method"])
 	assert.Equal(t, "/ping", kv["Path"])

cli/cli.go

@@ -28,7 +28,7 @@ import (
 	"github.com/sourcenetwork/defradb/logging"
 )
 
-var log = logging.MustNewLogger("defra.cli")
+var log = logging.MustNewLogger("cli")
 
 const badgerDatastoreName = "badger"
 

cmd/genclidocs/genclidocs.go

@@ -25,7 +25,7 @@ import (
 	"github.com/sourcenetwork/defradb/logging"
 )
 
-var log = logging.MustNewLogger("defra.genclidocs")
+var log = logging.MustNewLogger("genclidocs")
 
 func main() {
 	path := flag.String("o", "docs/cmd", "path to write the cmd docs to")

cmd/genmanpages/main.go

@@ -28,7 +28,7 @@ import (
 
 const defaultPerm os.FileMode = 0o777
 
-var log = logging.MustNewLogger("defra.genmanpages")
+var log = logging.MustNewLogger("genmanpages")
 
 func main() {
 	dirFlag := flag.String("o", "build/man", "Directory in which to generate DefraDB man pages")

config/config.go

@@ -64,7 +64,7 @@ import (
 	"github.com/sourcenetwork/defradb/node"
 )
 
-var log = logging.MustNewLogger("defra.config")
+var log = logging.MustNewLogger("config")
 
 const (
 	DefaultAPIEmail = "[email protected]"

datastore/store.go

@@ -19,7 +19,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defradb.store")
+	log = logging.MustNewLogger("store")
 )
 
 // RootStore wraps Batching and TxnDatastore requiring datastore to support both batching and transactions.

db/db.go

@@ -34,7 +34,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.db")
+	log = logging.MustNewLogger("db")
 )
 
 // make sure we match our client interface

logging/logging.go

@@ -14,7 +14,7 @@ import (
 	"context"
 )
 
-var log = MustNewLogger("defra.logging")
+var log = MustNewLogger("logging")
 
 // KV is a key-value pair used to pass structured data to loggers.
 type KV struct {

merkle/clock/clock.go

@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.merkleclock")
+	log = logging.MustNewLogger("merkleclock")
 )
 
 // MerkleClock is a MerkleCRDT clock that can be used to read/write events (deltas) to the clock.

merkle/crdt/merklecrdt.go

@@ -24,7 +24,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.merklecrdt")
+	log = logging.MustNewLogger("merklecrdt")
 )
 
 // MerkleCRDT is the implementation of a Merkle Clock along with a

net/api/service.go

@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.netapi")
+	log = logging.MustNewLogger("netapi")
 )
 
 type Service struct {

net/net.go

@@ -17,5 +17,5 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.net")
+	log = logging.MustNewLogger("net")
 )

node/node.go

@@ -50,7 +50,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.node")
+	log = logging.MustNewLogger("node")
 )
 
 const evtWaitTimeout = 10 * time.Second

planner/planner.go

@@ -22,7 +22,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.planner")
+	log = logging.MustNewLogger("planner")
 )
 
 // planNode is an interface all nodes in the plan tree need to implement.

tests/bench/bench_util.go

@@ -37,7 +37,7 @@ const (
 
 var (
 	storage string = "memory"
-	log            = logging.MustNewLogger("defra.tests.bench")
+	log            = logging.MustNewLogger("tests.bench")
 )
 
 func init() {

tests/bench/query/simple/utils.go

@@ -24,7 +24,7 @@ import (
 )
 
 var (
-// log = logging.MustNewLogger("defra.bench")
+// log = logging.MustNewLogger("bench")
 )
 
 func runQueryBenchGet(

tests/integration/cli/version_test.go

@@ -40,7 +40,6 @@ func TestExecVersionJSON(t *testing.T) {
 	assert.Contains(t, output, "go\":")
 	assert.Contains(t, output, "commit\":")
 	assert.Contains(t, output, "commitdate\":")
-
 	var data map[string]any
 	err := json.Unmarshal([]byte(output), &data)
 	assert.NoError(t, err)

tests/integration/explain/utils.go

@@ -27,7 +27,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.tests.integration.explain")
+	log = logging.MustNewLogger("tests.integration.explain")
 
 	allPlanNodeNames = map[string]struct{}{
 		// Not a planNode but need it here as this is root of the explain graph.

tests/integration/net/order/utils.go

@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	log = logging.MustNewLogger("defra.test.net")
+	log = logging.MustNewLogger("test.net")
 )
 
 const (

tests/integration/utils2.go

@@ -57,7 +57,7 @@ const (
 )
 
 var (
-	log            = logging.MustNewLogger("defra.tests.integration")
+	log            = logging.MustNewLogger("tests.integration")
 	badgerInMemory bool
 	badgerFile     bool
 	inMemoryStore  bool