From f4eaeb89bc4728c86b31280c795fab2481d8e35f Mon Sep 17 00:00:00 2001 From: David Hartunian Date: Wed, 16 Aug 2023 21:38:13 -0400 Subject: [PATCH] Add multi-cause unwrap into Sentry reporting This commit modifies the causal detail collection code in `report.go` to recurse through both the single-cause chain and the multi-cause chain if applicable when collecting information for the Sentry report. --- fmttests/testdata/format/wrap-fmt | 272 +++++++++++- fmttests/testdata/format/wrap-fmt-via-network | 272 +++++++++++- fmttests/testdata/format/wrap-goerr | 272 +++++++++++- .../testdata/format/wrap-goerr-via-network | 272 +++++++++++- fmttests/testdata/format/wrap-newf | 390 +++++++++++++++++- .../testdata/format/wrap-newf-via-network | 390 +++++++++++++++++- fmttests/testdata/format/wrap-nofmt | 272 +++++++++++- .../testdata/format/wrap-nofmt-via-network | 272 +++++++++++- fmttests/testdata/format/wrap-pkgerr | 382 ++++++++++++++++- .../testdata/format/wrap-pkgerr-via-network | 382 ++++++++++++++++- report/report.go | 14 +- 11 files changed, 3068 insertions(+), 122 deletions(-) diff --git a/fmttests/testdata/format/wrap-fmt b/fmttests/testdata/format/wrap-fmt index e02fa87..39f127f 100644 --- a/fmttests/testdata/format/wrap-fmt +++ b/fmttests/testdata/format/wrap-fmt @@ -1777,13 +1777,40 @@ Wraps: (3) × × Error types: (1) *fmt.wrapErrors (2) *errors.fundamental (3) *fmttests.errFmt -- report composition: +:: *errors.fundamental (top exception) +*fmttests.errFmt *fmt.wrapErrors == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo @@ -2434,13 +2461,42 @@ Wraps: (4) × × Error types: (1) *join.joinError (2) *withstack.withStack (3) *errutil.leafError (4) *fmttests.errFmt -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*fmttests.errFmt *join.joinError == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo @@ -2923,13 +2979,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *fmttests.errFmt -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errFmt +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo @@ -3243,13 +3395,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *fmttests.errFmt -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errFmt *fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo diff --git a/fmttests/testdata/format/wrap-fmt-via-network b/fmttests/testdata/format/wrap-fmt-via-network index 91ff2a1..9dffe40 100644 --- a/fmttests/testdata/format/wrap-fmt-via-network +++ b/fmttests/testdata/format/wrap-fmt-via-network @@ -2310,13 +2310,40 @@ Wraps: (3) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt Error types: (1) *errbase.opaqueLeafCauses (2) *errbase.opaqueLeaf (3) *errbase.opaqueLeaf -- report composition: +:: *errors.fundamental (top exception) +*fmttests.errFmt *fmt.wrapErrors == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo @@ -3136,13 +3163,42 @@ Wraps: (4) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt Error types: (1) *join.joinError (2) *errbase.opaqueWrapper (3) *errutil.leafError (4) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*fmttests.errFmt *join.joinError == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo @@ -3836,13 +3892,109 @@ Wraps: (7) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errFmt +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo @@ -4311,13 +4463,109 @@ Wraps: (7) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errFmt *fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run fmt innerone innertwo diff --git a/fmttests/testdata/format/wrap-goerr b/fmttests/testdata/format/wrap-goerr index 1380a7b..bbf21bb 100644 --- a/fmttests/testdata/format/wrap-goerr +++ b/fmttests/testdata/format/wrap-goerr @@ -1623,13 +1623,40 @@ Wraps: (3) × × Error types: (1) *fmt.wrapErrors (2) *errors.fundamental (3) *errors.errorString -- report composition: +:: *errors.fundamental (top exception) +*errors.errorString *fmt.wrapErrors == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +errors/*errors.errorString (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo @@ -2226,13 +2253,42 @@ Wraps: (4) × × Error types: (1) *join.joinError (2) *withstack.withStack (3) *errutil.leafError (4) *errors.errorString -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*errors.errorString *join.joinError == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +errors/*errors.errorString (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo @@ -2688,13 +2744,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *errors.errorString -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errors.errorString +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +errors/*errors.errorString (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo @@ -2999,13 +3151,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *errors.errorString -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errors.errorString *fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +errors/*errors.errorString (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo diff --git a/fmttests/testdata/format/wrap-goerr-via-network b/fmttests/testdata/format/wrap-goerr-via-network index c097698..a47f632 100644 --- a/fmttests/testdata/format/wrap-goerr-via-network +++ b/fmttests/testdata/format/wrap-goerr-via-network @@ -1910,13 +1910,40 @@ Wraps: (3) × × Error types: (1) *errbase.opaqueLeafCauses (2) *errbase.opaqueLeaf (3) *errors.errorString -- report composition: +:: *errors.fundamental (top exception) +*errors.errorString *fmt.wrapErrors == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +errors/*errors.errorString (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo @@ -2586,13 +2613,42 @@ Wraps: (4) × × Error types: (1) *join.joinError (2) *errbase.opaqueWrapper (3) *errutil.leafError (4) *errors.errorString -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*errors.errorString *join.joinError == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +errors/*errors.errorString (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo @@ -3211,13 +3267,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errors.errorString -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errors.errorString +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +errors/*errors.errorString (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo @@ -3661,13 +3813,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errors.errorString -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errors.errorString *fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +errors/*errors.errorString (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run goerr innerone innertwo diff --git a/fmttests/testdata/format/wrap-newf b/fmttests/testdata/format/wrap-newf index 6793c56..84e5c6d 100644 --- a/fmttests/testdata/format/wrap-newf +++ b/fmttests/testdata/format/wrap-newf @@ -3323,13 +3323,70 @@ Wraps: (3) attached stack trace | × Error types: (1) *fmt.wrapErrors (2) *errors.fundamental (3) *withstack.withStack (4) *errutil.leafError -- report composition: +:: *errors.fundamental (top exception) +*errutil.leafError: new-style × +:: *withstack.withStack (1) *fmt.wrapErrors +(check the extra data payloads) == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo @@ -4467,13 +4524,72 @@ Wraps: (4) attached stack trace | × Error types: (1) *join.joinError (2) *withstack.withStack (3) *errutil.leafError (4) *withstack.withStack (5) *errutil.leafError -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*errutil.leafError: new-style × +:: *withstack.withStack (1) *join.joinError +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "new-style ×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: new-style ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo @@ -5225,13 +5341,138 @@ Wraps: (7) × | × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *withstack.withStack (11) *errutil.leafError -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errutil.leafError: new-style × +:: *withstack.withStack (3) +*fmttests.errMultiCause *fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: new-style ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: new-style ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo @@ -5614,13 +5855,138 @@ Wraps: (7) × | × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *withstack.withStack (11) *errutil.leafError -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errutil.leafError: new-style × +:: *withstack.withStack (3) +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: new-style ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: new-style ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo diff --git a/fmttests/testdata/format/wrap-newf-via-network b/fmttests/testdata/format/wrap-newf-via-network index 4a1b87a..dd9516d 100644 --- a/fmttests/testdata/format/wrap-newf-via-network +++ b/fmttests/testdata/format/wrap-newf-via-network @@ -3922,13 +3922,70 @@ Wraps: (3) | × Error types: (1) *errbase.opaqueLeafCauses (2) *errbase.opaqueLeaf (3) *errbase.opaqueWrapper (4) *errutil.leafError -- report composition: +:: *errors.fundamental (top exception) +*errutil.leafError: new-style × +:: *withstack.withStack (1) *fmt.wrapErrors +(check the extra data payloads) == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo @@ -5340,13 +5397,72 @@ Wraps: (4) | × Error types: (1) *join.joinError (2) *errbase.opaqueWrapper (3) *errutil.leafError (4) *errbase.opaqueWrapper (5) *errutil.leafError -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*errutil.leafError: new-style × +:: *withstack.withStack (1) *join.joinError +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "new-style ×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: new-style ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo @@ -6336,13 +6452,138 @@ Wraps: (7) × | × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueWrapper (11) *errutil.leafError -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errutil.leafError: new-style × +:: *withstack.withStack (3) +*fmttests.errMultiCause *fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: new-style ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: new-style ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo @@ -6893,13 +7134,138 @@ Wraps: (7) × | × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueWrapper (11) *errutil.leafError -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*errutil.leafError: new-style × +:: *withstack.withStack (3) +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: new-style ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: new-style ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run newf innerone innertwo diff --git a/fmttests/testdata/format/wrap-nofmt b/fmttests/testdata/format/wrap-nofmt index da0421b..b7a6bb0 100644 --- a/fmttests/testdata/format/wrap-nofmt +++ b/fmttests/testdata/format/wrap-nofmt @@ -1623,13 +1623,40 @@ Wraps: (3) × × Error types: (1) *fmt.wrapErrors (2) *errors.fundamental (3) *fmttests.errNoFmt -- report composition: +:: *errors.fundamental (top exception) +*fmttests.errNoFmt *fmt.wrapErrors == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo @@ -2226,13 +2253,42 @@ Wraps: (4) × × Error types: (1) *join.joinError (2) *withstack.withStack (3) *errutil.leafError (4) *fmttests.errNoFmt -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*fmttests.errNoFmt *join.joinError == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo @@ -2688,13 +2744,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *fmttests.errNoFmt -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errNoFmt +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo @@ -2999,13 +3151,109 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *fmttests.errNoFmt -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errNoFmt *fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo diff --git a/fmttests/testdata/format/wrap-nofmt-via-network b/fmttests/testdata/format/wrap-nofmt-via-network index 9ffca03..5c6d019 100644 --- a/fmttests/testdata/format/wrap-nofmt-via-network +++ b/fmttests/testdata/format/wrap-nofmt-via-network @@ -2310,13 +2310,40 @@ Wraps: (3) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt Error types: (1) *errbase.opaqueLeafCauses (2) *errbase.opaqueLeaf (3) *errbase.opaqueLeaf -- report composition: +:: *errors.fundamental (top exception) +*fmttests.errNoFmt *fmt.wrapErrors == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo @@ -3136,13 +3163,42 @@ Wraps: (4) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt Error types: (1) *join.joinError (2) *errbase.opaqueWrapper (3) *errutil.leafError (4) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +*fmttests.errNoFmt *join.joinError == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo @@ -3836,13 +3892,109 @@ Wraps: (7) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errNoFmt +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo @@ -4311,13 +4463,109 @@ Wraps: (7) × | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +*fmttests.errNoFmt *fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run nofmt innerone innertwo diff --git a/fmttests/testdata/format/wrap-pkgerr b/fmttests/testdata/format/wrap-pkgerr index 105e5fd..fb44a0a 100644 --- a/fmttests/testdata/format/wrap-pkgerr +++ b/fmttests/testdata/format/wrap-pkgerr @@ -3204,13 +3204,68 @@ Wraps: (3) × × Error types: (1) *fmt.wrapErrors (2) *errors.fundamental (3) *errors.fundamental -- report composition: +:: *errors.fundamental (top exception) +:: *errors.fundamental (1) *fmt.wrapErrors +(check the extra data payloads) == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/pkg/errors/*errors.fundamental (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo @@ -4307,13 +4362,70 @@ Wraps: (4) × × Error types: (1) *join.joinError (2) *withstack.withStack (3) *errutil.leafError (4) *errors.fundamental -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +:: *errors.fundamental (1) *join.joinError +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/pkg/errors/*errors.fundamental (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo @@ -5043,13 +5155,136 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *errors.fundamental -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +:: *errors.fundamental (3) +*fmttests.errMultiCause *fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo @@ -5426,13 +5661,136 @@ Wraps: (7) × × Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *withstack.withStack (4) *errutil.leafError (5) *withstack.withStack (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *withstack.withStack (9) *errutil.leafError (10) *errors.fundamental -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +:: *errors.fundamental (3) +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo diff --git a/fmttests/testdata/format/wrap-pkgerr-via-network b/fmttests/testdata/format/wrap-pkgerr-via-network index 5c9cfc1..9a98a3f 100644 --- a/fmttests/testdata/format/wrap-pkgerr-via-network +++ b/fmttests/testdata/format/wrap-pkgerr-via-network @@ -3834,13 +3834,68 @@ Wraps: (3) × | : Error types: (1) *errbase.opaqueLeafCauses (2) *errbase.opaqueLeaf (3) *errbase.opaqueLeaf -- report composition: +:: *errors.fundamental (top exception) +:: *errors.fundamental (1) *fmt.wrapErrors +(check the extra data payloads) == Extra "error types" +github.com/pkg/errors/*errors.fundamental (*::) +github.com/pkg/errors/*errors.fundamental (*::) fmt/*fmt.wrapErrors (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmt.wrapErrors" -Title: "×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errors.fundamental: ×" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo @@ -5220,13 +5275,70 @@ Wraps: (4) × | : Error types: (1) *join.joinError (2) *errbase.opaqueWrapper (3) *errutil.leafError (4) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: outerthree +:: *withstack.withStack (top exception) +:: *errors.fundamental (1) *join.joinError +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/pkg/errors/*errors.fundamental (*::) github.com/cockroachdb/errors/join/*join.joinError (*::) == Exception 1 (Module: "error domain: ") -Type: "*join.joinError" -Title: "×" -(NO STACKTRACE) +Type: "(1) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo @@ -6200,13 +6312,136 @@ Wraps: (7) × | : Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: included 2 +:: *withstack.withStack (top exception) +*errutil.leafError: included 1 +:: *withstack.withStack (1) +*fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +:: *errors.fundamental (3) +*fmttests.errMultiCause *fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: included 2: included 1: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: included 2: included 1: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo @@ -6753,13 +6988,136 @@ Wraps: (7) × | : Error types: (1) *fmttests.errMultiCause (2) *fmttests.errMultiCause (3) *errbase.opaqueWrapper (4) *errutil.leafError (5) *errbase.opaqueWrapper (6) *errutil.leafError (7) *fmttests.errMultiCause (8) *errbase.opaqueWrapper (9) *errutil.leafError (10) *errbase.opaqueLeaf -- report composition: +*errutil.leafError: elided 2 +:: *withstack.withStack (top exception) +*errutil.leafError: elided 1 +:: *withstack.withStack (1) *fmttests.errMultiCause +*errutil.leafError: outerthree +:: *withstack.withStack (2) +:: *errors.fundamental (3) +*fmttests.errMultiCause +*fmttests.errMultiCause +(check the extra data payloads) == Extra "error types" +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) +github.com/cockroachdb/errors/errutil/*errutil.leafError (*::) +github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) +github.com/pkg/errors/*errors.fundamental (*::) +github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) github.com/cockroachdb/errors/fmttests/*fmttests.errMultiCause (*::) == Exception 1 (Module: "error domain: ") -Type: "*fmttests.errMultiCause" -Title: "×: ×: ×: outerthree: ×" -(NO STACKTRACE) +Type: "(3) : ...funcNN... +Title: "*errors.fundamental" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 2 (Module: "error domain: ") +Type: "(2) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 3 (Module: "error domain: ") +Type: "(1) : ...funcNN... +Title: "*withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... +== Exception 4 (Module: "error domain: ") +Type: ": ...funcNN... +Title: "*errutil.leafError: ×: ×: ×: outerthree: ×\nvia *withstack.withStack" +:: + (runtime) goexit() +:: + (testing) tRunner() +:: + (github.com/cockroachdb/datadriven.Walk)...funcNN... +:: + (github.com/cockroachdb/datadriven) Walk() +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven)...funcNN... +:: + (github.com/cockroachdb/datadriven) RunTest() +:: + (github.com/cockroachdb/datadriven) runTestInternal() +:: + (github.com/cockroachdb/datadriven) runDirectiveOrSubTest() +:: + (github.com/cockroachdb/datadriven) runDirective() +:: + (github.com/cockroachdb/datadriven.runDirective)...funcNN... +:: + (github.com/cockroachdb/errors/fmttests.TestDatadriven.func2) 1() +:: + (github.com/cockroachdb/errors/fmttests.glob.)...funcNN... run pkgerr innerone innertwo diff --git a/report/report.go b/report/report.go index cba95b0..c76d65f 100644 --- a/report/report.go +++ b/report/report.go @@ -106,13 +106,13 @@ func BuildSentryReport(err error) (event *sentry.Event, extraDetails map[string] // First step is to collect the details. var stacks []*withstack.ReportableStackTrace var details []errbase.SafeDetailPayload - for c := err; c != nil; c = errbase.UnwrapOnce(c) { + visitAllMulti(err, func(c error) { st := withstack.GetReportableStackTrace(c) stacks = append(stacks, st) sd := errbase.GetSafeDetails(c) details = append(details, sd) - } + }) module := string(domains.GetDomain(err)) // firstDetailLine is the first detail string encountered. @@ -401,3 +401,13 @@ func reverseExceptionOrder(ex []sentry.Exception) { ex[i], ex[len(ex)-i-1] = ex[len(ex)-i-1], ex[i] } } + +func visitAllMulti(err error, f func(error)) { + f(err) + if e := errbase.UnwrapOnce(err); e != nil { + visitAllMulti(e, f) + } + for _, e := range errbase.UnwrapMulti(err) { + visitAllMulti(e, f) + } +}