Skip to content

Commit 7420bcf

Browse files
committed
trace.{}.Compose now can be called on nil
1 parent 9be2f13 commit 7420bcf

File tree

12 files changed

+38
-0
lines changed

12 files changed

+38
-0
lines changed

internal/cmd/gtrace/writer.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,11 @@ func (w *Writer) compose(trace *Trace) {
337337
w.code(`func (`, t, ` *`, trace.Name, `) Compose(`, x, ` *`, trace.Name, `, opts ...`+trace.Name+`ComposeOption) `)
338338
w.line(`*`, trace.Name, ` {`)
339339
w.block(func() {
340+
w.line(`if `, t, ` == nil {`)
341+
w.block(func() {
342+
w.line(`return x`)
343+
})
344+
w.line(`}`)
340345
w.line(`var `, ret, ` `, trace.Name, ``)
341346
if len(trace.Hooks) > 0 {
342347
w.line(`options := `, unexported(trace.Name), `ComposeOptions{}`)

trace/coordination_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/discovery_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/driver_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/query_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/ratelimiter_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/retry_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/scheme_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/scripting_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

trace/sql_gtrace.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)