Skip to content

Commit 9138e1f

Browse files
committed
Restructure protobuf and grpc files and packages
1 parent 7f50ade commit 9138e1f

34 files changed

+1788
-1799
lines changed

grpc/client/client.go

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import (
55

66
"google.golang.org/grpc"
77

8-
pb "github.com/cluttrdev/gitlab-exporter/grpc/exporterpb"
8+
"github.com/cluttrdev/gitlab-exporter/protobuf/servicepb"
9+
"github.com/cluttrdev/gitlab-exporter/protobuf/typespb"
910
)
1011

1112
type EndpointConfig struct {
@@ -15,7 +16,7 @@ type EndpointConfig struct {
1516

1617
type Client struct {
1718
conn grpc.ClientConnInterface
18-
client pb.GitLabExporterClient
19+
client servicepb.GitLabExporterClient
1920
}
2021

2122
func NewCLient(cfg EndpointConfig) (*Client, error) {
@@ -24,7 +25,7 @@ func NewCLient(cfg EndpointConfig) (*Client, error) {
2425
return nil, err
2526
}
2627

27-
client := pb.NewGitLabExporterClient(conn)
28+
client := servicepb.NewGitLabExporterClient(conn)
2829

2930
return &Client{
3031
conn: conn,
@@ -43,90 +44,90 @@ func send[T any](stream grpc.ClientStream, data []*T) error {
4344
return err
4445
}
4546

46-
m := new(pb.RecordSummary)
47+
m := new(servicepb.RecordSummary)
4748
if err := stream.RecvMsg(m); err != nil {
4849
return err
4950
}
5051
return nil
5152
}
5253

53-
func RecordPipelines(c *Client, ctx context.Context, data []*pb.Pipeline) error {
54+
func RecordPipelines(c *Client, ctx context.Context, data []*typespb.Pipeline) error {
5455
stream, err := c.client.RecordPipelines(ctx)
5556
if err != nil {
5657
return err
5758
}
5859

59-
return send[pb.Pipeline](stream, data)
60+
return send[typespb.Pipeline](stream, data)
6061
}
6162

62-
func RecordJobs(c *Client, ctx context.Context, data []*pb.Job) error {
63+
func RecordJobs(c *Client, ctx context.Context, data []*typespb.Job) error {
6364
stream, err := c.client.RecordJobs(ctx)
6465
if err != nil {
6566
return err
6667
}
6768

68-
return send[pb.Job](stream, data)
69+
return send[typespb.Job](stream, data)
6970
}
7071

71-
func RecordSections(c *Client, ctx context.Context, data []*pb.Section) error {
72+
func RecordSections(c *Client, ctx context.Context, data []*typespb.Section) error {
7273
stream, err := c.client.RecordSections(ctx)
7374
if err != nil {
7475
return err
7576
}
7677

77-
return send[pb.Section](stream, data)
78+
return send[typespb.Section](stream, data)
7879
}
7980

80-
func RecordBridges(c *Client, ctx context.Context, data []*pb.Bridge) error {
81+
func RecordBridges(c *Client, ctx context.Context, data []*typespb.Bridge) error {
8182
stream, err := c.client.RecordBridges(ctx)
8283
if err != nil {
8384
return err
8485
}
8586

86-
return send[pb.Bridge](stream, data)
87+
return send[typespb.Bridge](stream, data)
8788
}
8889

89-
func RecordTestReports(c *Client, ctx context.Context, data []*pb.TestReport) error {
90+
func RecordTestReports(c *Client, ctx context.Context, data []*typespb.TestReport) error {
9091
stream, err := c.client.RecordTestReports(ctx)
9192
if err != nil {
9293
return err
9394
}
9495

95-
return send[pb.TestReport](stream, data)
96+
return send[typespb.TestReport](stream, data)
9697
}
9798

98-
func RecordTestSuites(c *Client, ctx context.Context, data []*pb.TestSuite) error {
99+
func RecordTestSuites(c *Client, ctx context.Context, data []*typespb.TestSuite) error {
99100
stream, err := c.client.RecordTestSuites(ctx)
100101
if err != nil {
101102
return err
102103
}
103104

104-
return send[pb.TestSuite](stream, data)
105+
return send[typespb.TestSuite](stream, data)
105106
}
106107

107-
func RecordTestCases(c *Client, ctx context.Context, data []*pb.TestCase) error {
108+
func RecordTestCases(c *Client, ctx context.Context, data []*typespb.TestCase) error {
108109
stream, err := c.client.RecordTestCases(ctx)
109110
if err != nil {
110111
return err
111112
}
112113

113-
return send[pb.TestCase](stream, data)
114+
return send[typespb.TestCase](stream, data)
114115
}
115116

116-
func RecordMetrics(c *Client, ctx context.Context, data []*pb.Metric) error {
117+
func RecordMetrics(c *Client, ctx context.Context, data []*typespb.Metric) error {
117118
stream, err := c.client.RecordMetrics(ctx)
118119
if err != nil {
119120
return err
120121
}
121122

122-
return send[pb.Metric](stream, data)
123+
return send[typespb.Metric](stream, data)
123124
}
124125

125-
func RecordTraces(c *Client, ctx context.Context, data []*pb.Trace) error {
126+
func RecordTraces(c *Client, ctx context.Context, data []*typespb.Trace) error {
126127
stream, err := c.client.RecordTraces(ctx)
127128
if err != nil {
128129
return err
129130
}
130131

131-
return send[pb.Trace](stream, data)
132+
return send[typespb.Trace](stream, data)
132133
}

0 commit comments

Comments
 (0)