import guard

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
use own domain
2021-10-03 18:32:41 +03:00 · 2021-10-03 18:30:56 +03:00 · 2021-09-27 11:15:58 +00:00 · 2021-09-27 11:14:44 +00:00 · 2021-09-24 11:18:08 +00:00 · 2021-09-24 11:17:06 +00:00
8 changed files with 33 additions and 38 deletions
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -25,7 +25,7 @@ jobs:
          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
    steps:
      - name: Approve Changes and Merge changes if label 'dependencies' is set
-        uses: actions/github-script@v4
+        uses: actions/github-script@v5
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,10 @@
-module github.com/unistack-org/micro-broker-kgo/v3
+module go.unistack.org/micro-broker-kgo/v3

 go 1.16

 require (
 	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/twmb/franz-go v1.1.0
-	github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914174821-2f676c0a574b
-	github.com/unistack-org/micro-codec-json/v3 v3.7.7
-	github.com/unistack-org/micro/v3 v3.7.3
+	github.com/twmb/franz-go v1.1.2
+	github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210930203137-7fbfd17de279
+	go.unistack.org/micro/v3 v3.8.0
 )
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,6 @@
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
@@ -22,31 +22,29 @@ github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTK
 github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4=
 github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/twmb/franz-go v1.1.0 h1:WR4EbNx7L4eLyTgQmbp3Bg9fX3eW6jHWYj087n07rRc=
-github.com/twmb/franz-go v1.1.0/go.mod h1:KerrVhzNpasYrWJLr2Yj6Cui43f1BxH4U9SJEDVOjqQ=
+github.com/twmb/franz-go v1.1.2 h1:i9lCDEcXWpRd3YXFlffIc/koBl+JijI13F5sg69NPRk=
+github.com/twmb/franz-go v1.1.2/go.mod h1:KerrVhzNpasYrWJLr2Yj6Cui43f1BxH4U9SJEDVOjqQ=
 github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914042331-106aef61b693/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914174821-2f676c0a574b h1:7d6eRt9HEqXVxMzD2fry9qtJ0kRkgeJ5olqW9K+aXv8=
-github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210914174821-2f676c0a574b/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
+github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210930203137-7fbfd17de279 h1:58GX0Ju/PCG1zWVdsLEE5OUu70KlfOrxY7djPszuqiw=
+github.com/twmb/franz-go/pkg/kmsg v0.0.0-20210930203137-7fbfd17de279/go.mod h1:SxG/xJKhgPu25SamAq0rrucfp7lbzCpEXOC+vH/ELrY=
 github.com/twmb/go-rbtree v1.0.0 h1:KxN7dXJ8XaZ4cvmHV1qqXTshxX3EBvX/toG5+UR49Mg=
 github.com/twmb/go-rbtree v1.0.0/go.mod h1:UlIAI8gu3KRPkXSobZnmJfVwCJgEhD/liWzT5ppzIyc=
-github.com/unistack-org/micro-codec-json/v3 v3.7.7 h1:H8ALEfE3LQsRy6F/oKh5TbPettxSDbpECiOu7AHmE5E=
-github.com/unistack-org/micro-codec-json/v3 v3.7.7/go.mod h1:Gk0pKcPu1nf9jmSjuyn8yehaIpJsx8AqD+hh69OzWlI=
 github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
 github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
-github.com/unistack-org/micro/v3 v3.7.3 h1:7dCv7WuTYp47jZ/doVCXDNMnY75imprbmwSnmchTSJY=
-github.com/unistack-org/micro/v3 v3.7.3/go.mod h1:78vy7ggElJD+ayx8ruhJsY+SkGUupfR32LXrg1UObvg=
+go.unistack.org/micro/v3 v3.8.0 h1:9k6C40xdJf65VW6cVB8sOJVSJhyz1UfFOhX7/II2ivo=
+go.unistack.org/micro/v3 v3.8.0/go.mod h1:Tkteri0wiiybbH6aPqay26pZHFIAwL9LXJc2x1Jkakk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -57,8 +55,9 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
--- a/kgo.go
+++ b/kgo.go
@@ -1,5 +1,5 @@
 // Package kgo provides a kafka broker using kgo
