Skip to content

Commit b0ee94f

Browse files
mahadzaryab1mahadzaryab1
committed
Add component.Host To telemetry.Setting
Signed-off-by: Mahad Zaryab <[email protected]>
1 parent 8b4b4ca commit b0ee94f

File tree

7 files changed

+18
-21
lines changed

7 files changed

+18
-21
lines changed

‎cmd/all-in-one/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"github.com/spf13/cobra"
1515
"github.com/spf13/viper"
16-
"go.opentelemetry.io/collector/component/componenttest"
1716
_ "go.uber.org/automaxprocs"
1817
"go.uber.org/zap"
1918

@@ -276,7 +275,7 @@ func startQuery(
276275
qs := querysvc.NewQueryService(spanReader, depReader, *queryOpts)
277276

278277
// TODO: replace componenttest.NewNopHost() with solution from https://github.com/jaegertracing/jaeger/issues/6049
279-
server, err := queryApp.NewServer(context.Background(), componenttest.NewNopHost(), qs, metricsQueryService, qOpts, tm, telset)
278+
server, err := queryApp.NewServer(context.Background(), qs, metricsQueryService, qOpts, tm, telset)
280279
if err != nil {
281280
svc.Logger.Fatal("Could not create jaeger-query", zap.Error(err))
282281
}

‎cmd/jaeger/internal/extension/jaegerquery/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ func (s *server) Start(ctx context.Context, host component.Host) error {
100100
ReportStatus: func(event *componentstatus.Event) {
101101
componentstatus.ReportStatus(host, event)
102102
},
103+
Host: host,
103104
}
104105

105106
s.server, err = queryApp.NewServer(
106107
ctx,
107-
host,
108108
// TODO propagate healthcheck updates up to the collector's runtime
109109
qs,
110110
mqs,

‎cmd/query/app/server.go

-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"github.com/gorilla/handlers"
1818
"github.com/gorilla/mux"
1919
"github.com/soheilhy/cmux"
20-
"go.opentelemetry.io/collector/component"
2120
"go.opentelemetry.io/collector/component/componentstatus"
2221
"go.uber.org/zap"
2322
"go.uber.org/zap/zapcore"
@@ -58,7 +57,6 @@ type Server struct {
5857
// NewServer creates and initializes Server
5958
func NewServer(
6059
ctx context.Context,
61-
_ component.Host,
6260
querySvc *querysvc.QueryService,
6361
metricsQuerySvc querysvc.MetricsQueryService,
6462
options *QueryOptions,

‎cmd/query/app/server_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func initTelSet(logger *zap.Logger, tracerProvider *jtracer.JTracer, hc *healthc
4848
Logger: logger,
4949
TracerProvider: tracerProvider.OTEL,
5050
ReportStatus: telemetery.HCAdapter(hc),
51+
Host: componenttest.NewNopHost(),
5152
}
5253
}
5354

@@ -70,7 +71,7 @@ func TestCreateTLSServerSinglePortError(t *testing.T) {
7071
},
7172
}
7273
telset := initTelSet(zaptest.NewLogger(t), jtracer.NoOp(), healthcheck.New())
73-
_, err := NewServer(context.Background(), componenttest.NewNopHost(), &querysvc.QueryService{}, nil,
74+
_, err := NewServer(context.Background(), &querysvc.QueryService{}, nil,
7475
&QueryOptions{
7576
HTTP: confighttp.ServerConfig{Endpoint: ":8080", TLSSetting: &tlsCfg},
7677
GRPC: configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{Endpoint: ":8080"}, TLSSetting: &tlsCfg},
@@ -88,7 +89,7 @@ func TestCreateTLSGrpcServerError(t *testing.T) {
8889
},
8990
}
9091
telset := initTelSet(zaptest.NewLogger(t), jtracer.NoOp(), healthcheck.New())
91-
_, err := NewServer(context.Background(), componenttest.NewNopHost(), &querysvc.QueryService{}, nil,
92+
_, err := NewServer(context.Background(), &querysvc.QueryService{}, nil,
9293
&QueryOptions{
9394
HTTP: confighttp.ServerConfig{Endpoint: ":8080"},
9495
GRPC: configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{Endpoint: ":8081"}, TLSSetting: &tlsCfg},
@@ -106,7 +107,7 @@ func TestCreateTLSHttpServerError(t *testing.T) {
106107
},
107108
}
108109
telset := initTelSet(zaptest.NewLogger(t), jtracer.NoOp(), healthcheck.New())
109-
_, err := NewServer(context.Background(), componenttest.NewNopHost(), &querysvc.QueryService{}, nil,
110+
_, err := NewServer(context.Background(), &querysvc.QueryService{}, nil,
110111
&QueryOptions{
111112
HTTP: confighttp.ServerConfig{Endpoint: ":8080", TLSSetting: &tlsCfg},
112113
GRPC: configgrpc.ServerConfig{NetAddr: confignet.AddrConfig{Endpoint: ":8081"}},
@@ -390,7 +391,7 @@ func TestServerHTTPTLS(t *testing.T) {
390391
flagsSvc.Logger = zaptest.NewLogger(t)
391392
telset := initTelSet(flagsSvc.Logger, jtracer.NoOp(), flagsSvc.HC())
392393
querySvc := makeQuerySvc()
393-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc.qs,
394+
server, err := NewServer(context.Background(), querySvc.qs,
394395
nil, serverOptions, tenancy.NewManager(&tenancy.Options{}),
395396
telset)
396397
require.NoError(t, err)
@@ -528,7 +529,7 @@ func TestServerGRPCTLS(t *testing.T) {
528529

529530
querySvc := makeQuerySvc()
530531
telset := initTelSet(flagsSvc.Logger, jtracer.NoOp(), flagsSvc.HC())
531-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc.qs,
532+
server, err := NewServer(context.Background(), querySvc.qs,
532533
nil, serverOptions, tenancy.NewManager(&tenancy.Options{}),
533534
telset)
534535
require.NoError(t, err)
@@ -570,7 +571,7 @@ func TestServerGRPCTLS(t *testing.T) {
570571

571572
func TestServerBadHostPort(t *testing.T) {
572573
telset := initTelSet(zaptest.NewLogger(t), jtracer.NoOp(), healthcheck.New())
573-
_, err := NewServer(context.Background(), componenttest.NewNopHost(), &querysvc.QueryService{}, nil,
574+
_, err := NewServer(context.Background(), &querysvc.QueryService{}, nil,
574575
&QueryOptions{
575576
BearerTokenPropagation: true,
576577
HTTP: confighttp.ServerConfig{
@@ -586,7 +587,7 @@ func TestServerBadHostPort(t *testing.T) {
586587
telset)
587588
require.Error(t, err)
588589

589-
_, err = NewServer(context.Background(), componenttest.NewNopHost(), &querysvc.QueryService{}, nil,
590+
_, err = NewServer(context.Background(), &querysvc.QueryService{}, nil,
590591
&QueryOptions{
591592
BearerTokenPropagation: true,
592593
HTTP: confighttp.ServerConfig{
@@ -622,7 +623,6 @@ func TestServerInUseHostPort(t *testing.T) {
622623
t.Run(tc.name, func(t *testing.T) {
623624
server, err := NewServer(
624625
context.Background(),
625-
componenttest.NewNopHost(),
626626
&querysvc.QueryService{},
627627
nil,
628628
&QueryOptions{
@@ -652,7 +652,7 @@ func TestServerSinglePort(t *testing.T) {
652652
hostPort := ports.PortToHostPort(ports.QueryHTTP)
653653
querySvc := makeQuerySvc()
654654
telset := initTelSet(flagsSvc.Logger, jtracer.NoOp(), flagsSvc.HC())
655-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc.qs, nil,
655+
server, err := NewServer(context.Background(), querySvc.qs, nil,
656656
&QueryOptions{
657657
BearerTokenPropagation: true,
658658
HTTP: confighttp.ServerConfig{
@@ -697,7 +697,7 @@ func TestServerGracefulExit(t *testing.T) {
697697

698698
querySvc := makeQuerySvc()
699699
telset := initTelSet(flagsSvc.Logger, jtracer.NoOp(), flagsSvc.HC())
700-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc.qs, nil,
700+
server, err := NewServer(context.Background(), querySvc.qs, nil,
701701
&QueryOptions{
702702
HTTP: confighttp.ServerConfig{
703703
Endpoint: hostPort,
@@ -739,7 +739,7 @@ func TestServerHandlesPortZero(t *testing.T) {
739739

740740
querySvc := &querysvc.QueryService{}
741741
telset := initTelSet(flagsSvc.Logger, jtracer.NoOp(), flagsSvc.HC())
742-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc, nil,
742+
server, err := NewServer(context.Background(), querySvc, nil,
743743
&QueryOptions{
744744
HTTP: confighttp.ServerConfig{
745745
Endpoint: ":0",
@@ -805,7 +805,7 @@ func TestServerHTTPTenancy(t *testing.T) {
805805
querySvc := makeQuerySvc()
806806
querySvc.spanReader.On("FindTraces", mock.Anything, mock.Anything).Return([]*model.Trace{mockTrace}, nil).Once()
807807
telset := initTelSet(zaptest.NewLogger(t), jtracer.NoOp(), healthcheck.New())
808-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc.qs,
808+
server, err := NewServer(context.Background(), querySvc.qs,
809809
nil, serverOptions, tenancyMgr, telset)
810810
require.NoError(t, err)
811811
require.NoError(t, server.Start())

‎cmd/query/app/token_propagation_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/olivere/elastic"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
17-
"go.opentelemetry.io/collector/component/componenttest"
1817
"go.opentelemetry.io/collector/config/configgrpc"
1918
"go.opentelemetry.io/collector/config/confighttp"
2019
"go.opentelemetry.io/collector/config/confignet"
@@ -91,7 +90,7 @@ func runQueryService(t *testing.T, esURL string) *Server {
9190
TracerProvider: jtracer.NoOp().OTEL,
9291
ReportStatus: telemetery.HCAdapter(flagsSvc.HC()),
9392
}
94-
server, err := NewServer(context.Background(), componenttest.NewNopHost(), querySvc, nil,
93+
server, err := NewServer(context.Background(), querySvc, nil,
9594
&QueryOptions{
9695
BearerTokenPropagation: true,
9796
HTTP: confighttp.ServerConfig{

‎cmd/query/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212

1313
"github.com/spf13/cobra"
1414
"github.com/spf13/viper"
15-
"go.opentelemetry.io/collector/component/componenttest"
1615
_ "go.uber.org/automaxprocs"
1716
"go.uber.org/zap"
1817

@@ -110,7 +109,7 @@ func main() {
110109
ReportStatus: telemetery.HCAdapter(svc.HC()),
111110
}
112111
// TODO: replace componenttest.NewNopHost() with solution from https://github.com/jaegertracing/jaeger/issues/6049
113-
server, err := app.NewServer(context.Background(), componenttest.NewNopHost(), queryService, metricsQueryService, queryOpts, tm, telset)
112+
server, err := app.NewServer(context.Background(), queryService, metricsQueryService, queryOpts, tm, telset)
114113
if err != nil {
115114
logger.Fatal("Failed to create server", zap.Error(err))
116115
}

‎pkg/telemetery/settings.go

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package telemetery
55

66
import (
7+
"go.opentelemetry.io/collector/component"
78
"go.opentelemetry.io/collector/component/componentstatus"
89
"go.opentelemetry.io/otel/trace"
910
"go.uber.org/zap"
@@ -17,6 +18,7 @@ type Setting struct {
1718
TracerProvider trace.TracerProvider
1819
Metrics metrics.Factory
1920
ReportStatus func(*componentstatus.Event)
21+
Host component.Host
2022
}
2123

2224
func HCAdapter(hc *healthcheck.HealthCheck) func(*componentstatus.Event) {

0 commit comments

Comments
 (0)