Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade packages #654

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion client/kafka/async_producer.go
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
depends_on:
- zookeeper
rabbitmq:
image: docker.io/bitnami/rabbitmq:3.9
image: docker.io/bitnami/rabbitmq:latest
ports:
- '4369:4369'
- '5551:5551'
Expand Down
2 changes: 1 addition & 1 deletion examples/client/main.go
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
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
61 changes: 30 additions & 31 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ module github.com/beatlabs/patron
go 1.20

require (
github.com/Shopify/sarama v1.38.1
github.com/aws/aws-sdk-go-v2 v1.22.1
github.com/aws/aws-sdk-go-v2/config v1.18.37
github.com/aws/aws-sdk-go-v2/credentials v1.15.1
github.com/aws/aws-sdk-go-v2/service/sns v1.23.0
github.com/aws/aws-sdk-go-v2/service/sqs v1.23.2
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
github.com/aws/aws-sdk-go-v2/service/sns v1.25.2
github.com/aws/aws-sdk-go-v2/service/sqs v1.23.4
github.com/eclipse/paho.golang v0.11.0
github.com/elastic/elastic-transport-go/v8 v8.3.0
github.com/elastic/go-elasticsearch/v8 v8.7.0
github.com/elastic/go-elasticsearch/v8 v8.11.0
github.com/go-redis/redis/extra/rediscmd v0.2.0
github.com/go-redis/redis/v8 v8.11.5
github.com/go-sql-driver/mysql v1.7.1
Expand All @@ -20,30 +20,31 @@ require (
github.com/julienschmidt/httprouter v1.3.0
github.com/opentracing-contrib/go-stdlib v1.0.0
github.com/opentracing/opentracing-go v1.2.0
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
github.com/streadway/amqp v1.1.0
github.com/stretchr/testify v1.8.4
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/uber/jaeger-lib v2.4.2-0.20210604143007-135cf5605a6d+incompatible
go.mongodb.org/mongo-driver v1.11.7
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
golang.org/x/time v0.3.0
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.30.0
go.mongodb.org/mongo-driver v1.13.0
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
golang.org/x/time v0.4.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
)

require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.42 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.17.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.19.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.25.0 // indirect
github.com/aws/smithy-go v1.16.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.17.2 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.20.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.25.3 // indirect
github.com/aws/smithy-go v1.17.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
Expand All @@ -62,27 +63,25 @@ 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/kr/text v0.2.0 // 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
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading