Take advantage of changes in recent Go versions

clientapi/routing/routing.go

@@ -255,7 +255,7 @@ func Setup(
  logrus.Info("Enabling server notices at /_synapse/admin/v1/send_server_notice")
  serverNotificationSender, err := getSenderDevice(context.Background(), rsAPI, userAPI, cfg)
  if err != nil {
- logrus.WithError(err).Fatal("unable to get account for sending sending server notices")
+ logrus.WithError(err).Fatal("unable to get account for sending server notices")
  }
 
  synapseAdminRouter.Handle("/admin/v1/send_server_notice/{txnID}",

cmd/dendrite-demo-pinecone/relay/retriever.go

@@ -17,13 +17,13 @@ package relay
 import (
  "context"
  "sync"
+ "sync/atomic"
  "time"
 
  federationAPI "github.com/matrix-org/dendrite/federationapi/api"
  relayServerAPI "github.com/matrix-org/dendrite/relayapi/api"
  "github.com/matrix-org/gomatrixserverlib/spec"
  "github.com/sirupsen/logrus"
- "go.uber.org/atomic"
 )
 
 const (
@@ -54,7 +54,7 @@ func NewRelayServerRetriever(
  federationAPI: federationAPI,
  relayAPI: relayAPI,
  relayServersQueried: make(map[spec.ServerName]bool),
- running: *atomic.NewBool(false),
+ running: atomic.Bool{},
  quit: quit,
  }
 }

federationapi/queue/destinationqueue.go

@@ -19,14 +19,14 @@ import (
  "encoding/json"
  "fmt"
  "sync"
+ "sync/atomic"
  "time"
 
  "github.com/matrix-org/gomatrix"
  "github.com/matrix-org/gomatrixserverlib"
  "github.com/matrix-org/gomatrixserverlib/fclient"
  "github.com/matrix-org/gomatrixserverlib/spec"
  "github.com/sirupsen/logrus"
- "go.uber.org/atomic"
 
  "github.com/matrix-org/dendrite/federationapi/statistics"
  "github.com/matrix-org/dendrite/federationapi/storage"

federationapi/queue/queue_test.go

@@ -18,6 +18,7 @@ import (
  "context"
  "encoding/json"
  "fmt"
+ "sync/atomic"
  "testing"
  "time"
 
@@ -26,7 +27,6 @@ import (
  "github.com/matrix-org/dendrite/test/testrig"
  "github.com/matrix-org/gomatrixserverlib/fclient"
  "github.com/matrix-org/gomatrixserverlib/spec"
- "go.uber.org/atomic"
  "gotest.tools/v3/poll"
 
  "github.com/matrix-org/gomatrixserverlib"
@@ -113,8 +113,8 @@ func testSetup(failuresUntilBlacklist uint32, failuresUntilAssumedOffline uint32
  fc := &stubFederationClient{
  shouldTxSucceed: shouldTxSucceed,
  shouldTxRelaySucceed: shouldTxRelaySucceed,
- txCount: *atomic.NewUint32(0),
- txRelayCount: *atomic.NewUint32(0),
+ txCount: atomic.Uint32{},
+ txRelayCount: atomic.Uint32{},
  }
 
  stats := statistics.NewStatistics(db, failuresUntilBlacklist, failuresUntilAssumedOffline, false)

federationapi/statistics/statistics.go

@@ -5,10 +5,10 @@ import (
  "math"
  "math/rand"
  "sync"
+ "sync/atomic"
  "time"
 
  "github.com/sirupsen/logrus"
- "go.uber.org/atomic"
 
  "github.com/matrix-org/dendrite/federationapi/storage"
  "github.com/matrix-org/gomatrixserverlib/spec"
@@ -169,7 +169,7 @@ func (s *ServerStatistics) Success(method SendMethod) {
  // NOTE : Sending to the final destination vs. a relay server has
  // slightly different semantics.
  if method == SendDirect {
- s.successCounter.Inc()
+ s.successCounter.Add(1)
  if s.blacklisted.Load() && s.statistics.DB != nil {
  if err := s.statistics.DB.RemoveServerFromBlacklist(s.serverName); err != nil {
  logrus.WithError(err).Errorf("Failed to remove %q from blacklist", s.serverName)
@@ -195,7 +195,7 @@ func (s *ServerStatistics) Failure() (time.Time, bool) {
  // start a goroutine which will wait out the backoff and
  // unset the backoffStarted flag when done.
  if s.backoffStarted.CompareAndSwap(false, true) {
- backoffCount := s.backoffCount.Inc()
+ backoffCount := s.backoffCount.Add(1)
 
  if backoffCount >= s.statistics.FailuresUntilAssumedOffline {
  s.assumedOffline.CompareAndSwap(false, true)

internal/sqlutil/writer_exclusive.go

@@ -3,8 +3,7 @@ package sqlutil
 import (
  "database/sql"
  "errors"
-
- "go.uber.org/atomic"
+ "sync/atomic"
 )
 
 // ExclusiveWriter implements sqlutil.Writer.

internal/transactionrequest_test.go

@@ -19,14 +19,14 @@ import (
  "encoding/json"
  "fmt"
  "strconv"
+ "sync/atomic"
  "testing"
  "time"
 
  "github.com/matrix-org/gomatrixserverlib"
  "github.com/matrix-org/gomatrixserverlib/spec"
  "github.com/nats-io/nats.go"
  "github.com/stretchr/testify/assert"
- "go.uber.org/atomic"
  "gotest.tools/v3/poll"
 
  "github.com/matrix-org/dendrite/federationapi/producers"
@@ -228,7 +228,7 @@ func TestProcessTransactionRequestEDUTyping(t *testing.T) {
  ctx := process.NewProcessContext()
  defer ctx.ShutdownDendrite()
  txn, js, cfg := createTransactionWithEDU(ctx, edus)
- received := atomic.NewBool(false)
+ received := atomic.Bool{}
  onMessage := func(ctx context.Context, msgs []*nats.Msg) bool {
  msg := msgs[0] // Guaranteed to exist if onMessage is called
  room := msg.Header.Get(jetstream.RoomID)
@@ -294,7 +294,7 @@ func TestProcessTransactionRequestEDUToDevice(t *testing.T) {
  ctx := process.NewProcessContext()
  defer ctx.ShutdownDendrite()
  txn, js, cfg := createTransactionWithEDU(ctx, edus)
- received := atomic.NewBool(false)
+ received := atomic.Bool{}
  onMessage := func(ctx context.Context, msgs []*nats.Msg) bool {
  msg := msgs[0] // Guaranteed to exist if onMessage is called
 
@@ -371,7 +371,7 @@ func TestProcessTransactionRequestEDUDeviceListUpdate(t *testing.T) {
  ctx := process.NewProcessContext()
  defer ctx.ShutdownDendrite()
  txn, js, cfg := createTransactionWithEDU(ctx, edus)
- received := atomic.NewBool(false)
+ received := atomic.Bool{}
  onMessage := func(ctx context.Context, msgs []*nats.Msg) bool {
  msg := msgs[0] // Guaranteed to exist if onMessage is called
 
@@ -468,7 +468,7 @@ func TestProcessTransactionRequestEDUReceipt(t *testing.T) {
  ctx := process.NewProcessContext()
  defer ctx.ShutdownDendrite()
  txn, js, cfg := createTransactionWithEDU(ctx, edus)
- received := atomic.NewBool(false)
+ received := atomic.Bool{}
  onMessage := func(ctx context.Context, msgs []*nats.Msg) bool {
  msg := msgs[0] // Guaranteed to exist if onMessage is called
 
@@ -512,7 +512,7 @@ func TestProcessTransactionRequestEDUSigningKeyUpdate(t *testing.T) {
  ctx := process.NewProcessContext()
  defer ctx.ShutdownDendrite()
  txn, js, cfg := createTransactionWithEDU(ctx, edus)
- received := atomic.NewBool(false)
+ received := atomic.Bool{}
  onMessage := func(ctx context.Context, msgs []*nats.Msg) bool {
  msg := msgs[0] // Guaranteed to exist if onMessage is called
 
@@ -569,7 +569,7 @@ func TestProcessTransactionRequestEDUPresence(t *testing.T) {
  ctx := process.NewProcessContext()
  defer ctx.ShutdownDendrite()
  txn, js, cfg := createTransactionWithEDU(ctx, edus)
- received := atomic.NewBool(false)
+ received := atomic.Bool{}
  onMessage := func(ctx context.Context, msgs []*nats.Msg) bool {
  msg := msgs[0] // Guaranteed to exist if onMessage is called
 

setup/base/base.go

@@ -28,13 +28,13 @@ import (
  _ "net/http/pprof"
  "os"
  "os/signal"
+ "sync/atomic"
  "syscall"
  "time"
 
  sentryhttp "github.com/getsentry/sentry-go/http"
  "github.com/matrix-org/gomatrixserverlib/fclient"
  "github.com/prometheus/client_golang/prometheus/promhttp"
- "go.uber.org/atomic"
 
  "github.com/gorilla/mux"
  "github.com/kardianos/minwinsvc"

setup/base/sanity_other.go

@@ -1,5 +1,5 @@
-//go:build !linux && !darwin && !netbsd && !freebsd && !openbsd && !solaris && !dragonfly && !aix
-// +build !linux,!darwin,!netbsd,!freebsd,!openbsd,!solaris,!dragonfly,!aix
+//go:build !unix
+// +build !unix
 
 package base
 

setup/base/sanity_unix.go

@@ -1,5 +1,5 @@
-//go:build linux || darwin || netbsd || freebsd || openbsd || solaris || dragonfly || aix
-// +build linux darwin netbsd freebsd openbsd solaris dragonfly aix
+//go:build unix
+// +build unix
 
 package base