Skip to content
This repository was archived by the owner on Oct 3, 2023. It is now read-only.

Commit be218fb

Browse files
g-easyBogdan Drutu
authored andcommitted
Load proto_library() rule. (#216)
* Load proto_library() rule. Starting with Bazel 3.0, all Protobuf rules will require explicit load statements. Fixes #215. * More fixes. * Change versions at random in the hope that one will work. * Update grpc and load its deps. * Refer to @rules_proto. * Update checksum.
1 parent 5cec5ea commit be218fb

File tree

8 files changed

+68
-21
lines changed

8 files changed

+68
-21
lines changed

src/WORKSPACE

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,51 @@ workspace(name = "opencensus_proto")
1717
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
1818
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1919

20+
# Import rules_proto for proto_library().
21+
http_archive(
22+
name = "rules_proto",
23+
sha256 = "602e7161d9195e50246177e7c55b2f39950a9cf7366f74ed5f22fd45750cd208",
24+
strip_prefix = "rules_proto-97d8af4dc474595af3900dd85cb3a29ad28cc313",
25+
urls = [
26+
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
27+
"https://github.com/bazelbuild/rules_proto/archive/97d8af4dc474595af3900dd85cb3a29ad28cc313.tar.gz",
28+
],
29+
)
30+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
31+
rules_proto_dependencies()
32+
rules_proto_toolchains()
33+
2034
# Import grpc for cc_grpc_library().
2135
http_archive(
2236
name = "com_github_grpc_grpc",
23-
sha256 = "54130a7fa3dae57ed148f24cddcc91ff56e8023ed3d1e44cff4e1a922406087d",
24-
strip_prefix = "grpc-809e7c951358a80182d7126b255c3a40881fb3fa",
25-
urls = ["https://github.com/grpc/grpc/archive/809e7c951358a80182d7126b255c3a40881fb3fa.zip"],
37+
sha256 = "bbda0588df1b31aca41b83d09cf69816df653b5a89f820d16ab95af8eb1f9072",
38+
strip_prefix = "grpc-b1547c9d19034740b1e5b4d73cb91d068dc0acb4",
39+
urls = ["https://github.com/grpc/grpc/archive/b1547c9d19034740b1e5b4d73cb91d068dc0acb4.zip"],
2640
)
2741

2842
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
29-
3043
grpc_deps()
3144

45+
# grpc_deps() cannot load() its deps, this WORKSPACE has to do it.
46+
# See also: https://github.com/bazelbuild/bazel/issues/1943
47+
load(
48+
"@build_bazel_rules_apple//apple:repositories.bzl",
49+
"apple_rules_dependencies",
50+
)
51+
52+
apple_rules_dependencies()
53+
54+
load(
55+
"@build_bazel_apple_support//lib:repositories.bzl",
56+
"apple_support_dependencies",
57+
)
58+
59+
apple_support_dependencies()
60+
61+
load("@upb//bazel:repository_defs.bzl", "bazel_version_repository")
62+
63+
bazel_version_repository(name = "bazel_version")
64+
3265
# go rules related
3366
git_repository(
3467
name = "io_bazel_rules_go",
@@ -40,7 +73,7 @@ git_repository(
4073
# see https://github.com/bazelbuild/rules_go/blob/release-0.12/go/private/repositories.bzl#L75
4174
# for the included golang protobuf version and
4275
# see https://github.com/golang/protobuf/pull/544 for "paths=source_relative" usage
43-
tag = "0.19.1",
76+
tag = "v0.19.9",
4477
)
4578

4679
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")

src/opencensus/proto/agent/common/v1/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -26,8 +28,8 @@ proto_library(
2628

2729
go_proto_library(
2830
name = "common_proto_go",
29-
proto = ":common_proto",
3031
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1",
32+
proto = ":common_proto",
3133
deps = [
3234
"@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
3335
],

src/opencensus/proto/agent/metrics/v1/BUILD.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -35,14 +37,14 @@ cc_proto_library(
3537
cc_grpc_library(
3638
name = "metrics_service_grpc_cc",
3739
srcs = [":metrics_service_proto"],
38-
deps = [":metrics_service_proto_cc"],
3940
grpc_only = True,
41+
deps = [":metrics_service_proto_cc"],
4042
)
4143

4244
go_proto_library(
4345
name = "metrics_service_proto_go",
44-
proto = ":metrics_service_proto",
4546
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1",
47+
proto = ":metrics_service_proto",
4648
deps = [
4749
"//opencensus/proto/agent/common/v1:common_proto_go",
4850
"//opencensus/proto/metrics/v1:metrics_proto_go",

src/opencensus/proto/agent/trace/v1/BUILD.bazel

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -23,8 +25,8 @@ proto_library(
2325
deps = [
2426
"//opencensus/proto/agent/common/v1:common_proto",
2527
"//opencensus/proto/resource/v1:resource_proto",
26-
"//opencensus/proto/trace/v1:trace_proto",
2728
"//opencensus/proto/trace/v1:trace_config_proto",
29+
"//opencensus/proto/trace/v1:trace_proto",
2830
],
2931
)
3032

@@ -36,14 +38,14 @@ cc_proto_library(
3638
cc_grpc_library(
3739
name = "trace_service_grpc_cc",
3840
srcs = [":trace_service_proto"],
39-
deps = [":trace_service_proto_cc"],
4041
grpc_only = True,
42+
deps = [":trace_service_proto_cc"],
4143
)
4244

4345
go_proto_library(
4446
name = "trace_service_proto_go",
45-
proto = ":trace_service_proto",
4647
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1",
48+
proto = ":trace_service_proto",
4749
deps = [
4850
"//opencensus/proto/agent/common/v1:common_proto_go",
4951
"//opencensus/proto/resource/v1:resource_proto_go",

src/opencensus/proto/metrics/v1/BUILD.bazel

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -20,9 +22,9 @@ proto_library(
2022
name = "metrics_proto",
2123
srcs = ["metrics.proto"],
2224
deps = [
25+
"//opencensus/proto/resource/v1:resource_proto",
2326
"@com_google_protobuf//:timestamp_proto",
2427
"@com_google_protobuf//:wrappers_proto",
25-
"//opencensus/proto/resource/v1:resource_proto",
2628
],
2729
)
2830

@@ -38,8 +40,8 @@ java_proto_library(
3840

3941
go_proto_library(
4042
name = "metrics_proto_go",
41-
proto = ":metrics_proto",
4243
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1",
44+
proto = ":metrics_proto",
4345
deps = [
4446
"//opencensus/proto/resource/v1:resource_proto_go",
4547
"@com_github_golang_protobuf//ptypes/timestamp:go_default_library",

src/opencensus/proto/resource/v1/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -34,8 +36,8 @@ java_proto_library(
3436

3537
go_proto_library(
3638
name = "resource_proto_go",
37-
proto = ":resource_proto",
3839
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1",
40+
proto = ":resource_proto",
3941
)
4042

4143
py_proto_library(

src/opencensus/proto/stats/v1/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -37,8 +39,8 @@ java_proto_library(
3739

3840
go_proto_library(
3941
name = "stats_proto_go",
40-
proto = ":stats_proto",
4142
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/stats/v1",
43+
proto = ":stats_proto",
4244
deps = [
4345
"@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
4446
],

src/opencensus/proto/trace/v1/BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
load("@rules_proto//proto:defs.bzl", "proto_library")
16+
1517
package(default_visibility = ["//visibility:public"])
1618

1719
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
@@ -22,9 +24,9 @@ proto_library(
2224
name = "trace_proto",
2325
srcs = ["trace.proto"],
2426
deps = [
27+
"//opencensus/proto/resource/v1:resource_proto",
2528
"@com_google_protobuf//:timestamp_proto",
2629
"@com_google_protobuf//:wrappers_proto",
27-
"//opencensus/proto/resource/v1:resource_proto",
2830
],
2931
)
3032

@@ -55,27 +57,27 @@ java_proto_library(
5557

5658
go_proto_library(
5759
name = "trace_proto_go",
58-
proto = ":trace_proto",
5960
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1",
61+
proto = ":trace_proto",
6062
deps = [
63+
"//opencensus/proto/resource/v1:resource_proto_go",
6164
"@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
6265
"@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
63-
"//opencensus/proto/resource/v1:resource_proto_go",
6466
],
6567
)
6668

6769
go_proto_library(
6870
name = "trace_config_proto_go",
69-
proto = ":trace_config_proto",
7071
importpath = "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1",
72+
proto = ":trace_config_proto",
7173
)
7274

7375
py_proto_library(
7476
name = "trace_proto_py",
7577
srcs = ["trace.proto"],
7678
deps = [
77-
"@com_google_protobuf//:protobuf_python",
7879
"//opencensus/proto/resource/v1:resource_proto_py",
80+
"@com_google_protobuf//:protobuf_python",
7981
],
8082
)
8183

@@ -94,5 +96,5 @@ go_library(
9496
embed = [
9597
":trace_proto_go",
9698
":trace_config_proto_go",
97-
]
99+
],
98100
)

0 commit comments

Comments
 (0)