Skip to content

Commit

Permalink
Rebased
Browse files Browse the repository at this point in the history
Signed-off-by: Annanay <annanay.a@media.net>
  • Loading branch information
Annanay committed Mar 4, 2019
1 parent 15d2b20 commit 9d9aeb5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmd/agent/app/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,14 @@ func CreateCollectorProxy(
len(tchanRep.CollectorHostPorts) > 0 &&
len(grpcRepOpts.CollectorHostPort) == 0 {
logger.Warn("Using deprecated configuration", zap.String("option", "--collector-host.port"))
return tchannel.NewCollectorProxy(tchanRep, mFactory, logger)
return tchannel.NewCollectorProxy(tchanRep, opts.AgentTags, mFactory, logger)
}
switch opts.ReporterType {
case reporter.GRPC:
grpclog.SetLoggerV2(grpclog.NewLoggerV2(ioutil.Discard, os.Stderr, os.Stderr))
return grpc.NewCollectorProxy(grpcRepOpts, mFactory, logger)
return grpc.NewCollectorProxy(grpcRepOpts, opts.AgentTags, mFactory, logger)
case reporter.TCHANNEL:
return tchannel.NewCollectorProxy(tchanRep, mFactory, logger)
return tchannel.NewCollectorProxy(tchanRep, opts.AgentTags, mFactory, logger)
default:
return nil, errors.New(fmt.Sprintf("unknown reporter type %s", string(opts.ReporterType)))
}
Expand Down

0 comments on commit 9d9aeb5

Please sign in to comment.