Skip to content

Commit 09054dd

Browse files
authored
Merge pull request #1297 from ripienaar/dependencies
Update dependencies
2 parents 9dcb638 + 0562d7f commit 09054dd

File tree

4 files changed

+11
-19
lines changed

4 files changed

+11
-19
lines changed

cli/server_check_command.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2020-2024 The NATS Authors
1+
// Copyright 2020-2025 The NATS Authors
22
// Licensed under the Apache License, Version 2.0 (the "License");
33
// you may not use this file except in compliance with the License.
44
// You may obtain a copy of the License at
@@ -277,8 +277,8 @@ func (c *SrvCheckCmd) checkRequest(_ *fisk.ParseContext) error {
277277
Payload: c.msgPayload,
278278
Header: c.msgHeaders,
279279
HeaderMatch: c.msgHeadersMatch,
280-
ResponseTimeWarn: c.msgWarn,
281-
ResponseTimeCritical: c.msgCrit,
280+
ResponseTimeWarn: c.msgWarn.Seconds(),
281+
ResponseTimeCritical: c.msgCrit.Seconds(),
282282
}
283283

284284
if c.msgRegexp != nil {

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/jedib0t/go-pretty/v6 v6.6.7
1919
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
2020
github.com/klauspost/compress v1.18.0
21-
github.com/nats-io/jsm.go v0.1.1-0.20250312143852-190ebef49af4
21+
github.com/nats-io/jsm.go v0.1.1-0.20250312171239-80f5a9291c7a
2222
github.com/nats-io/jwt/v2 v2.7.3
2323
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250311175153-3750f9ccfbae
2424
github.com/nats-io/nats.go v1.39.1

go.sum

+2-10
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,10 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
105105
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
106106
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
107107
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
108-
github.com/nats-io/jsm.go v0.1.1-0.20250220111643-ccd9863e0621 h1:0nZJ+iH8JZIxjRsxVon+vfXfL6fDJXYyE+u+PH2X4fE=
109-
github.com/nats-io/jsm.go v0.1.1-0.20250220111643-ccd9863e0621/go.mod h1:+y0n/fl9uLK9wCCfVVAt4oiRlq75Gj4UMGwekoiiVG8=
110-
github.com/nats-io/jsm.go v0.1.1-0.20250312133232-857709c8b3ae h1:ixpLLK1J6HM31yH55IbEFPLxWVk5xpNaCc/R16qjsE0=
111-
github.com/nats-io/jsm.go v0.1.1-0.20250312133232-857709c8b3ae/go.mod h1:mTNqjG+sD0xON3vEzK2KY/YQ3y3jTWVvqgC6Ess9NEk=
112-
github.com/nats-io/jsm.go v0.1.1-0.20250312143852-190ebef49af4 h1:hcLpVlLts4NJ+5omXsnfEtW9FrbubwXwEzGnVVUHmhA=
113-
github.com/nats-io/jsm.go v0.1.1-0.20250312143852-190ebef49af4/go.mod h1:mTNqjG+sD0xON3vEzK2KY/YQ3y3jTWVvqgC6Ess9NEk=
108+
github.com/nats-io/jsm.go v0.1.1-0.20250312171239-80f5a9291c7a h1:oUC3GVfjG6LSZ+m4TVzgBG7BdPEHy6mQgsPXyEjwiKE=
109+
github.com/nats-io/jsm.go v0.1.1-0.20250312171239-80f5a9291c7a/go.mod h1:mTNqjG+sD0xON3vEzK2KY/YQ3y3jTWVvqgC6Ess9NEk=
114110
github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE=
115111
github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4=
116-
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220020605-cad5114b5064 h1:4ylzrue/HOkfgV+ImULDLj7Q6EXlmdeGYQcqwcMjOoU=
117-
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250220020605-cad5114b5064/go.mod h1:rx54jecOLXzMFsVMhsVcUX74wDWWAbU98zqj6gIkvOY=
118112
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250311175153-3750f9ccfbae h1:cBybnu7m0gkoSobIcNCHos7ESsVdI9dp5VzPHZ17g7U=
119113
github.com/nats-io/nats-server/v2 v2.11.0-dev.0.20250311175153-3750f9ccfbae/go.mod h1:leXySghbdtXSUmWem8K9McnJ6xbJOb0t9+NQ5HTRZjI=
120114
github.com/nats-io/nats.go v1.39.1 h1:oTkfKBmz7W047vRxV762M67ZdXeOtUgvbBaNoQ+3PPk=
@@ -158,8 +152,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
158152
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
159153
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
160154
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
161-
github.com/synadia-io/jwt-auth-builder.go v0.0.6 h1:F3bTGWlKzWHwRqtTt35fRmhrxXLgkI8qz8QvvzxKSko=
162-
github.com/synadia-io/jwt-auth-builder.go v0.0.6/go.mod h1:8WYR7+nLQcDMBpocuPgdFJ5/2UOr+HPll3qv+KNdGvs=
163155
github.com/synadia-io/jwt-auth-builder.go v0.0.7-0.20250307212657-0e3f1ee00864 h1:itO+DjIffRn+nN3jHxHNcCiJIsL1BMZF7p3wYeTN7xs=
164156
github.com/synadia-io/jwt-auth-builder.go v0.0.7-0.20250307212657-0e3f1ee00864/go.mod h1:8WYR7+nLQcDMBpocuPgdFJ5/2UOr+HPll3qv+KNdGvs=
165157
github.com/tylertreat/hdrhistogram-writer v0.0.0-20210816161836-2e440612a39f h1:SGznmvCovewbaSgBsHgdThtWsLj5aCLX/3ZXMLd1UD0=

internal/exporter/exporter.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ import (
3131
)
3232

3333
type Check struct {
34-
Name string `yaml:"name"`
35-
Kind string `yaml:"kind"`
36-
Context string `yaml:"context"`
37-
Properties json.RawMessage `yaml:"properties"`
38-
ReuseConn bool `yaml:"reuse_connection"`
34+
Name string `json:"name" yaml:"name"`
35+
Kind string `json:"kind" yaml:"kind"`
36+
Context string `json:"context" yaml:"context"`
37+
ReuseConn bool `json:"reuse_connection" yaml:"reuse_connection"`
38+
Properties json.RawMessage `json:"properties" yaml:"properties"`
3939
nc *nats.Conn
4040
mu sync.Mutex
4141
}

0 commit comments

Comments
 (0)