Skip to content

Commit

Permalink
fix: revert version upgrade on go.mod
Browse files Browse the repository at this point in the history
  • Loading branch information
@uknth
uknth committed Oct 16, 2023
1 parent be72912 commit 0b1a2a6
Show file tree
Hide file tree
Showing 34 changed files with 66 additions and 66 deletions.
6 changes: 3 additions & 3 deletions data/cache/cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

"github.com/unbxd/go-base/v2/data/cache/inmem"
"github.com/unbxd/go-base/v2/data/cache/redis"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/data/cache/inmem"
"github.com/unbxd/go-base/data/cache/redis"
"github.com/unbxd/go-base/log"
)

type Cache interface {
Expand Down
2 changes: 1 addition & 1 deletion data/cache/redis/redis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

redis "github.com/redis/go-redis/v9"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

var NOEXPIRE = time.Duration(0)
Expand Down
4 changes: 2 additions & 2 deletions data/driver/zook/zook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"time"

"github.com/samuel/go-zookeeper/zk"
"github.com/unbxd/go-base/v2/data/driver"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/data/driver"
"github.com/unbxd/go-base/errors"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion errors/errors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func Join(errors ...error) error { return builtin_errors.Join(errors...) }
func Unwrap(err error) error { return builtin_errors.Unwrap(err) }
func New(msg string) error { return builtin_errors.New(msg) }

// Method from github.com/unbxd/go-base/v2/errors
// Method from github.com/unbxd/go-base/errors
func Wrap(err error, message string) error {
if err == nil {
return nil
Expand Down
6 changes: 3 additions & 3 deletions examples/http/simple_http/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/unbxd/go-base/v2/exmple/http/simple_http
module github.com/unbxd/go-base/exmple/http/simple_http

go 1.21

toolchain go1.21.1

require github.com/unbxd/go-base/v2 v1.2.9
require github.com/unbxd/go-base v1.2.9

replace github.com/unbxd/go-base/v2 => ../../../
replace github.com/unbxd/go-base => ../../../

require (
github.com/VividCortex/gohistogram v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions examples/http/simple_http/http_ex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
net_http "net/http"
"time"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/v2/transport/http"
"github.com/unbxd/go-base/log"
"github.com/unbxd/go-base/transport/http"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/unbxd/go-base/v2
module github.com/unbxd/go-base

go 1.21

Expand Down
2 changes: 1 addition & 1 deletion metrics/datadog_metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/go-kit/kit/metrics/dogstatsd"
kitlogger "github.com/go-kit/log"
"github.com/mitchellh/mapstructure"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

type (
Expand Down
10 changes: 5 additions & 5 deletions net/cb/breaker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
"sync"

"github.com/DataDog/datadog-go/statsd"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/v2/metrics"
cbplugins "github.com/unbxd/go-base/v2/net/cb/plugins"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/log"
"github.com/unbxd/go-base/metrics"
cbplugins "github.com/unbxd/go-base/net/cb/plugins"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/hystrix-go/hystrix"
"github.com/unbxd/hystrix-go/hystrix/metric"
"github.com/unbxd/hystrix-go/plugins"
Expand Down
2 changes: 1 addition & 1 deletion net/cb/plugins/metrics.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package plugins

import (
gbmetrics "github.com/unbxd/go-base/v2/metrics"
gbmetrics "github.com/unbxd/go-base/metrics"
"github.com/unbxd/hystrix-go/hystrix/metric"
)

Expand Down
4 changes: 2 additions & 2 deletions net/dialer/def_dialer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"net/http"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
)

// Error response
Expand Down
2 changes: 1 addition & 1 deletion net/dialer/def_dialer_utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

khttp "github.com/go-kit/kit/transport/http"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
)

func fnc(o, n int) int {
Expand Down
6 changes: 3 additions & 3 deletions net/dialer/def_opts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"net/http"
"time"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/v2/net/retrier"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
"github.com/unbxd/go-base/net/retrier"
)

type (
Expand Down
4 changes: 2 additions & 2 deletions net/dialer/dialer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"net/http"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
)

// Validator Errors
Expand Down
6 changes: 3 additions & 3 deletions net/retrier/retrier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
net_http "net/http"
"time"

"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/log"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/hystrix-go/hystrix"
)

Expand Down
6 changes: 3 additions & 3 deletions notifier/nats_notifier.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"sync"
"time"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/v2/transport/nats"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
"github.com/unbxd/go-base/transport/nats"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion transport/http/filter_metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

"github.com/go-chi/chi/v5"
"github.com/unbxd/go-base/v2/metrics"
"github.com/unbxd/go-base/metrics"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
Expand Down
2 changes: 1 addition & 1 deletion transport/http/filter_panic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"runtime"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion transport/http/filter_trace.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"time"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

// TraceLoggingFilter supersedes `NewTraceLoggerFinalizerHandlerOption` as this
Expand Down
2 changes: 1 addition & 1 deletion transport/http/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

kit_endpoint "github.com/go-kit/kit/endpoint"
kit_http "github.com/go-kit/kit/transport/http"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/endpoint"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion transport/http/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
net_http "net/http"

"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
)

// ContextKey is key for context
Expand Down
6 changes: 3 additions & 3 deletions transport/http/proxy/proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"time"

"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
)

