Merge pull request #1526 from ydb-platform/nil-compose

trace.{}.Compose now can be called on nil
ydb-platform · Oct 23, 2024 · 8e1c411 · 8e1c411
2 parents 9f8e82e + 7420bcf
commit 8e1c411
Showing 12 changed files with 38 additions and 0 deletions.
diff --git a/internal/cmd/gtrace/writer.go b/internal/cmd/gtrace/writer.go
@@ -337,6 +337,11 @@ func (w *Writer) compose(trace *Trace) {
 		w.code(`func (`, t, ` *`, trace.Name, `) Compose(`, x, ` *`, trace.Name, `, opts ...`+trace.Name+`ComposeOption) `)
 		w.line(`*`, trace.Name, ` {`)
 		w.block(func() {
+			w.line(`if `, t, ` == nil {`)
+			w.block(func() {
+				w.line(`return x`)
+			})
+			w.line(`}`)
 			w.line(`var `, ret, ` `, trace.Name, ``)
 			if len(trace.Hooks) > 0 {
 				w.line(`options := `, unexported(trace.Name), `ComposeOptions{}`)

diff --git a/trace/coordination_gtrace.go b/trace/coordination_gtrace.go
diff --git a/trace/discovery_gtrace.go b/trace/discovery_gtrace.go
diff --git a/trace/driver_gtrace.go b/trace/driver_gtrace.go
diff --git a/trace/query_gtrace.go b/trace/query_gtrace.go
diff --git a/trace/ratelimiter_gtrace.go b/trace/ratelimiter_gtrace.go
diff --git a/trace/retry_gtrace.go b/trace/retry_gtrace.go
diff --git a/trace/scheme_gtrace.go b/trace/scheme_gtrace.go
diff --git a/trace/scripting_gtrace.go b/trace/scripting_gtrace.go
diff --git a/trace/sql_gtrace.go b/trace/sql_gtrace.go
diff --git a/trace/table_gtrace.go b/trace/table_gtrace.go
diff --git a/trace/topic_gtrace.go b/trace/topic_gtrace.go