@@ -18,10 +18,8 @@ package app
18
18
import (
19
19
"context"
20
20
"errors"
21
- "expvar"
22
21
"flag"
23
22
"fmt"
24
- "strconv"
25
23
"strings"
26
24
"testing"
27
25
"time"
@@ -31,6 +29,7 @@ import (
31
29
"github.com/stretchr/testify/assert"
32
30
"github.com/stretchr/testify/require"
33
31
"github.com/uber/jaeger-lib/metrics"
32
+ "github.com/uber/jaeger-lib/metrics/fork"
34
33
"github.com/uber/jaeger-lib/metrics/metricstest"
35
34
"go.uber.org/zap"
36
35
yaml "gopkg.in/yaml.v2"
@@ -282,13 +281,12 @@ func TestCreateCollectorProxy_UnknownReporter(t *testing.T) {
282
281
283
282
func TestSetExpvarOptions (t * testing.T ) {
284
283
v := viper .New ()
285
- b := & Builder {}
284
+ cfg := & Builder {}
286
285
command := cobra.Command {}
287
286
flags := & flag.FlagSet {}
288
287
AddFlags (flags )
289
288
command .PersistentFlags ().AddGoFlagSet (flags )
290
289
v .BindPFlags (command .PersistentFlags ())
291
-
292
290
err := command .ParseFlags ([]string {
293
291
"--http-server.host-port=:8080" ,
294
292
"--processor.jaeger-binary.server-host-port=:1111" ,
@@ -297,20 +295,25 @@ func TestSetExpvarOptions(t *testing.T) {
297
295
"--processor.jaeger-binary.workers=42" ,
298
296
})
299
297
require .NoError (t , err )
298
+ cfg .InitFromViper (v )
300
299
301
- b .InitFromViper (v )
302
- b .setExpvarOptions ()
303
-
304
- gotMaxPacketSize , err := strconv .Atoi (expvar .Get ("processor.jaeger-binary.server-max-packet-size" ).String ())
305
- assert .NoError (t , err )
306
-
307
- gotQueueSize , err := strconv .Atoi (expvar .Get ("processor.jaeger-binary.server-queue-size" ).String ())
308
- assert .NoError (t , err )
309
-
310
- gotWorkers , err := strconv .Atoi (expvar .Get ("processor.jaeger-binary.workers" ).String ())
300
+ baseMetrics := metricstest .NewFactory (time .Second )
301
+ forkFactory := metricstest .NewFactory (time .Second )
302
+ metricsFactory := fork .New ("internal" , forkFactory , baseMetrics )
303
+ agent , err := cfg .CreateAgent (fakeCollectorProxy {}, zap .NewNop (), metricsFactory )
311
304
assert .NoError (t , err )
305
+ assert .NotNil (t , agent )
312
306
313
- assert .Equal (t , 4242 , gotMaxPacketSize )
314
- assert .Equal (t , 24 , gotQueueSize )
315
- assert .Equal (t , 42 , gotWorkers )
307
+ forkFactory .AssertGaugeMetrics (t , metricstest.ExpectedMetric {
308
+ Name : "internal.processor.jaeger-binary.server-max-packet-size" ,
309
+ Value : 4242 ,
310
+ })
311
+ forkFactory .AssertGaugeMetrics (t , metricstest.ExpectedMetric {
312
+ Name : "internal.processor.jaeger-binary.server-queue-size" ,
313
+ Value : 24 ,
314
+ })
315
+ forkFactory .AssertGaugeMetrics (t , metricstest.ExpectedMetric {
316
+ Name : "internal.processor.jaeger-binary.workers" ,
317
+ Value : 42 ,
318
+ })
316
319
}
0 commit comments