Skip to content

Commit

Permalink
Fix golang tag issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaron-ai
aaron-ai committed Mar 22, 2023
1 parent 41bfbcf commit 8bc85ff
Show file tree
Hide file tree
Showing 37 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion golang/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ import "github.com/apache/rocketmq-clients/golang"
Otherwise, to install the `golang` package, run the following command:

```sh
go get -u github.com/apache/rocketmq-clients/golang
go get -u github.com/apache/rocketmq-clients/golang/v5
```
8 changes: 4 additions & 4 deletions golang/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"sync"
"time"

innerMD "github.com/apache/rocketmq-clients/golang/metadata"
"github.com/apache/rocketmq-clients/golang/pkg/ticker"
"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
innerMD "github.com/apache/rocketmq-clients/golang/v5/metadata"
"github.com/apache/rocketmq-clients/golang/v5/pkg/ticker"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"github.com/google/uuid"
"go.uber.org/atomic"
"go.uber.org/zap"
Expand Down
6 changes: 3 additions & 3 deletions golang/client_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"sync"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/ticker"
"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/ticker"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion golang/client_manager_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
reflect "reflect"
time "time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
gomock "github.com/golang/mock/gomock"
)

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

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
gomock "github.com/golang/mock/gomock"
"github.com/prashantv/gostub"
"google.golang.org/grpc/metadata"
Expand Down
2 changes: 1 addition & 1 deletion golang/client_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
context "context"
reflect "reflect"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
gomock "github.com/golang/mock/gomock"
)

Expand Down
2 changes: 1 addition & 1 deletion golang/client_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package golang
import (
"time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
)

type clientOptions struct {
Expand Down
4 changes: 2 additions & 2 deletions golang/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"time"

"github.com/apache/rocketmq-clients/golang/credentials"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
gomock "github.com/golang/mock/gomock"
"github.com/prashantv/gostub"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion golang/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package golang

import "github.com/apache/rocketmq-clients/golang/credentials"
import "github.com/apache/rocketmq-clients/golang/v5/credentials"

type Config struct {
Endpoint string `validate:"required"`
Expand Down
2 changes: 1 addition & 1 deletion golang/conn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"errors"
"fmt"

"github.com/apache/rocketmq-clients/golang/pkg/grpc/middleware/zaplog"
"github.com/apache/rocketmq-clients/golang/v5/pkg/grpc/middleware/zaplog"
validator "github.com/go-playground/validator/v10"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand Down
2 changes: 1 addition & 1 deletion golang/conn_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"math"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/zaplog"
"github.com/apache/rocketmq-clients/golang/v5/pkg/zaplog"
"go.uber.org/zap"
"google.golang.org/grpc"
)
Expand Down
2 changes: 1 addition & 1 deletion golang/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package golang
import (
"time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
)

type Consumer interface {
Expand Down
2 changes: 1 addition & 1 deletion golang/error.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
)

type ErrRpcStatus struct {
Expand Down
2 changes: 1 addition & 1 deletion golang/example/consumer/simple_consumer/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"time"

rmq_client "github.com/apache/rocketmq-clients/golang"
"github.com/apache/rocketmq-clients/golang/credentials"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion golang/example/producer/async/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

rmq_client "github.com/apache/rocketmq-clients/golang"
"github.com/apache/rocketmq-clients/golang/credentials"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion golang/example/producer/delay/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

rmq_client "github.com/apache/rocketmq-clients/golang"
"github.com/apache/rocketmq-clients/golang/credentials"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion golang/example/producer/fifo/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

rmq_client "github.com/apache/rocketmq-clients/golang"
"github.com/apache/rocketmq-clients/golang/credentials"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion golang/example/producer/normal/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

rmq_client "github.com/apache/rocketmq-clients/golang"
"github.com/apache/rocketmq-clients/golang/credentials"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion golang/example/producer/transaction/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

rmq_client "github.com/apache/rocketmq-clients/golang"
"github.com/apache/rocketmq-clients/golang/credentials"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion golang/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/apache/rocketmq-clients/golang
module github.com/apache/rocketmq-clients/golang/v5

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions golang/loadBalancer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"sync"
"sync/atomic"

"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"github.com/dchest/siphash"
// "github.com/dchest/siphash"
)
Expand Down
2 changes: 1 addition & 1 deletion golang/log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strconv"
"strings"

"github.com/apache/rocketmq-clients/golang/pkg/utils"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
"github.com/natefinch/lumberjack"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand Down
4 changes: 2 additions & 2 deletions golang/message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strconv"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/protobuf/types/known/timestamppb"
)

Expand Down
2 changes: 1 addition & 1 deletion golang/message_id_codec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"sync/atomic"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/utils"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
)

/**
Expand Down
4 changes: 2 additions & 2 deletions golang/metric.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"time"

"contrib.go.opencensus.io/exporter/ocagent"
"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"go.opencensus.io/stats"
"go.opencensus.io/stats/view"
"go.opencensus.io/tag"
Expand Down
2 changes: 1 addition & 1 deletion golang/pkg/grpc/middleware/zaplog/zaplog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"context"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/zaplog/ctxzap"
"github.com/apache/rocketmq-clients/golang/v5/pkg/zaplog/ctxzap"

"go.uber.org/zap"
"google.golang.org/grpc"
Expand Down
4 changes: 2 additions & 2 deletions golang/pkg/utils/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"sync/atomic"
"time"

"github.com/apache/rocketmq-clients/golang/metadata"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/metadata"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"github.com/valyala/fastrand"
"go.opencensus.io/trace"
MD "google.golang.org/grpc/metadata"
Expand Down
2 changes: 1 addition & 1 deletion golang/pkg/utils/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"compress/gzip"
"testing"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
)

func TestMod(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions golang/producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"sync"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/protobuf/types/known/durationpb"
)

Expand Down
2 changes: 1 addition & 1 deletion golang/producer_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sync"
"time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/protobuf/types/known/durationpb"
)

Expand Down
4 changes: 2 additions & 2 deletions golang/producer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"time"

"github.com/apache/rocketmq-clients/golang/credentials"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/credentials"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
gomock "github.com/golang/mock/gomock"
"github.com/prashantv/gostub"
)
Expand Down
4 changes: 2 additions & 2 deletions golang/publishing_message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ package golang
import (
"fmt"

innerOS "github.com/apache/rocketmq-clients/golang/pkg/os"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
innerOS "github.com/apache/rocketmq-clients/golang/v5/pkg/os"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/protobuf/types/known/timestamppb"
)

Expand Down
2 changes: 1 addition & 1 deletion golang/rpc_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"sync/atomic"
"time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
// "google.golang.org/protobuf/types/known/durationpb"
)

Expand Down
2 changes: 1 addition & 1 deletion golang/rpc_client_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
reflect "reflect"
time "time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
gomock "github.com/golang/mock/gomock"
)

Expand Down
4 changes: 2 additions & 2 deletions golang/simple_consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"sync/atomic"
"time"

"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"
)
Expand Down
2 changes: 1 addition & 1 deletion golang/simple_consumer_options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"time"

v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
"google.golang.org/protobuf/types/known/durationpb"
)

Expand Down
4 changes: 2 additions & 2 deletions golang/user_agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package golang

import (
"github.com/apache/rocketmq-clients/golang/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/protocol/v2"
"github.com/apache/rocketmq-clients/golang/v5/pkg/utils"
v2 "github.com/apache/rocketmq-clients/golang/v5/protocol/v2"
)

type userAgent struct {
Expand Down

0 comments on commit 8bc85ff

Please sign in to comment.