Skip to content

Commit 3f2d810

Browse files
TomWrightTomWright
committedJul 14, 2022
Fix a tracing bug
1 parent 259fa9b commit 3f2d810

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed
 

‎repository.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type Repository struct {
2424

2525
func (repo Repository) QueryFn(ctx context.Context, queryFn func(*SelectQuery)) (*sql.Rows, error) {
2626
if repo.Tracer != nil {
27-
spanCtx, span := repo.Tracer().Start(ctx, "QueryFn")
27+
spanCtx, span := repo.Tracer.Start(ctx, "QueryFn")
2828
ctx = spanCtx
2929
defer span.End()
3030
}
@@ -36,7 +36,7 @@ func (repo Repository) QueryFn(ctx context.Context, queryFn func(*SelectQuery))
3636

3737
func (repo Repository) Query(ctx context.Context, query SelectQuery) (*sql.Rows, error) {
3838
if repo.Tracer != nil {
39-
spanCtx, span := repo.Tracer().Start(ctx, "Query")
39+
spanCtx, span := repo.Tracer.Start(ctx, "Query")
4040
ctx = spanCtx
4141
defer span.End()
4242
}
@@ -72,7 +72,7 @@ func (repo Repository) Query(ctx context.Context, query SelectQuery) (*sql.Rows,
7272

7373
func (repo Repository) QueryRowFn(ctx context.Context, queryFn func(*SelectQuery)) (*sql.Row, error) {
7474
if repo.Tracer != nil {
75-
spanCtx, span := repo.Tracer().Start(ctx, "QueryRowFn")
75+
spanCtx, span := repo.Tracer.Start(ctx, "QueryRowFn")
7676
ctx = spanCtx
7777
defer span.End()
7878
}
@@ -84,7 +84,7 @@ func (repo Repository) QueryRowFn(ctx context.Context, queryFn func(*SelectQuery
8484

8585
func (repo Repository) QueryRow(ctx context.Context, query SelectQuery) (*sql.Row, error) {
8686
if repo.Tracer != nil {
87-
spanCtx, span := repo.Tracer().Start(ctx, "QueryRow")
87+
spanCtx, span := repo.Tracer.Start(ctx, "QueryRow")
8888
ctx = spanCtx
8989
defer span.End()
9090
}
@@ -121,7 +121,7 @@ func (repo Repository) QueryRow(ctx context.Context, query SelectQuery) (*sql.Ro
121121

122122
func (repo Repository) UpdateFn(ctx context.Context, queryFn func(*UpdateQuery)) (sql.Result, error) {
123123
if repo.Tracer != nil {
124-
spanCtx, span := repo.Tracer().Start(ctx, "UpdateFn")
124+
spanCtx, span := repo.Tracer.Start(ctx, "UpdateFn")
125125
ctx = spanCtx
126126
defer span.End()
127127
}
@@ -133,7 +133,7 @@ func (repo Repository) UpdateFn(ctx context.Context, queryFn func(*UpdateQuery))
133133

134134
func (repo Repository) Update(ctx context.Context, query UpdateQuery) (sql.Result, error) {
135135
if repo.Tracer != nil {
136-
spanCtx, span := repo.Tracer().Start(ctx, "Update")
136+
spanCtx, span := repo.Tracer.Start(ctx, "Update")
137137
ctx = spanCtx
138138
defer span.End()
139139
}
@@ -151,7 +151,7 @@ func (repo Repository) Update(ctx context.Context, query UpdateQuery) (sql.Resul
151151

152152
func (repo Repository) DeleteFn(ctx context.Context, queryFn func(*DeleteQuery)) (sql.Result, error) {
153153
if repo.Tracer != nil {
154-
spanCtx, span := repo.Tracer().Start(ctx, "DeleteFn")
154+
spanCtx, span := repo.Tracer.Start(ctx, "DeleteFn")
155155
ctx = spanCtx
156156
defer span.End()
157157
}
@@ -163,7 +163,7 @@ func (repo Repository) DeleteFn(ctx context.Context, queryFn func(*DeleteQuery))
163163

164164
func (repo Repository) Delete(ctx context.Context, query DeleteQuery) (sql.Result, error) {
165165
if repo.Tracer != nil {
166-
spanCtx, span := repo.Tracer().Start(ctx, "Delete")
166+
spanCtx, span := repo.Tracer.Start(ctx, "Delete")
167167
ctx = spanCtx
168168
defer span.End()
169169
}
@@ -181,7 +181,7 @@ func (repo Repository) Delete(ctx context.Context, query DeleteQuery) (sql.Resul
181181

182182
func (repo Repository) InsertFn(ctx context.Context, queryFn func(*InsertQuery)) (sql.Result, error) {
183183
if repo.Tracer != nil {
184-
spanCtx, span := repo.Tracer().Start(ctx, "InsertFn")
184+
spanCtx, span := repo.Tracer.Start(ctx, "InsertFn")
185185
ctx = spanCtx
186186
defer span.End()
187187
}
@@ -193,7 +193,7 @@ func (repo Repository) InsertFn(ctx context.Context, queryFn func(*InsertQuery))
193193

194194
func (repo Repository) Insert(ctx context.Context, query InsertQuery) (sql.Result, error) {
195195
if repo.Tracer != nil {
196-
spanCtx, span := repo.Tracer().Start(ctx, "Insert")
196+
spanCtx, span := repo.Tracer.Start(ctx, "Insert")
197197
ctx = spanCtx
198198
defer span.End()
199199
}
@@ -244,7 +244,7 @@ func (repo Repository) Exec(ctx context.Context, query Query) (sql.Result, error
244244
var span trace.Span = nil
245245

246246
if repo.Tracer != nil {
247-
ctx, span = repo.Tracer().Start(ctx, "Exec")
247+
ctx, span = repo.Tracer.Start(ctx, "Exec")
248248
defer span.End()
249249
}
250250

‎typed_repository.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func (repo TypedRepository[T]) ScanRow(ctx context.Context, query Query, scanner
6363

6464
func (repo TypedRepository[T]) QueryRowFn(ctx context.Context, queryFn func(*TypedSelectQuery[T])) (*T, error) {
6565
if repo.Tracer != nil {
66-
spanCtx, span := repo.Tracer().Start(ctx, "QueryRowFn")
66+
spanCtx, span := repo.Tracer.Start(ctx, "QueryRowFn")
6767
ctx = spanCtx
6868
defer span.End()
6969
}
@@ -75,7 +75,7 @@ func (repo TypedRepository[T]) QueryRowFn(ctx context.Context, queryFn func(*Typ
7575

7676
func (repo TypedRepository[T]) QueryRow(ctx context.Context, query TypedSelectQuery[T]) (*T, error) {
7777
if repo.Tracer != nil {
78-
spanCtx, span := repo.Tracer().Start(ctx, "QueryRow")
78+
spanCtx, span := repo.Tracer.Start(ctx, "QueryRow")
7979
ctx = spanCtx
8080
defer span.End()
8181
}
@@ -97,7 +97,7 @@ func (repo TypedRepository[T]) QueryRow(ctx context.Context, query TypedSelectQu
9797

9898
func (repo TypedRepository[T]) UpdateFn(ctx context.Context, queryFn func(*TypedUpdateQuery[T])) (sql.Result, error) {
9999
if repo.Tracer != nil {
100-
spanCtx, span := repo.Tracer().Start(ctx, "UpdateFn")
100+
spanCtx, span := repo.Tracer.Start(ctx, "UpdateFn")
101101
ctx = spanCtx
102102
defer span.End()
103103
}
@@ -109,7 +109,7 @@ func (repo TypedRepository[T]) UpdateFn(ctx context.Context, queryFn func(*Typed
109109

110110
func (repo TypedRepository[T]) Update(ctx context.Context, query TypedUpdateQuery[T]) (sql.Result, error) {
111111
if repo.Tracer != nil {
112-
spanCtx, span := repo.Tracer().Start(ctx, "Update")
112+
spanCtx, span := repo.Tracer.Start(ctx, "Update")
113113
ctx = spanCtx
114114
defer span.End()
115115
}
@@ -127,7 +127,7 @@ func (repo TypedRepository[T]) Update(ctx context.Context, query TypedUpdateQuer
127127

128128
func (repo TypedRepository[T]) DeleteFn(ctx context.Context, queryFn func(*TypedDeleteQuery[T])) (sql.Result, error) {
129129
if repo.Tracer != nil {
130-
spanCtx, span := repo.Tracer().Start(ctx, "DeleteFn")
130+
spanCtx, span := repo.Tracer.Start(ctx, "DeleteFn")
131131
ctx = spanCtx
132132
defer span.End()
133133
}
@@ -139,7 +139,7 @@ func (repo TypedRepository[T]) DeleteFn(ctx context.Context, queryFn func(*Typed
139139

140140
func (repo TypedRepository[T]) Delete(ctx context.Context, query TypedDeleteQuery[T]) (sql.Result, error) {
141141
if repo.Tracer != nil {
142-
spanCtx, span := repo.Tracer().Start(ctx, "Delete")
142+
spanCtx, span := repo.Tracer.Start(ctx, "Delete")
143143
ctx = spanCtx
144144
defer span.End()
145145
}
@@ -157,7 +157,7 @@ func (repo TypedRepository[T]) Delete(ctx context.Context, query TypedDeleteQuer
157157

158158
func (repo TypedRepository[T]) InsertFn(ctx context.Context, queryFn func(*TypedInsertQuery[T])) (sql.Result, error) {
159159
if repo.Tracer != nil {
160-
spanCtx, span := repo.Tracer().Start(ctx, "InsertFn")
160+
spanCtx, span := repo.Tracer.Start(ctx, "InsertFn")
161161
ctx = spanCtx
162162
defer span.End()
163163
}
@@ -169,7 +169,7 @@ func (repo TypedRepository[T]) InsertFn(ctx context.Context, queryFn func(*Typed
169169

170170
func (repo TypedRepository[T]) Insert(ctx context.Context, query TypedInsertQuery[T]) (sql.Result, error) {
171171
if repo.Tracer != nil {
172-
spanCtx, span := repo.Tracer().Start(ctx, "Insert")
172+
spanCtx, span := repo.Tracer.Start(ctx, "Insert")
173173
ctx = spanCtx
174174
defer span.End()
175175
}
@@ -187,7 +187,7 @@ func (repo TypedRepository[T]) Insert(ctx context.Context, query TypedInsertQuer
187187

188188
func (repo TypedRepository[T]) QueryFn(ctx context.Context, queryFn func(*TypedSelectQuery[T])) ([]*T, error) {
189189
if repo.Tracer != nil {
190-
spanCtx, span := repo.Tracer().Start(ctx, "QueryFn")
190+
spanCtx, span := repo.Tracer.Start(ctx, "QueryFn")
191191
ctx = spanCtx
192192
defer span.End()
193193
}
@@ -199,7 +199,7 @@ func (repo TypedRepository[T]) QueryFn(ctx context.Context, queryFn func(*TypedS
199199

200200
func (repo TypedRepository[T]) Query(ctx context.Context, query TypedSelectQuery[T]) ([]*T, error) {
201201
if repo.Tracer != nil {
202-
spanCtx, span := repo.Tracer().Start(ctx, "Query")
202+
spanCtx, span := repo.Tracer.Start(ctx, "Query")
203203
ctx = spanCtx
204204
defer span.End()
205205
}

0 commit comments

Comments
 (0)
Please sign in to comment.