Skip to content

Commit

Permalink
Use the existing opentelemetry-proto package
Browse files Browse the repository at this point in the history
This package is more complete than what we already have.
  • Loading branch information
EdSchouten committed Mar 31, 2024
1 parent 57e6c28 commit 5ed4570
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 56 deletions.
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ load("@gazelle//:def.bzl", "gazelle")
# gazelle:resolve proto google/protobuf/timestamp.proto @protobuf//:timestamp_proto
# gazelle:resolve proto google/protobuf/wrappers.proto @protobuf//:wrappers_proto
# gazelle:resolve proto google/rpc/status.proto @googleapis//google/rpc:status_proto
# gazelle:resolve proto opentelemetry/proto/common/v1/common.proto @io_opentelemetry_proto//:common_proto
# gazelle:resolve proto opentelemetry/proto/common/v1/common.proto @opentelemetry-proto//:common_proto
gazelle(
name = "gazelle",
)
Expand Down
15 changes: 1 addition & 14 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ bazel_dep(name = "aspect_rules_js", version = "1.39.1")
bazel_dep(name = "gazelle", version = "0.35.0")
bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5")
bazel_dep(name = "jsonnet_go", version = "0.20.0", repo_name = "google_jsonnet_go")
bazel_dep(name = "opentelemetry-proto", version = "1.1.0")
bazel_dep(name = "protobuf", version = "23.1")
bazel_dep(name = "rules_go", version = "0.46.0")
bazel_dep(name = "rules_oci", version = "1.7.5")
Expand Down Expand Up @@ -128,20 +129,6 @@ http_archive(
urls = ["https://github.com/bazelbuild/rules_jsonnet/archive/0.5.0.tar.gz"],
)

http_archive(
name = "io_opentelemetry_proto",
build_file_content = """
proto_library(
name = "common_proto",
srcs = ["opentelemetry/proto/common/v1/common.proto"],
visibility = ["//visibility:public"],
)
""",
sha256 = "464bc2b348e674a1a03142e403cbccb01be8655b6de0f8bfe733ea31fcd421be",
strip_prefix = "opentelemetry-proto-0.19.0",
urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v0.19.0.tar.gz"],
)

llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm", dev_dependency = True)
llvm.toolchain(
llvm_version = "14.0.0",
Expand Down
90 changes: 51 additions & 39 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/proto/auth/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ proto_library(
srcs = ["auth.proto"],
visibility = ["//visibility:public"],
deps = [
"@io_opentelemetry_proto//:common_proto",
"@opentelemetry-proto//:common_proto",
"@protobuf//:struct_proto",
],
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/proto/configuration/global/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ proto_library(
deps = [
"//pkg/proto/configuration/grpc:grpc_proto",
"//pkg/proto/configuration/http:http_proto",
"@io_opentelemetry_proto//:common_proto",
"@opentelemetry-proto//:common_proto",
"@protobuf//:duration_proto",
"@protobuf//:empty_proto",
"@protobuf//:wrappers_proto",
Expand Down

0 comments on commit 5ed4570

Please sign in to comment.