-package kgo
+package kgo // import "go.unistack.org/micro-broker-kgo/v3"

 import (
 	"context"
@@ -12,11 +12,11 @@ import (
 	kgo "github.com/twmb/franz-go/pkg/kgo"
 	"github.com/twmb/franz-go/pkg/kmsg"
 	"github.com/twmb/franz-go/pkg/kversion"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
-	"github.com/unistack-org/micro/v3/metadata"
-	"github.com/unistack-org/micro/v3/util/id"
-	mrand "github.com/unistack-org/micro/v3/util/rand"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/util/id"
+	mrand "go.unistack.org/micro/v3/util/rand"
 )

 var _ broker.Broker = &kBroker{}
--- a/kgo_test.go
+++ b/kgo_test.go
@@ -10,12 +10,10 @@ import (
 	"time"

 	kg "github.com/twmb/franz-go/pkg/kgo"
-	jsoncodec "github.com/unistack-org/micro-codec-json/v3"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
-	"github.com/unistack-org/micro/v3/metadata"
-
-	kgo "github.com/unistack-org/micro-broker-kgo/v3"
+	kgo "go.unistack.org/micro-broker-kgo/v3"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
 )

 var (
@@ -48,7 +46,6 @@ func TestPubSub(t *testing.T) {
 	}

 	b := kgo.NewBroker(
-		broker.Codec(jsoncodec.NewCodec()),
 		broker.Addrs(addrs...),
 		kgo.CommitInterval(5*time.Second),
 		kgo.Options(kg.ClientID("test"), kg.FetchMaxBytes(10*1024*1024)),
--- a/metrics.go
+++ b/metrics.go
@@ -6,7 +6,7 @@ import (
 	"time"

 	"github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/meter"
+	"go.unistack.org/micro/v3/meter"
 )

 type metrics struct {
--- a/options.go
+++ b/options.go
@@ -5,8 +5,8 @@ import (
 	"time"

 	kgo "github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/client"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/client"
 )

 // DefaultCommitInterval specifies how fast send commit offsets to kafka
--- a/util.go
+++ b/util.go
@@ -6,16 +6,16 @@ import (
 	"sync"

 	kgo "github.com/twmb/franz-go/pkg/kgo"
-	"github.com/unistack-org/micro/v3/broker"
-	"github.com/unistack-org/micro/v3/logger"
-	"github.com/unistack-org/micro/v3/metadata"
+	"go.unistack.org/micro/v3/broker"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
 )

 var ErrLostMessage = errors.New("message not marked for offsets commit and will be lost in next iteration")

 var pPool = sync.Pool{
 	New: func() interface{} {
-		return &publication{msg: &broker.Message{}}
+		return &publication{msg: broker.NewMessage("")}
 	},
 }
Author	SHA1	Message	Date
Vasiliy Tolstov	69fb765b09	import guard Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-03 18:32:41 +03:00
Vasiliy Tolstov	abfa9da1a9	use own domain Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-10-03 18:30:56 +03:00
github-actions[bot]	a3185dc5b0	Merge pull request #8 from unistack-org/dependabot/github_actions/actions/github-script-5 Bump actions/github-script from 4 to 5	2021-09-27 11:15:58 +00:00
dependabot[bot]	f0dd8ac4bf	Bump actions/github-script from 4 to 5 Bumps [actions/github-script](https://github.com/actions/github-script) from 4 to 5. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-27 11:14:44 +00:00
github-actions[bot]	7aef148699	Merge pull request #7 from unistack-org/dependabot/go_modules/github.com/unistack-org/micro-codec-json/v3-3.7.8 Bump github.com/unistack-org/micro-codec-json/v3 from 3.7.7 to 3.7.8	2021-09-24 11:18:08 +00:00
dependabot[bot]	f34130c30c	Bump github.com/unistack-org/micro-codec-json/v3 from 3.7.7 to 3.7.8 Bumps [github.com/unistack-org/micro-codec-json/v3](https://github.com/unistack-org/micro-codec-json) from 3.7.7 to 3.7.8. - [Release notes](https://github.com/unistack-org/micro-codec-json/releases) - [Commits](https://github.com/unistack-org/micro-codec-json/compare/v3.7.7...v3.7.8) --- updated-dependencies: - dependency-name: github.com/unistack-org/micro-codec-json/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-24 11:17:06 +00:00
github-actions[bot]	a3920dbb36	Merge pull request #6 from unistack-org/dependabot/go_modules/github.com/twmb/franz-go-1.1.1 Bump github.com/twmb/franz-go from 1.1.0 to 1.1.1	2021-09-23 11:22:47 +00:00
github-actions[bot]	e428af2800	Merge pull request #5 from unistack-org/dependabot/go_modules/github.com/unistack-org/micro/v3-3.7.4 Bump github.com/unistack-org/micro/v3 from 3.7.3 to 3.7.4	2021-09-23 11:22:38 +00:00
dependabot[bot]	b76d17b510	Bump github.com/twmb/franz-go from 1.1.0 to 1.1.1 Bumps [github.com/twmb/franz-go](https://github.com/twmb/franz-go) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/twmb/franz-go/releases) - [Changelog](https://github.com/twmb/franz-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/twmb/franz-go/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: github.com/twmb/franz-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-23 11:21:39 +00:00
dependabot[bot]	ce55b40818	Bump github.com/unistack-org/micro/v3 from 3.7.3 to 3.7.4 Bumps [github.com/unistack-org/micro/v3](https://github.com/unistack-org/micro) from 3.7.3 to 3.7.4. - [Release notes](https://github.com/unistack-org/micro/releases) - [Commits](https://github.com/unistack-org/micro/compare/v3.7.3...v3.7.4) --- updated-dependencies: - dependency-name: github.com/unistack-org/micro/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2021-09-23 11:21:27 +00:00
Vasiliy Tolstov	be1c68e6a5	minor changes Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2021-09-23 08:03:14 +03:00