Skip to content

Commit 56be32d

Browse files
bogdandrutubogdandrutu
authored
Remove obsreport.GRPCServerWithObservabilityEnabled, enable observability in config (#3315)
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
1 parent 4f4fa63 commit 56be32d

File tree

10 files changed

+17
-49
lines changed

10 files changed

+17
-49
lines changed

‎config/configgrpc/configgrpc.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"strings"
2121
"time"
2222

23+
"go.opencensus.io/plugin/ocgrpc"
2324
"google.golang.org/grpc"
2425
"google.golang.org/grpc/balancer/roundrobin"
2526
"google.golang.org/grpc/credentials"
@@ -307,6 +308,10 @@ func (gss *GRPCServerSettings) ToServerOption(ext map[config.ComponentID]compone
307308
)
308309
}
309310

311+
// Enable OpenCensus observability plugin.
312+
// TODO: Change to OpenTelemetry when collector is changed.
313+
opts = append(opts, grpc.StatsHandler(&ocgrpc.ServerHandler{}))
314+
310315
return opts, nil
311316
}
312317

‎config/configgrpc/configgrpc_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func TestDefaultGrpcServerSettings(t *testing.T) {
7676
gss := &GRPCServerSettings{}
7777
opts, err := gss.ToServerOption(map[config.ComponentID]component.Extension{})
7878
assert.NoError(t, err)
79-
assert.Len(t, opts, 0)
79+
assert.Len(t, opts, 1)
8080
}
8181

8282
func TestAllGrpcServerSettingsExceptAuth(t *testing.T) {
@@ -109,7 +109,7 @@ func TestAllGrpcServerSettingsExceptAuth(t *testing.T) {
109109
}
110110
opts, err := gss.ToServerOption(map[config.ComponentID]component.Extension{})
111111
assert.NoError(t, err)
112-
assert.Len(t, opts, 7)
112+
assert.Len(t, opts, 8)
113113
}
114114

115115
func TestGrpcServerAuthSettings(t *testing.T) {

‎exporter/otlpexporter/otlp_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"go.opentelemetry.io/collector/consumer/pdata"
3636
"go.opentelemetry.io/collector/internal/pdatagrpc"
3737
"go.opentelemetry.io/collector/internal/testdata"
38-
"go.opentelemetry.io/collector/obsreport"
3938
)
4039

