diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2020-08-13 00:14:53 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2020-08-13 00:14:53 +0300 |
| commit | b99503ecad99b68282517015ab0f2e91378ddd88 (patch) | |
| tree | cd3809dc22e294a39781cf5bd167bdadfe0e5490 | |
| parent | a5645e4aeeabf911c1c0c0c324b1f4d67342e3e1 (diff) | |
| parent | 76d0d3070330b3f13b4fd4ab48964efde471bf5a (diff) | |
Merge branch 'pks-fix-hook-tx-voting-metric' into 'master'
Fix transaction voting delay metric for pre-receive hook
See merge request gitlab-org/gitaly!2458
| -rw-r--r-- | changelogs/unreleased/pks-fix-hook-tx-voting-metric.yml | 5 | ||||
| -rw-r--r-- | internal/service/hook/pre_receive.go | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changelogs/unreleased/pks-fix-hook-tx-voting-metric.yml b/changelogs/unreleased/pks-fix-hook-tx-voting-metric.yml new file mode 100644 index 000000000..84d2a142d --- /dev/null +++ b/changelogs/unreleased/pks-fix-hook-tx-voting-metric.yml @@ -0,0 +1,5 @@ +--- +title: Fix transaction voting delay metric for pre-receive hook +merge_request: 2458 +author: +type: fixed diff --git a/internal/service/hook/pre_receive.go b/internal/service/hook/pre_receive.go index 06d7ecd98..fcfc3d630 100644 --- a/internal/service/hook/pre_receive.go +++ b/internal/service/hook/pre_receive.go @@ -67,8 +67,6 @@ func (s *server) getPraefectConn(ctx context.Context, server *metadata.PraefectS } func (s *server) voteOnTransaction(ctx context.Context, hash []byte, env []string) error { - defer prometheus.NewTimer(s.votingDelayMetric).ObserveDuration() - tx, err := metadata.TransactionFromEnv(env) if err != nil { if errors.Is(err, metadata.ErrTransactionNotFound) { @@ -95,6 +93,7 @@ func (s *server) voteOnTransaction(ctx context.Context, hash []byte, env []strin praefectClient := gitalypb.NewRefTransactionClient(praefectConn) + defer prometheus.NewTimer(s.votingDelayMetric).ObserveDuration() response, err := praefectClient.VoteTransaction(ctx, &gitalypb.VoteTransactionRequest{ TransactionId: tx.ID, Node: tx.Node, |