Skip to content

Commit 5239816

Browse files
authored
chore: update protobuf library version (#410)
* chore: update protobuf library version * chore: regenerate example and bench protos * chore: regenerate test protos * fix: also generate grpc service * fix: bring back protobuf generate
1 parent b65ed41 commit 5239816

32 files changed

+263
-346
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ service Greeter {
5959
6060
```
6161

62-
2. Then generate Elixir code from proto file as [protobuf-elixir](https://github.com/tony612/protobuf-elixir#usage) shows (especially the `gRPC Support` section) or using [protobuf_generate](https://hex.pm/packages/protobuf_generate) hex package. Example using `protobuf_generate` lib:
62+
2. Then generate Elixir code from proto file as [protobuf-elixir](https://github.com/elixir-protobuf/protobuf#usage):
6363

6464
```shell
65-
mix protobuf.generate --output-path=./lib --include-path=./priv/protos helloworld.proto
65+
protoc --elixir_out=plugins=grpc:./lib -I./priv/protos helloworld.proto
6666
```
6767

6868
In the following sections you will see how to implement gRPC server logic.

benchmark/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Benchmark implementation followed by [official spec](https://grpc.io/docs/guides
55
## Usage
66

77
```
8-
$ git clone https://github.com/tony612/grpc.git
8+
$ git clone https://github.com/elixir-grpc/grpc.git
99
$ cd grpc && git checkout -t origin/elixir-bench
1010
$ git submodule update --init
1111
$ export ELIXIR_GRPC_PATH= # elixir-grpc path
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
defmodule Grpc.Core.Bucket do
22
@moduledoc false
3-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
3+
4+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
45

56
field :start, 1, type: :double
67
field :count, 2, type: :uint64
78
end
89

910
defmodule Grpc.Core.Histogram do
1011
@moduledoc false
11-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
12+
13+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
1214

1315
field :buckets, 1, repeated: true, type: Grpc.Core.Bucket
1416
end
1517

1618
defmodule Grpc.Core.Metric do
1719
@moduledoc false
18-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
20+
21+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
1922

2023
oneof :value, 0
2124

@@ -26,7 +29,8 @@ end
2629

2730
defmodule Grpc.Core.Stats do
2831
@moduledoc false
29-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
32+
33+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
3034

3135
field :metrics, 1, repeated: true, type: Grpc.Core.Metric
32-
end
36+
end
Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1 @@
1-
defmodule Grpc.Testing.BenchmarkService.Service do
2-
@moduledoc false
3-
use GRPC.Service, name: "grpc.testing.BenchmarkService", protoc_gen_elixir_version: "0.11.0"
41

5-
rpc :UnaryCall, Grpc.Testing.SimpleRequest, Grpc.Testing.SimpleResponse
6-
7-
rpc :StreamingCall, stream(Grpc.Testing.SimpleRequest), stream(Grpc.Testing.SimpleResponse)
8-
9-
rpc :StreamingFromClient, stream(Grpc.Testing.SimpleRequest), Grpc.Testing.SimpleResponse
10-
11-
rpc :StreamingFromServer, Grpc.Testing.SimpleRequest, stream(Grpc.Testing.SimpleResponse)
12-
13-
rpc :StreamingBothWays, stream(Grpc.Testing.SimpleRequest), stream(Grpc.Testing.SimpleResponse)
14-
end
15-
16-
defmodule Grpc.Testing.BenchmarkService.Stub do
17-
@moduledoc false
18-
use GRPC.Stub, service: Grpc.Testing.BenchmarkService.Service
19-
end

benchmark/lib/grpc/testing/control.pb.ex

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
defmodule Grpc.Testing.ClientType do
22
@moduledoc false
3-
use Protobuf, enum: true, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
3+
4+
use Protobuf, enum: true, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
45

56
field :SYNC_CLIENT, 0
67
field :ASYNC_CLIENT, 1
@@ -9,7 +10,8 @@ end
910

1011
defmodule Grpc.Testing.ServerType do
1112
@moduledoc false
12-
use Protobuf, enum: true, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
13+
14+
use Protobuf, enum: true, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
1315

1416
field :SYNC_SERVER, 0
1517
field :ASYNC_SERVER, 1
@@ -19,7 +21,8 @@ end
1921

2022
defmodule Grpc.Testing.RpcType do
2123
@moduledoc false
22-
use Protobuf, enum: true, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
24+
25+
use Protobuf, enum: true, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
2326

2427
field :UNARY, 0
2528
field :STREAMING, 1
@@ -30,19 +33,22 @@ end
3033

3134
defmodule Grpc.Testing.PoissonParams do
3235
@moduledoc false
33-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
36+
37+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
3438

3539
field :offered_load, 1, type: :double, json_name: "offeredLoad"
3640
end
3741

3842
defmodule Grpc.Testing.ClosedLoopParams do
3943
@moduledoc false
40-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
44+
45+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
4146
end
4247

4348
defmodule Grpc.Testing.LoadParams do
4449
@moduledoc false
45-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
50+
51+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
4652

4753
oneof :load, 0
4854

@@ -52,7 +58,8 @@ end
5258

5359
defmodule Grpc.Testing.SecurityParams do
5460
@moduledoc false
55-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
61+
62+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
5663

5764
field :use_test_ca, 1, type: :bool, json_name: "useTestCa"
5865
field :server_host_override, 2, type: :string, json_name: "serverHostOverride"
@@ -61,7 +68,8 @@ end
6168

6269
defmodule Grpc.Testing.ChannelArg do
6370
@moduledoc false
64-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
71+
72+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
6573

6674
oneof :value, 0
6775

@@ -72,7 +80,8 @@ end
7280

7381
defmodule Grpc.Testing.ClientConfig do
7482
@moduledoc false
75-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
83+
84+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
7685

7786
field :server_targets, 1, repeated: true, type: :string, json_name: "serverTargets"
7887
field :client_type, 2, type: Grpc.Testing.ClientType, json_name: "clientType", enum: true
@@ -95,21 +104,24 @@ end
95104

96105
defmodule Grpc.Testing.ClientStatus do
97106
@moduledoc false
98-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
107+
108+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
99109

100110
field :stats, 1, type: Grpc.Testing.ClientStats
101111
end
102112

103113
defmodule Grpc.Testing.Mark do
104114
@moduledoc false
105-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
115+
116+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
106117

107118
field :reset, 1, type: :bool
108119
end
109120

110121
defmodule Grpc.Testing.ClientArgs do
111122
@moduledoc false
112-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
123+
124+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
113125

114126
oneof :argtype, 0
115127

@@ -119,7 +131,8 @@ end
119131

120132
defmodule Grpc.Testing.ServerConfig do
121133
@moduledoc false
122-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
134+
135+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
123136

124137
field :server_type, 1, type: Grpc.Testing.ServerType, json_name: "serverType", enum: true
125138
field :security_params, 2, type: Grpc.Testing.SecurityParams, json_name: "securityParams"
@@ -140,7 +153,8 @@ end
140153

141154
defmodule Grpc.Testing.ServerArgs do
142155
@moduledoc false
143-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
156+
157+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
144158

145159
oneof :argtype, 0
146160

@@ -150,7 +164,8 @@ end
150164

151165
defmodule Grpc.Testing.ServerStatus do
152166
@moduledoc false
153-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
167+
168+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
154169

155170
field :stats, 1, type: Grpc.Testing.ServerStats
156171
field :port, 2, type: :int32
@@ -159,24 +174,28 @@ end
159174

160175
defmodule Grpc.Testing.CoreRequest do
161176
@moduledoc false
162-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
177+
178+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
163179
end
164180

165181
defmodule Grpc.Testing.CoreResponse do
166182
@moduledoc false
167-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
183+
184+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
168185

169186
field :cores, 1, type: :int32
170187
end
171188

172189
defmodule Grpc.Testing.Void do
173190
@moduledoc false
174-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
191+
192+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
175193
end
176194

177195
defmodule Grpc.Testing.Scenario do
178196
@moduledoc false
179-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
197+
198+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
180199

181200
field :name, 1, type: :string
182201
field :client_config, 2, type: Grpc.Testing.ClientConfig, json_name: "clientConfig"
@@ -190,14 +209,16 @@ end
190209

191210
defmodule Grpc.Testing.Scenarios do
192211
@moduledoc false
193-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
212+
213+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
194214

195215
field :scenarios, 1, repeated: true, type: Grpc.Testing.Scenario
196216
end
197217

198218
defmodule Grpc.Testing.ScenarioResultSummary do
199219
@moduledoc false
200-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
220+
221+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
201222

202223
field :qps, 1, type: :double
203224
field :qps_per_server_core, 2, type: :double, json_name: "qpsPerServerCore"
@@ -225,7 +246,8 @@ end
225246

226247
defmodule Grpc.Testing.ScenarioResult do
227248
@moduledoc false
228-
use Protobuf, protoc_gen_elixir_version: "0.11.0", syntax: :proto3
249+
250+
use Protobuf, protoc_gen_elixir_version: "0.14.1", syntax: :proto3
229251

230252
field :scenario, 1, type: Grpc.Testing.Scenario
231253
field :latencies, 2, type: Grpc.Testing.HistogramData
@@ -240,4 +262,4 @@ defmodule Grpc.Testing.ScenarioResult do
240262
repeated: true,
241263
type: Grpc.Testing.RequestResultCount,
242264
json_name: "requestResults"
243-
end
265+
end

0 commit comments

Comments
 (0)