Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@ exports_files(glob(
# gazelle:exclude pkg/proto/datadog/remoteagent
# gazelle:exclude pkg/proto/datadog/remoteconfig
# gazelle:exclude pkg/proto/datadog/sbom
# gazelle:exclude pkg/proto/datadog/trace
# gazelle:exclude pkg/proto/datadog/workloadfilter
# gazelle:exclude pkg/proto/datadog/workloadmeta
# gazelle:exclude pkg/proto/protodep
Expand Down Expand Up @@ -895,6 +894,7 @@ _GAZELLE_BUILD_TAGS = [
"zstd",
]

# gazelle:resolve go github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace/idx //pkg/proto/pbgo/trace/idx
Comment thread
rdesgroppes marked this conversation as resolved.
gazelle(
name = "gazelle",
build_tags = _GAZELLE_BUILD_TAGS,
Expand Down
23 changes: 23 additions & 0 deletions pkg/proto/datadog/trace/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
load("@protobuf//bazel:proto_library.bzl", "proto_library")
load("@rules_go//proto:def.bzl", "go_proto_library")

proto_library(
name = "trace_proto",
srcs = [
"agent_payload.proto",
"span.proto",
"stats.proto",
"tracer_payload.proto",
],
strip_import_prefix = "/pkg/proto",
visibility = ["//visibility:public"],
deps = ["//pkg/proto/datadog/trace/idx:idx_proto"],
)

go_proto_library(
name = "trace_go_proto",
importpath = "pkg/proto/pbgo/trace",
proto = ":trace_proto",
visibility = ["//visibility:public"],
deps = ["//pkg/proto/datadog/trace/idx:idx_go_proto"],
)
19 changes: 19 additions & 0 deletions pkg/proto/datadog/trace/idx/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
load("@protobuf//bazel:proto_library.bzl", "proto_library")
load("@rules_go//proto:def.bzl", "go_proto_library")

proto_library(
name = "idx_proto",
srcs = [
"span.proto",
"tracer_payload.proto",
],
strip_import_prefix = "/pkg/proto",
visibility = ["//visibility:public"],
)

go_proto_library(
name = "idx_go_proto",
importpath = "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace/idx",
proto = ":idx_proto",
visibility = ["//visibility:public"],
)
3 changes: 3 additions & 0 deletions pkg/proto/pbgo/trace/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
load("@rules_go//go:def.bzl", "go_library", "go_test")

# TODO(regis): remove this once protoc-go-inject-tag and msgp are plugged into //pkg/proto/datadog/trace:trace_go_proto
# gazelle:write_pb_go off

go_library(
name = "trace",
srcs = [
Expand Down
11 changes: 11 additions & 0 deletions pkg/proto/pbgo/trace/idx/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
load("@rules_go//go:def.bzl", "go_library", "go_test")
load("//bazel/rules/write_pb_go:defs.bzl", "write_pb_go")

write_pb_go(
name = "write_pb_go",
srcs = {
"//pkg/proto/datadog/trace/idx:idx_go_proto": [
"span.pb.go",
"tracer_payload.pb.go",
],
},
)

go_library(
name = "idx",
Expand Down
4 changes: 1 addition & 3 deletions tasks/protobuf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,16 @@
'privateactionrunner': False,
'remoteagent': False,
'autodiscovery': False,
'trace/idx': False,
'workloadfilter': False,
'dogstatsdhttp': False,
'sbom': False,
}

CLI_EXTRAS = {
'trace/idx': '--go_opt=module=github.com/DataDog/datadog-agent',
'privateactionrunner': '--go_opt=module=github.com/DataDog/datadog-agent',
}

CLI_EXTRAS_GRPC = {
'trace/idx': '--go-grpc_opt=module=github.com/DataDog/datadog-agent',
'privateactionrunner': '--go-grpc_opt=module=github.com/DataDog/datadog-agent',
}

Expand Down Expand Up @@ -80,6 +77,7 @@ def generate(ctx, pre_commit=False):
# protobuf defs
print(f"generating protobuf code from: {proto_root}")
bazel(ctx, "run", "//pkg/proto/pbgo/languagedetection:write_pb_go")
bazel(ctx, "run", "//pkg/proto/pbgo/trace/idx:write_pb_go")
for pkg, inject_tags in PROTO_PKGS.items():
files = []
pkg_root = Path(proto_root, "datadog", pkg)
Expand Down
Loading