Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
go-version: '1.20'
- name: setup pulsar
uses: shoothzj/setup-pulsar-action@v1
uses: hezhangjian/setup-pulsar-action@v1
- name: Run coverage
run: go test -tags=integration ./... -race -coverprofile=coverage.out -covermode=atomic
- name: print pulsar logs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/go_mod_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ jobs:
- name: Check out code
uses: actions/checkout@v3
- name: Run Go Mod Check Action
uses: Shoothzj/go-mod-check-action@main
uses: hezhangjian/go-mod-check-action@main
with:
prohibitIndirectDepUpdate: 'true'
4 changes: 2 additions & 2 deletions .github/workflows/java_client_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
with:
go-version: '1.20'
- name: setup pulsar
uses: shoothzj/setup-pulsar-action@v1
uses: hezhangjian/setup-pulsar-action@v1
- name: build kop binary
run: cd cmd/it && go build -o kop .
- name: run kop
run: nohup ./cmd/it/kop >kop.log 2>&1 &
- name: wait kop start
uses: shoothzj/host-available-check-action@v1
uses: hezhangjian/host-available-check-action@v1
with:
check_type: 'TCP'
check_timeout: 60
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM shoothzj/compile:go AS build
FROM hezhangjian/compile:go AS build
COPY . /opt/compile
WORKDIR /opt/compile/cmd/it
RUN go build -o kop .

FROM shoothzj/base
FROM hezhangjian/base

COPY --from=build /opt/compile/cmd/it/kop /opt/pulsar/kop/kop

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/protocol-laboratory/kop-proxy-go
go 1.20

require (
github.com/Shoothzj/gox v0.0.0-20230519043040-c113104c124a
github.com/hezhangjian/gox v0.0.0-20230519043040-c113104c124a
github.com/apache/pulsar-client-go v0.10.0
github.com/go-redis/redis/v8 v8.11.5
github.com/gogo/protobuf v1.3.2
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS
github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/hcsshim v0.9.7 h1:mKNHW/Xvv1aFH87Jb6ERDzXTJTLPlmzfZ28VBFD/bfg=
github.com/Shoothzj/gox v0.0.0-20230519043040-c113104c124a h1:7mCkQusIzgYrtqPraZdInWFGV0OTWRhvOdnmAphH+8Q=
github.com/Shoothzj/gox v0.0.0-20230519043040-c113104c124a/go.mod h1:QCFRoh5wevxlgrq7yi9Q674w/GhwiEWvpzGaZ4FhSiI=
github.com/hezhangjian/gox v0.0.0-20230519043040-c113104c124a h1:7mCkQusIzgYrtqPraZdInWFGV0OTWRhvOdnmAphH+8Q=
github.com/hezhangjian/gox v0.0.0-20230519043040-c113104c124a/go.mod h1:QCFRoh5wevxlgrq7yi9Q674w/GhwiEWvpzGaZ4FhSiI=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/apache/pulsar-client-go v0.10.0 h1:ccwjmmaCjaE6bLYnrILpm8V4WQQ8rB3J98pOW0O2nyo=
github.com/apache/pulsar-client-go v0.10.0/go.mod h1:l9ZNSafZdle1cpyFE5CkUL3uRYJMvoHjHHLlK0kL7c8=
Expand Down
4 changes: 2 additions & 2 deletions kop/kop.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package kop

import (
"fmt"
"github.com/Shoothzj/gox/set"
"github.com/Shoothzj/gox/syncx"
"github.com/hezhangjian/gox/set"
"github.com/hezhangjian/gox/syncx"
"github.com/apache/pulsar-client-go/pulsar"
"github.com/pkg/errors"
"github.com/protocol-laboratory/kafka-codec-go/codec"
Expand Down
2 changes: 1 addition & 1 deletion kop/pulsar_consumer_handle.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package kop

import (
"fmt"
"github.com/Shoothzj/gox/listx"
"github.com/hezhangjian/gox/listx"
"github.com/apache/pulsar-client-go/pulsar"
"github.com/protocol-laboratory/kop-proxy-go/constant"
"github.com/protocol-laboratory/kop-proxy-go/metrics"
Expand Down
2 changes: 1 addition & 1 deletion utils/debug_util.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package utils

import "github.com/Shoothzj/gox/set"
import "github.com/hezhangjian/gox/set"

func DebugTopicMatch(kSet, pSet set.Set[string], kTopic, pTopic string) bool {
return DebugKafkaTopicMatch(kSet, kTopic) || DebugPulsarPartitionTopicMatch(pSet, pTopic)
Expand Down
2 changes: 1 addition & 1 deletion utils/key_based_rate_limiter.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package utils

import (
"github.com/Shoothzj/gox/syncx"
"github.com/hezhangjian/gox/syncx"
"golang.org/x/time/rate"
"time"
)
Expand Down
Loading