4140
type mockReceiver struct {
@@ -76,7 +75,7 @@ func (r *mockTracesReceiver) GetLastRequest() pdata.Traces {
7675
func otlpTracesReceiverOnGRPCServer(ln net.Listener) *mockTracesReceiver {
7776
rcv := &mockTracesReceiver{
7877
mockReceiver: mockReceiver{
79-
srv: obsreport.GRPCServerWithObservabilityEnabled(),
78+
srv: grpc.NewServer(),
8079
},
8180
}
8281

@@ -113,7 +112,7 @@ func (r *mockLogsReceiver) GetLastRequest() pdata.Logs {
113112
func otlpLogsReceiverOnGRPCServer(ln net.Listener) *mockLogsReceiver {
114113
rcv := &mockLogsReceiver{
115114
mockReceiver: mockReceiver{
116-
srv: obsreport.GRPCServerWithObservabilityEnabled(),
115+
srv: grpc.NewServer(),
117116
},
118117
}
119118

@@ -151,7 +150,7 @@ func (r *mockMetricsReceiver) GetLastRequest() pdata.Metrics {
151150
func otlpMetricsReceiverOnGRPCServer(ln net.Listener) *mockMetricsReceiver {
152151
rcv := &mockMetricsReceiver{
153152
mockReceiver: mockReceiver{
154-
srv: obsreport.GRPCServerWithObservabilityEnabled(),
153+
srv: grpc.NewServer(),
155154
},
156155
}
157156

‎obsreport/observability.go‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎receiver/opencensusreceiver/ocmetrics/opencensus_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import (
4343
"go.opentelemetry.io/collector/consumer/consumertest"
4444
"go.opentelemetry.io/collector/exporter/opencensusexporter"
4545
"go.opentelemetry.io/collector/internal/testdata"
46-
"go.opentelemetry.io/collector/obsreport"
4746
"go.opentelemetry.io/collector/translator/internaldata"
4847
)
4948

@@ -365,7 +364,7 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Metrics) (net.Addr, func()
365364
require.NoError(t, err, "Failed to create the Receiver: %v", err)
366365

367366
// Now run it as a gRPC server
368-
srv := obsreport.GRPCServerWithObservabilityEnabled()
367+
srv := grpc.NewServer()
369368
agentmetricspb.RegisterMetricsServiceServer(srv, oci)
370369
go func() {
371370
_ = srv.Serve(ln)

‎receiver/opencensusreceiver/octrace/opencensus_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
3030
"github.com/stretchr/testify/assert"
3131
"github.com/stretchr/testify/require"
32+
"go.opencensus.io/plugin/ocgrpc"
3233
"go.uber.org/zap"
3334
"google.golang.org/grpc"
3435
"google.golang.org/protobuf/proto"
@@ -40,7 +41,6 @@ import (
4041
"go.opentelemetry.io/collector/consumer/consumertest"
4142
"go.opentelemetry.io/collector/exporter/opencensusexporter"
4243
"go.opentelemetry.io/collector/internal/testdata"
43-
"go.opentelemetry.io/collector/obsreport"
4444
"go.opentelemetry.io/collector/translator/internaldata"
4545
)
4646

@@ -378,7 +378,7 @@ func ocReceiverOnGRPCServer(t *testing.T, sr consumer.Traces) (net.Addr, func())
378378
require.NoError(t, err, "Failed to create the Receiver: %v", err)
379379

380380
// Now run it as a gRPC server
381-
srv := obsreport.GRPCServerWithObservabilityEnabled()
381+
srv := grpc.NewServer(grpc.StatsHandler(&ocgrpc.ServerHandler{}))
382382
agenttracepb.RegisterTraceServiceServer(srv, oci)
383383
go func() {
384384
_ = srv.Serve(ln)

‎receiver/opencensusreceiver/opencensus.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"go.opentelemetry.io/collector/config"
3434
"go.opentelemetry.io/collector/config/configgrpc"
3535
"go.opentelemetry.io/collector/consumer"
36-
"go.opentelemetry.io/collector/obsreport"
3736
"go.opentelemetry.io/collector/receiver/opencensusreceiver/ocmetrics"
3837
"go.opentelemetry.io/collector/receiver/opencensusreceiver/octrace"
3938
)
@@ -177,7 +176,7 @@ func (ocr *ocReceiver) grpcServer(host component.Host) (*grpc.Server, error) {
177176
if err != nil {
178177
return nil, err
179178
}
180-
ocr.serverGRPC = obsreport.GRPCServerWithObservabilityEnabled(opts...)
179+
ocr.serverGRPC = grpc.NewServer(opts...)
181180
}
182181

183182
return ocr.serverGRPC, nil

‎receiver/otlpreceiver/logs/otlp_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
collectorlog "go.opentelemetry.io/collector/internal/data/protogen/collector/logs/v1"
3131
"go.opentelemetry.io/collector/internal/pdatagrpc"
3232
"go.opentelemetry.io/collector/internal/testdata"
33-
"go.opentelemetry.io/collector/obsreport"
3433
)
3534

3635
func TestExport(t *testing.T) {
@@ -116,7 +115,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, tc consumer.Logs) (net.Addr, func())
116115
require.NoError(t, err)
117116

118117
// Now run it as a gRPC server
119-
srv := obsreport.GRPCServerWithObservabilityEnabled()
118+
srv := grpc.NewServer()
120119
collectorlog.RegisterLogsServiceServer(srv, r)
121120
go func() {
122121
_ = srv.Serve(ln)

‎receiver/otlpreceiver/metrics/otlp_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
collectormetrics "go.opentelemetry.io/collector/internal/data/protogen/collector/metrics/v1"
3131
"go.opentelemetry.io/collector/internal/pdatagrpc"
3232
"go.opentelemetry.io/collector/internal/testdata"
33-
"go.opentelemetry.io/collector/obsreport"
3433
)
3534

3635
func TestExport(t *testing.T) {
@@ -123,7 +122,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, mc consumer.Metrics) (net.Addr, func
123122

124123
r := New(receiverID, mc)
125124
// Now run it as a gRPC server
126-
srv := obsreport.GRPCServerWithObservabilityEnabled()
125+
srv := grpc.NewServer()
127126
collectormetrics.RegisterMetricsServiceServer(srv, r)
128127
go func() {
129128
_ = srv.Serve(ln)

‎receiver/otlpreceiver/trace/otlp_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
collectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1"
3131
"go.opentelemetry.io/collector/internal/pdatagrpc"
3232
"go.opentelemetry.io/collector/internal/testdata"
33-
"go.opentelemetry.io/collector/obsreport"
3433
)
3534

3635
func TestExport(t *testing.T) {
@@ -118,7 +117,7 @@ func otlpReceiverOnGRPCServer(t *testing.T, tc consumer.Traces) (net.Addr, func(
118117
require.NoError(t, err)
119118

120119
// Now run it as a gRPC server
121-
srv := obsreport.GRPCServerWithObservabilityEnabled()
120+
srv := grpc.NewServer()
122121
collectortrace.RegisterTraceServiceServer(srv, r)
123122
go func() {
124123
_ = srv.Serve(ln)

0 commit comments

Comments
 (0)