Switch to go stdlib structured logging (slog)

speedata · Aug 27, 2023 · 814c259 · 814c259
1 parent 6c5bef1
commit 814c259
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 13 deletions.
diff --git a/core/commands.go b/core/commands.go
@@ -2,11 +2,11 @@ package core
 
 import (
 	"fmt"
+	"log/slog"
 	"os"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/slog"
 	"golang.org/x/net/html"
 
 	pdf "github.com/speedata/baseline-pdf"

diff --git a/core/core.go b/core/core.go
@@ -3,13 +3,12 @@ package core
 import (
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 	"regexp"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/slog"
-
 	"github.com/speedata/boxesandglue/backend/bag"
 	"github.com/speedata/boxesandglue/backend/document"
 	"github.com/speedata/boxesandglue/backend/node"

diff --git a/core/data.go b/core/data.go
@@ -2,11 +2,11 @@ package core
 
 import (
 	"fmt"
+	"log/slog"
 	"reflect"
 	"strconv"
 	"strings"
 
-	"golang.org/x/exp/slog"
 	"golang.org/x/net/html"
 
 	"github.com/speedata/bagme/document"

diff --git a/core/functions.go b/core/functions.go
@@ -9,6 +9,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"log/slog"
 	"math"
 	"os"
 	"regexp"
@@ -21,7 +22,6 @@ import (
 	"github.com/yuin/goldmark"
 	highlighting "github.com/yuin/goldmark-highlighting"
 	"github.com/yuin/goldmark/extension"
-	"golang.org/x/exp/slog"
 )
 
 const fnNS = "urn:speedata.de/2021/xtsfunctions/en"

diff --git a/core/grid.go b/core/grid.go
@@ -2,11 +2,11 @@ package core
 
 import (
 	"fmt"
+	"log/slog"
 	"math"
 	"strings"
 
 	"github.com/speedata/boxesandglue/backend/bag"
-	"golang.org/x/exp/slog"
 )
 
 type area struct {

diff --git a/core/io.go b/core/io.go
@@ -3,11 +3,10 @@ package core
 import (
 	"fmt"
 	"io/fs"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
-
-	"golang.org/x/exp/slog"
 )
 
 var filelist = make(map[string]string)

diff --git a/core/page.go b/core/page.go
@@ -2,13 +2,13 @@ package core
 
 import (
 	"fmt"
+	"log/slog"
 
 	"github.com/speedata/boxesandglue/backend/bag"
 	"github.com/speedata/boxesandglue/backend/document"
 	"github.com/speedata/boxesandglue/backend/node"
 	"github.com/speedata/boxesandglue/frontend"
 	"github.com/speedata/goxml"
-	"golang.org/x/exp/slog"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/speedata/xts
 
-go 1.20
+go 1.21
 
 require (
 	github.com/alecthomas/chroma v0.10.0

diff --git a/xts/filter.go b/xts/filter.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"os"
 	"os/exec"
@@ -14,7 +15,6 @@ import (
 	"github.com/speedata/xts/xts/luacsv"
 	"github.com/speedata/xts/xts/luaxlsx"
 	"github.com/speedata/xts/xts/luaxml"
-	"golang.org/x/exp/slog"
 
 	"github.com/cjoudrey/gluahttp"
 	lua "github.com/yuin/gopher-lua"

diff --git a/xts/logging.go b/xts/logging.go
@@ -6,11 +6,11 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 	"strings"
 
 	"github.com/speedata/xts/core"
-	"golang.org/x/exp/slog"
 )
 
 var (

diff --git a/xts/main.go b/xts/main.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log/slog"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -17,7 +18,6 @@ import (
 	"github.com/speedata/optionparser"
 	"github.com/speedata/textlayout/fonts/truetype"
 	"github.com/speedata/xts/core"
-	"golang.org/x/exp/slog"
 )
 
 var (