Test with postgres 16

.github/workflows/codeql-analysis.yml

@@ -22,7 +22,7 @@ on:
     - cron: '33 10 * * 6'
 
 env:
-    GO_VERSION: 1.20.x
+    GO_VERSION: 1.21.x
 
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/lint.yaml

@@ -7,7 +7,7 @@ on:
       - master
 
 env:
-  GO_VERSION: 1.20.x
+  GO_VERSION: 1.21.x
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/pr-tidy.yaml

@@ -6,7 +6,7 @@ on:
 
 env:
   GO111MODULE: "on"
-  GO_VERSION: 1.20.x
+  GO_VERSION: 1.21.x
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}

.github/workflows/pr.yaml

@@ -224,7 +224,7 @@ jobs:
       matrix:
         go-version: [ 1.20.x, 1.21.x ]
         arch: [ "386", amd64 ]
-        postgres-version: [ "12", "13", "14", "15" ]
+        postgres-version: [ "12", "13", "14", "15", "16" ]
         postgres-driver: [ "postgres", "pgx/v4", "pgx/v5" ]
     runs-on: ubuntu-latest
     needs: test-unit

.github/workflows/test-compatibility-libpq.yaml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         go-version: [ 1.20.x, 1.21.x ]
         arch: [ "386", amd64 ]
-        postgres-version: [ "12", "13", "14", "15" ]
+        postgres-version: [ "12", "13", "14", "15", "16" ]
     runs-on: ubuntu-latest
     steps:
       - name: Install Go

.github/workflows/test-compatibility-pgx.yaml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         go-version: [ 1.20.x, 1.21.x ]
         arch: [ "386", amd64 ]
-        postgres-version: [ "12", "13", "14", "15" ]
+        postgres-version: [ "12", "13", "14", "15", "16" ]
         pgx-version: [ "v4", "v5"]
     runs-on: ubuntu-latest
     steps:

.golangci.yaml

@@ -22,6 +22,7 @@ linters:
   disable:
     - contextcheck
     - deadcode
+    - depguard
     - exhaustivestruct
     - exhaustruct
     - forbidigo
@@ -45,7 +46,9 @@ linters:
     - scopelint
     - sqlclosecheck # https://github.com/golangci/golangci-lint/issues/2649
     - structcheck
+    - tagalign
     - tagliatelle
+    - testifylint
     - testpackage
     - varcheck
     - varnamelen

Makefile

@@ -2,7 +2,7 @@ MODULE_NAME=otelsql
 
 VENDOR_DIR = vendor
 
-GOLANGCI_LINT_VERSION ?= v1.51.1
+GOLANGCI_LINT_VERSION ?= v1.55.2
 
 GO ?= go
 GOLANGCI_LINT ?= $(shell go env GOPATH)/bin/golangci-lint-$(GOLANGCI_LINT_VERSION)

README.md

@@ -596,12 +596,12 @@ The traces are almost identical with some minor changes:
             <th colspan="2">Windows</th>
         </tr>
         <tr>
-            <th>go 1.19</th>
             <th>go 1.20</th>
-            <th>go 1.19</th>
+            <th>go 1.21</th>
             <th>go 1.20</th>
-            <th>go 1.19</th>
+            <th>go 1.21</th>
             <th>go 1.20</th>
+            <th>go 1.21</th>
         </tr>
     </thead>
     <tbody>
@@ -660,7 +660,7 @@ The traces are almost identical with some minor changes:
                 <code style="white-space: nowrap">jackc/pgx/v4/stdlib</code>
             </td>
             <td style="white-space: nowrap">
-                Postgres 12, 13, 14, 15
+                Postgres 12, 13, 14, 15, 16
             </td>
             <td colspan="6" align="center">
                 <a href="https://github.com/nhatthm/otelsql/actions/workflows/test-compatibility-pgx.yaml">
@@ -675,7 +675,7 @@ The traces are almost identical with some minor changes:
                 <code style="white-space: nowrap">jackc/pgx/v5/stdlib</code>
             </td>
             <td style="white-space: nowrap">
-                Postgres 12, 13, 14, 15
+                Postgres 12, 13, 14, 15, 16
             </td>
             <td colspan="6" align="center">
                 <a href="https://github.com/nhatthm/otelsql/actions/workflows/test-compatibility-pgx.yaml">
@@ -690,7 +690,7 @@ The traces are almost identical with some minor changes:
                 <code style="white-space: nowrap">lib/pq</code>
             </td>
             <td style="white-space: nowrap">
-                Postgres 12, 13, 14, 15
+                Postgres 12, 13, 14, 15, 16
             </td>
             <td colspan="6" align="center">
                 <a href="https://github.com/nhatthm/otelsql/actions/workflows/test-compatibility-libpq.yaml">

go.mod

@@ -29,7 +29,8 @@ require (
 	github.com/yudai/gojsondiff v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -65,9 +65,10 @@ golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

tests/mssql/go.mod

@@ -26,7 +26,7 @@ require (
 	github.com/bool64/sqluct v0.2.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/containerd/containerd v1.7.9 // indirect
+	github.com/containerd/containerd v1.7.11 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
@@ -52,15 +52,15 @@ require (
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-memdb v1.3.4 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/iancoleman/orderedmap v0.3.0 // indirect
 	github.com/jmoiron/sqlx v1.3.5 // indirect
-	github.com/klauspost/compress v1.17.3 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
@@ -81,16 +81,16 @@ require (
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.11 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.8.4 // indirect
 	github.com/swaggest/assertjson v1.9.0 // indirect
 	github.com/swaggest/form/v5 v5.1.1 // indirect
 	github.com/testcontainers/testcontainers-go v0.26.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/yudai/gojsondiff v1.0.0 // indirect
 	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
@@ -105,13 +105,13 @@ require (
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/tools v0.15.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
-	google.golang.org/grpc v1.59.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )