Skip to content

Commit

Permalink
Upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
@mantzas
mantzas committed Nov 18, 2023
1 parent 27d7e82 commit e68c5c6
Show file tree
Hide file tree
Showing 210 changed files with 2,912 additions and 2,167 deletions.
2 changes: 1 addition & 1 deletion client/kafka/async_producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"context"
"fmt"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
patronerrors "github.com/beatlabs/patron/errors"
"github.com/beatlabs/patron/trace"
"github.com/opentracing/opentracing-go"
Expand Down
2 changes: 1 addition & 1 deletion client/kafka/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"context"
"testing"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go/ext"
"github.com/opentracing/opentracing-go/mocktracer"
Expand Down
2 changes: 1 addition & 1 deletion client/kafka/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"os"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/correlation"
patronerrors "github.com/beatlabs/patron/errors"
"github.com/beatlabs/patron/internal/validation"
Expand Down
2 changes: 1 addition & 1 deletion client/kafka/kafka_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/correlation"
"github.com/beatlabs/patron/trace"
"github.com/opentracing/opentracing-go"
Expand Down
2 changes: 1 addition & 1 deletion client/kafka/sync_producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
patronerrors "github.com/beatlabs/patron/errors"
"github.com/beatlabs/patron/trace"
"github.com/opentracing/opentracing-go"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/group/group.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async"
"github.com/beatlabs/patron/component/async/kafka"
"github.com/beatlabs/patron/internal/validation"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/group/group_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async"
"github.com/beatlabs/patron/component/async/kafka"
kafkacmp "github.com/beatlabs/patron/component/kafka"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/group/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron"
"github.com/beatlabs/patron/component/async"
"github.com/beatlabs/patron/component/async/kafka"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async"
"github.com/beatlabs/patron/correlation"
"github.com/beatlabs/patron/encoding"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/kafka_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async"
"github.com/beatlabs/patron/correlation"
"github.com/beatlabs/patron/encoding"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/option.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/encoding"
"github.com/beatlabs/patron/encoding/json"
)
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/option_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/encoding"
"github.com/beatlabs/patron/encoding/json"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/simple/duration_client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/simple/duration_kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
)

type outOfRangeOffsetError struct {
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/simple/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async/kafka"
kafkacmp "github.com/beatlabs/patron/component/kafka"
testkafka "github.com/beatlabs/patron/test/kafka"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/simple/simple.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async"
"github.com/beatlabs/patron/component/async/kafka"
"github.com/beatlabs/patron/internal/validation"
Expand Down
2 changes: 1 addition & 1 deletion component/async/kafka/simple/simple_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async/kafka"
kafkacmp "github.com/beatlabs/patron/component/kafka"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion component/kafka/component.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/correlation"
patronErrors "github.com/beatlabs/patron/errors"
"github.com/beatlabs/patron/internal/validation"
Expand Down
2 changes: 1 addition & 1 deletion component/kafka/component_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/correlation"
"github.com/beatlabs/patron/encoding"
"github.com/beatlabs/patron/encoding/json"
Expand Down
2 changes: 1 addition & 1 deletion component/kafka/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
kafkaclient "github.com/beatlabs/patron/client/kafka"
"github.com/beatlabs/patron/correlation"
testkafka "github.com/beatlabs/patron/test/kafka"
Expand Down
2 changes: 1 addition & 1 deletion component/kafka/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"os"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/opentracing/opentracing-go"
)

Expand Down
2 changes: 1 addition & 1 deletion component/kafka/kafka_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/correlation"
"github.com/opentracing/opentracing-go/mocktracer"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion component/kafka/option.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"golang.org/x/exp/slog"
)

Expand Down
2 changes: 1 addition & 1 deletion component/kafka/option_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/client/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/sqs"
patronamqp "github.com/beatlabs/patron/client/amqp"
Expand Down
2 changes: 1 addition & 1 deletion examples/service/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron"
"github.com/beatlabs/patron/component/kafka"
"github.com/beatlabs/patron/examples"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/beatlabs/patron
go 1.20

require (
github.com/Shopify/sarama v1.38.1
github.com/IBM/sarama v1.40.1
github.com/aws/aws-sdk-go-v2 v1.23.0
github.com/aws/aws-sdk-go-v2/config v1.25.3
github.com/aws/aws-sdk-go-v2/credentials v1.16.2
Expand Down Expand Up @@ -63,7 +63,7 @@ require (
github.com/jcmturner/gofork v1.7.6 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/klauspost/compress v1.15.14 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/montanaflynn/stats v0.6.6 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
github.com/Shopify/sarama v1.38.1 h1:lqqPUPQZ7zPqYlWpTh+LQ9bhYNu2xJL6k1SJN4WVe2A=
github.com/Shopify/sarama v1.38.1/go.mod h1:iwv9a67Ha8VNa+TifujYoWGxWnu2kNVAQdSdZ4X2o5g=
github.com/IBM/sarama v1.40.1 h1:lL01NNg/iBeigUbT+wpPysuTYW6roHo6kc1QrffRf0k=
github.com/IBM/sarama v1.40.1/go.mod h1:+5OFwA5Du9I6QrznhaMHsuwWdWZNMjaBSIxEWEgKOYE=
github.com/Shopify/toxiproxy/v2 v2.5.0 h1:i4LPT+qrSlKNtQf5QliVjdP08GyAH8+BUIc9gT0eahc=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/aws/aws-sdk-go-v2 v1.23.0 h1:PiHAzmiQQr6JULBUdvR8fKlA+UPKLT/8KbiqpFBWiAo=
Expand Down Expand Up @@ -127,8 +127,8 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
github.com/klauspost/compress v1.15.14 h1:i7WCKDToww0wA+9qrUZ1xOjp218vfFo3nTU6UHp+gOc=
github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
Expand Down
6 changes: 3 additions & 3 deletions service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,17 @@ func defaultLogAttrs(name, version string) []slog.Attr {
}

func setupLogging(lc logConfig) {
ho := slog.HandlerOptions{
opts := &slog.HandlerOptions{
AddSource: true,
Level: getLogLevel(),
}

var hnd slog.Handler

if lc.json {
hnd = ho.NewJSONHandler(os.Stderr)
hnd = slog.NewJSONHandler(os.Stderr, opts)
} else {
hnd = ho.NewTextHandler(os.Stderr)
hnd = slog.NewTextHandler(os.Stderr, opts)
}

slog.New(hnd.WithAttrs(lc.attrs))
Expand Down
2 changes: 1 addition & 1 deletion test/kafka/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"time"

"github.com/Shopify/sarama"
"github.com/IBM/sarama"
"github.com/beatlabs/patron/component/async"
)

Expand Down
0 vendor/github.com/Shopify/sarama/.gitignore → vendor/github.com/IBM/sarama/.gitignore
View file
File renamed without changes.
15 changes: 11 additions & 4 deletions ...r/github.com/Shopify/sarama/.golangci.yml → vendor/github.com/IBM/sarama/.golangci.yml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e68c5c6

Please sign in to comment.