const defaultUserAgent = "Mozart-[go-dialer]"
Expand Down
2 changes: 1 addition & 1 deletion transport/http/transport.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
http "net/http"
"time"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion transport/http/transport_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

kit_http "github.com/go-kit/kit/transport/http"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

type (
Expand Down
4 changes: 2 additions & 2 deletions transport/http/transport_config_opt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net/http"
"time"

"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/v2/metrics"
"github.com/unbxd/go-base/log"
"github.com/unbxd/go-base/metrics"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/trace"
Expand Down
6 changes: 3 additions & 3 deletions transport/kafka/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/go-kit/kit/transport"
kafgo "github.com/segmentio/kafka-go"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion transport/kafka/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/go-kit/kit/transport"
kafgo "github.com/segmentio/kafka-go"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
)

type (
Expand Down
6 changes: 3 additions & 3 deletions transport/kafka/producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/go-kit/kit/transport"
kafgo "github.com/segmentio/kafka-go"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
)

type (
Expand Down
4 changes: 2 additions & 2 deletions transport/nats/publisher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

natn "github.com/nats-io/nats.go"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/errors"
)

type (
Expand Down
6 changes: 3 additions & 3 deletions transport/nats/subscriber.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"github.com/go-kit/kit/transport"
kitn "github.com/go-kit/kit/transport/nats"
natn "github.com/nats-io/nats.go"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
)

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

natn "github.com/nats-io/nats.go"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion transport/nats/transport_fn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package nats

import (
natn "github.com/nats-io/nats.go"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/log"
)

// DisconnectErrorCallback is called when the connection to
Expand Down
10 changes: 5 additions & 5 deletions transport/zk/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (

"github.com/go-kit/kit/transport"
"github.com/samuel/go-zookeeper/zk"
"github.com/unbxd/go-base/v2/data/driver"
"github.com/unbxd/go-base/v2/data/driver/zook"
"github.com/unbxd/go-base/v2/endpoint"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/v2/log"
"github.com/unbxd/go-base/data/driver"
"github.com/unbxd/go-base/data/driver/zook"
"github.com/unbxd/go-base/endpoint"
"github.com/unbxd/go-base/errors"
"github.com/unbxd/go-base/log"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion transport/zk/zk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"time"

"github.com/go-kit/kit/transport"
"github.com/unbxd/go-base/v2/errors"
"github.com/unbxd/go-base/errors"
)

type (
Expand Down

0 comments on commit 0b1a2a6

Please sign in to comment.