update opentelemetry version #6

Merged
andrey merged 3 commits from otel into master 2022-09-06 22:25:05 +03:00
9 changed files with 25 additions and 13 deletions
Showing only changes of commit d0f3c7e4d0 - Show all commits

View File

@@ -37,6 +37,17 @@ linters-settings:
linters: linters:
enable-all: true enable-all: true
disable:
- exhaustivestruct
- maligned
- deadcode
- interfacer
- golint
- varcheck
- nosnakecase
- scopelint
- ifshort
- structcheck
issues: issues:
# Excluding configuration per-path, per-linter, per-text and per-source # Excluding configuration per-path, per-linter, per-text and per-source
@@ -44,5 +55,5 @@ issues:
- path: _test\.go - path: _test\.go
linters: linters:
- gomnd - gomnd
- exhaustivestruct
- ireturn - ireturn
- exhaustruct

View File

@@ -4,7 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"io/ioutil" "io"
"testing" "testing"
"time" "time"
@@ -12,7 +12,7 @@ import (
"gitoa.ru/go-4devs/log/field" "gitoa.ru/go-4devs/log/field"
) )
// nolint: gochecknoglobals //nolint:gochecknoglobals
var ( var (
errExample = errors.New("fail") errExample = errors.New("fail")
_messages = fakeMessages(1000) _messages = fakeMessages(1000)
@@ -118,7 +118,7 @@ func fakeSugarFields() []interface{} {
} }
func NewLogger() log.Logger { func NewLogger() log.Logger {
return log.New(log.WithWriter(ioutil.Discard)) return log.New(log.WithWriter(io.Discard))
} }
func BenchmarkDisabledWithoutFields(b *testing.B) { func BenchmarkDisabledWithoutFields(b *testing.B) {

View File

@@ -2,14 +2,14 @@ package entry
import "sync" import "sync"
// nolint: gochecknoglobals //nolint:gochecknoglobals
var pool = sync.Pool{ var pool = sync.Pool{
New: func() interface{} { New: func() interface{} {
return New() return New()
}, },
} }
//nolint: forcetypeassert //nolint:forcetypeassert
func Get() *Entry { func Get() *Entry {
e := pool.Get().(*Entry) e := pool.Get().(*Entry)
e.Reset() e.Reset()

View File

@@ -2,6 +2,7 @@ package field
import "time" import "time"
//nolint:interfacebloat
type Encoder interface { type Encoder interface {
// Built-in types. // Built-in types.
AddArray(key string, value Value) AddArray(key string, value Value)

View File

@@ -255,13 +255,13 @@ type Field struct {
value Value value Value
} }
//nolint: gocyclo,cyclop //nolint:gocyclo,cyclop
func (f Field) AddTo(enc Encoder) { func (f Field) AddTo(enc Encoder) {
key := string(f.key) key := string(f.key)
switch { switch {
case f.value.IsArray(): case f.value.IsArray():
enc.AddAny(key, f.value) enc.AddArray(key, f.value)
case f.value.IsNil(): case f.value.IsNil():
enc.AddNil(key) enc.AddNil(key)
case f.value.IsBool(): case f.value.IsBool():

View File

@@ -6,7 +6,7 @@ import (
type Key string type Key string
//nolint: gocyclo,funlen,cyclop //nolint:funlen,cyclop,gocyclo
func (k Key) Any(value interface{}) Field { func (k Key) Any(value interface{}) Field {
switch val := value.(type) { switch val := value.(type) {
case string: case string:

View File

@@ -24,7 +24,7 @@ func (v Value) MarshalJSON() ([]byte, error) {
return b, nil return b, nil
} }
//nolint: gocyclo,gomnd,cyclop //nolint:gocyclo,gomnd,cyclop
func (v Value) String() string { func (v Value) String() string {
switch { switch {
case v.vtype.IsArray(), v.vtype.IsAny(): case v.vtype.IsArray(), v.vtype.IsAny():
@@ -62,7 +62,7 @@ func (v Value) String() string {
return fmt.Sprintf("%+v", v.AsInterface()) return fmt.Sprintf("%+v", v.AsInterface())
} }
//nolint: gocyclo,cyclop //nolint:gocyclo,cyclop
func (v Value) AsInterface() interface{} { func (v Value) AsInterface() interface{} {
switch { switch {
case v.vtype.IsArray(): case v.vtype.IsArray():

View File

@@ -306,7 +306,7 @@ func (l Logger) Writer(ctx context.Context, level level.Level, fields ...field.F
} }
} }
//nolint: containedctx //nolint:containedctx
type writer struct { type writer struct {
ctx context.Context ctx context.Context
level level.Level level level.Level

View File

@@ -76,7 +76,7 @@ func WithJSONFormat() Option {
return WithEncode(jsonFormat) return WithEncode(jsonFormat)
} }
//nolint: forcetypeassert //nolint:forcetypeassert
func stringFormat() func(entry *entry.Entry) ([]byte, error) { func stringFormat() func(entry *entry.Entry) ([]byte, error) {
pool := sync.Pool{ pool := sync.Pool{
New: func() interface{} { New: func() interface{} {