diff --git a/go.mod b/go.mod index f1799151..c91b04c3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/pivotal-cf/cf-redis-broker go 1.17 require ( - code.cloudfoundry.org/lager/v3 v3.0.1 + code.cloudfoundry.org/lager/v3 v3.0.2 github.com/BooleanCat/igo v1.3.0 github.com/cloudfoundry-incubator/candiedyaml v0.0.0-20170901234223-a41693b7b7af github.com/cloudfoundry/gosigar v1.3.17 diff --git a/go.sum b/go.sum index 120af612..427b6552 100644 --- a/go.sum +++ b/go.sum @@ -168,8 +168,9 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= code.cloudfoundry.org/lager v2.0.0+incompatible h1:WZwDKDB2PLd/oL+USK4b4aEjUymIej9My2nUQ9oWEwQ= code.cloudfoundry.org/lager v2.0.0+incompatible/go.mod h1:O2sS7gKP3HM2iemG+EnwvyNQK7pTSC6Foi4QiMp9sSk= -code.cloudfoundry.org/lager/v3 v3.0.1 h1:AI7h0EgCa4bJCCq0N8JV8EBP+tbJUIovqKc4hB4wZsA= code.cloudfoundry.org/lager/v3 v3.0.1/go.mod h1:zA6tOIWhr5uZUez+PGpdfBHDWQOfhOrr0cgKDagZPwk= +code.cloudfoundry.org/lager/v3 v3.0.2 h1:H0dcQY+814G1Ea0e5K/AMaMpcr+Pe5Iv+AALJEwrP9U= +code.cloudfoundry.org/lager/v3 v3.0.2/go.mod h1:zA6tOIWhr5uZUez+PGpdfBHDWQOfhOrr0cgKDagZPwk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BooleanCat/igo v1.3.0 h1:IhmUovyc80rUr2iMwCZZJruosW4+GYj/iuycgL7FBRs= github.com/BooleanCat/igo v1.3.0/go.mod h1:ap7Ze9eOcCQGUS/q9kudSPYJRRencTBgeZfR7Yp41KY= diff --git a/vendor/code.cloudfoundry.org/lager/v3/CODEOWNERS b/vendor/code.cloudfoundry.org/lager/v3/CODEOWNERS new file mode 100644 index 00000000..6a633c7e --- /dev/null +++ b/vendor/code.cloudfoundry.org/lager/v3/CODEOWNERS @@ -0,0 +1 @@ +* @cloudfoundry/wg-app-runtime-platform-diego-approvers diff --git a/vendor/code.cloudfoundry.org/lager/v3/logger.go b/vendor/code.cloudfoundry.org/lager/v3/logger.go index df3e076e..64a29d7e 100644 --- a/vendor/code.cloudfoundry.org/lager/v3/logger.go +++ b/vendor/code.cloudfoundry.org/lager/v3/logger.go @@ -36,14 +36,16 @@ type logger struct { sessionID string nextSession uint32 data Data + idGenerator idgenerator.IDGenerator } func NewLogger(component string) Logger { return &logger{ - component: component, - task: component, - sinks: []Sink{}, - data: Data{}, + component: component, + task: component, + sinks: []Sink{}, + data: Data{}, + idGenerator: idgenerator.NewRandom128(), } } @@ -67,21 +69,23 @@ func (l *logger) Session(task string, data ...Data) Logger { } return &logger{ - component: l.component, - task: fmt.Sprintf("%s.%s", l.task, task), - sinks: l.sinks, - sessionID: sessionIDstr, - data: l.baseData(data...), + component: l.component, + task: fmt.Sprintf("%s.%s", l.task, task), + sinks: l.sinks, + sessionID: sessionIDstr, + data: l.baseData(data...), + idGenerator: l.idGenerator, } } func (l *logger) WithData(data Data) Logger { return &logger{ - component: l.component, - task: l.task, - sinks: l.sinks, - sessionID: l.sessionID, - data: l.baseData(data), + component: l.component, + task: l.task, + sinks: l.sinks, + sessionID: l.sessionID, + data: l.baseData(data), + idGenerator: l.idGenerator, } } @@ -96,7 +100,7 @@ func (l *logger) WithTraceInfo(req *http.Request) Logger { return l.WithData(nil) } - spanID := idgenerator.NewRandom128().SpanID(traceID) + spanID := l.idGenerator.SpanID(model.TraceID{}) return l.WithData(Data{"trace-id": traceID.String(), "span-id": spanID.String()}) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 03a864dd..1b7dabaf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,7 @@ # code.cloudfoundry.org/lager v2.0.0+incompatible ## explicit code.cloudfoundry.org/lager -# code.cloudfoundry.org/lager/v3 v3.0.1 +# code.cloudfoundry.org/lager/v3 v3.0.2 ## explicit; go 1.19 code.cloudfoundry.org/lager/v3 code.cloudfoundry.org/lager/v3/internal/truncate