log: use native log/slog instead of golang/exp (ethereum#29302)

Author: gzliudan

internal/debug/api.go

@@ -23,6 +23,7 @@ package debug
 import (
 	"errors"
 	"io"
+	"log/slog"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -35,7 +36,6 @@ import (
 	"time"
 
 	"github.com/XinFinOrg/XDPoSChain/log"
-	"golang.org/x/exp/slog"
 )
 
 // Handler is the global debugging handler.

internal/debug/flags.go

@@ -19,6 +19,7 @@ package debug
 import (
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
@@ -30,7 +31,6 @@ import (
 	"github.com/XinFinOrg/XDPoSChain/metrics/exp"
 	"github.com/mattn/go-colorable"
 	"github.com/mattn/go-isatty"
-	"golang.org/x/exp/slog"
 	"gopkg.in/natefinch/lumberjack.v2"
 	"gopkg.in/urfave/cli.v1"
 )

internal/testlog/testlog.go

@@ -21,11 +21,11 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"log/slog"
 	"sync"
 	"testing"
 
 	"github.com/XinFinOrg/XDPoSChain/log"
-	"golang.org/x/exp/slog"
 )
 
 const (

log/format.go

@@ -3,14 +3,14 @@ package log
 import (
 	"bytes"
 	"fmt"
+	"log/slog"
 	"math/big"
 	"reflect"
 	"strconv"
 	"time"
 	"unicode/utf8"
 
 	"github.com/holiman/uint256"
-	"golang.org/x/exp/slog"
 )
 
 const (

log/handler.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log/slog"
 	"math/big"
 	"reflect"
 	"sync"
 	"time"
 
 	"github.com/holiman/uint256"
-	"golang.org/x/exp/slog"
 )
 
 type discardHandler struct{}

log/handler_glog.go

@@ -20,14 +20,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log/slog"
 	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
 	"sync"
 	"sync/atomic"
-
-	"golang.org/x/exp/slog"
 )
 
 // errVmoduleSyntax is returned when a user vmodule pattern is invalid.

log/logger.go

@@ -2,12 +2,11 @@ package log
 
 import (
 	"context"
+	"log/slog"
 	"math"
 	"os"
 	"runtime"
 	"time"
-
-	"golang.org/x/exp/slog"
 )
 
 const errorKey = "LOG_ERROR"

log/logger_test.go

@@ -5,14 +5,14 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"math/big"
 	"os"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/holiman/uint256"
-	"golang.org/x/exp/slog"
 )
 
 // TestLoggingWithVmodule checks that vmodule works.

log/root.go

@@ -2,10 +2,9 @@ package log
 
 import (
 	"context"
+	"log/slog"
 	"os"
 	"sync/atomic"
-
-	"golang.org/x/exp/slog"
 )
 
 var root atomic.Value

p2p/simulations/adapters/exec.go

@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"net"
 	"os"
 	"os/exec"
@@ -42,7 +43,6 @@ import (
 	"github.com/XinFinOrg/XDPoSChain/rpc"
 	"github.com/docker/docker/pkg/reexec"
 	"github.com/gorilla/websocket"
-	"golang.org/x/exp/slog"
 )
 
 // ExecAdapter is a NodeAdapter which runs simulation nodes by executing the
@@ -384,7 +384,7 @@ func initLogging() {
 // and the node config from an environment variable.
 func execP2PNode() {
 	initLogging()
-	
+
 	// read the services from argv
 	serviceNames := strings.Split(os.Args[1], ",")
 
@@ -395,7 +395,7 @@ func execP2PNode() {
 	}
 	var conf execNodeConfig
 	if err := json.Unmarshal([]byte(confEnv), &conf); err != nil {
-		log.Crit("error decoding " + envNodeConfig, "err", err)
+		log.Crit("error decoding "+envNodeConfig, "err", err)
 	}
 	conf.Stack.P2P.PrivateKey = conf.Node.PrivateKey
 	conf.Stack.Logger = log.New("node.id", conf.Node.ID.String())