Skip to content

Commit 4cc1aba

Browse files
litianningdatadoglitianningdatadog
committed
bazel: restore cmd/serverless-init/cloudservice to the build
cloudservice was re-excluded from Gazelle in PR #53031 as a stopgap after adding a Run() dependency on mode/log, which pulled in an unmigrated chain: mode -> log -> pkg/serverless/logs -> comp/logs/agent/impl -> pkg/logs/launchers/{file,integration,journald, container/tailerfactory}. Migrate the whole chain instead of leaving cloudservice excluded: remove the gazelle:exclude directives for all of the above and add the generated BUILD.bazel files (container's stub gazelle:ignore is replaced with a real target now that tailerfactory is migrated). Verified with bazel build //... and a scoped bazel test of the restored chain; the only skips are pre-existing platform-incompatible targets (journald's cgo/systemd dep is Linux-only), which already exit 0 under CI's --keep_going.
1 parent 876f736 commit 4cc1aba

12 files changed

Lines changed: 1016 additions & 13 deletions

File tree

‎BUILD.bazel‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@ exports_files(["go.mod"])
8585
# gazelle:exclude cmd/security-agent/subcommands/compliance
8686
# gazelle:exclude cmd/security-agent/subcommands/start
8787
# gazelle:exclude cmd/serverless-init/*.go
88-
# cloudservice imports mode and log directly; excluded alongside them until that
89-
# chain (mode -> log -> pkg/serverless/logs -> comp/logs/agent/impl and its
90-
# launchers) is migrated, then drop this exclude too.
91-
# gazelle:exclude cmd/serverless-init/cloudservice
92-
# gazelle:exclude cmd/serverless-init/log
93-
# gazelle:exclude cmd/serverless-init/mode
9488
# gazelle:exclude cmd/system-probe/modules
9589
# gazelle:exclude cmd/system-probe/subcommands/compliance
9690
# gazelle:exclude cmd/system-probe/subcommands/run
@@ -109,7 +103,6 @@ exports_files(["go.mod"])
109103
# gazelle:exclude comp/logs/adscheduler/fx
110104
# gazelle:exclude comp/logs/adscheduler/impl
111105
# gazelle:exclude comp/logs/agent/fx
112-
# gazelle:exclude comp/logs/agent/impl
113106
# gazelle:exclude comp/logs/streamlogs/fx
114107
# gazelle:exclude comp/metadata/clusteragent/fx
115108
# gazelle:exclude comp/metadata/clusteragent/impl
@@ -211,10 +204,6 @@ exports_files(["go.mod"])
211204
# Parent BUILD.bazel reaches into tmpl/ via intra-package paths; a local stub would split the package and break those refs.
212205
# gazelle:exclude pkg/fleet/installer/packages/embedded/tmpl
213206
# gazelle:exclude pkg/gpu/integrationtests
214-
# gazelle:exclude pkg/logs/launchers/container/tailerfactory
215-
# gazelle:exclude pkg/logs/launchers/file/*.go
216-
# gazelle:exclude pkg/logs/launchers/integration
217-
# gazelle:exclude pkg/logs/launchers/journald
218207
# gazelle:exclude pkg/network/protocols/http/gotls/lookup/luts.go
219208
# gazelle:exclude pkg/network/protocols/http/gotls/lookup/main.go
220209
# gazelle:exclude pkg/network/tracer/connection/*.go
@@ -230,7 +219,6 @@ exports_files(["go.mod"])
230219
# gazelle:exclude pkg/privileged-logs/test
231220
# gazelle:exclude pkg/process/monitor
232221
# gazelle:exclude pkg/process/runner/mocks
233-
# gazelle:exclude pkg/serverless/logs
234222
# gazelle:exclude pkg/serverless/otlp
235223
# gazelle:exclude pkg/serverless/trace/span_modifer_test.go
236224
# gazelle:exclude pkg/serverless/trace/span_modifier.go

‎cmd/serverless-init/cloudservice/BUILD.bazel‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
load("@rules_go//go:def.bzl", "go_library")
2+
load("//bazel/rules/go:dd_agent_go_test.bzl", "dd_agent_go_test")
3+
4+
go_library(
5+
name = "cloudservice",
6+
srcs = [
7+
"appservice.go",
8+
"cloudrun.go",
9+
"cloudrun_jobs.go",
10+
"containerapp.go",
11+
"microvm.go",
12+
"service.go",
13+
],
14+
importpath = "github.com/DataDog/datadog-agent/cmd/serverless-init/cloudservice",
15+
visibility = ["//visibility:public"],
16+
deps = [
17+
"//cmd/serverless-init/exitcode",
18+
"//cmd/serverless-init/lifecycle",
19+
"//cmd/serverless-init/log",
20+
"//cmd/serverless-init/mode",
21+
"//cmd/serverless-init/trace",
22+
"//pkg/config/setup",
23+
"//pkg/metrics",
24+
"//pkg/proto/pbgo/trace",
25+
"//pkg/serverless/env",
26+
"//pkg/serverless/metrics",
27+
"//pkg/trace/api",
28+
"//pkg/trace/traceutil",
29+
"//pkg/util/log",
30+
],
31+
)
32+
33+
dd_agent_go_test(
34+
name = "cloudservice_test",
35+
srcs = [
36+
"appservice_test.go",
37+
"cloudrun_jobs_test.go",
38+
"cloudrun_test.go",
39+
"containerapp_test.go",
40+
"microvm_test.go",
41+
"service_test.go",
42+
],
43+
embed = [":cloudservice"],
44+
deps = [
45+
"//cmd/serverless-init/lifecycle",
46+
"//cmd/serverless-init/log",
47+
"//cmd/serverless-init/mode",
48+
"//comp/aggregator/demultiplexer/def",
49+
"//comp/aggregator/demultiplexer/impl",
50+
"//comp/core/hostname/hostnameimpl",
51+
"//comp/core/log/def",
52+
"//comp/core/log/mock",
53+
"//comp/serializer/logscompression/fx-mock",
54+
"//comp/serializer/metricscompression/fx-mock",
55+
"//pkg/serverless/env",
56+
"//pkg/serverless/metrics",
57+
"//pkg/trace/api",
58+
"//pkg/util/fxutil",
59+
"@com_github_stretchr_testify//assert",
60+
"@com_github_stretchr_testify//require",
61+
"@org_uber_go_fx//:fx",
62+
],
63+
)

‎cmd/serverless-init/log/BUILD.bazel‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
load("@rules_go//go:def.bzl", "go_library")
2+
load("//bazel/rules/go:dd_agent_go_test.bzl", "dd_agent_go_test")
3+
4+
go_library(
5+
name = "log",
6+
srcs = [
7+
"channel_writer.go",
8+
"log.go",
9+
],
10+
importpath = "github.com/DataDog/datadog-agent/cmd/serverless-init/log",
11+
visibility = ["//visibility:public"],
12+
deps = [
13+
"//comp/core/hostname/hostnameinterface/def",
14+
"//comp/core/tagger/def",
15+
"//comp/logs/agent/config",
16+
"//comp/logs/agent/def",
17+
"//comp/serializer/logscompression/def",
18+
"//pkg/logs/sources",
19+
"//pkg/serverless/logs",
20+
"//pkg/serverless/tags",
21+
"//pkg/util/log",
22+
],
23+
)
24+
25+
dd_agent_go_test(
26+
name = "log_test",
27+
srcs = [
28+
"channel_writer_test.go",
29+
"log_test.go",
30+
],
31+
embed = [":log"],
32+
deps = [
33+
"//comp/logs/agent/config",
34+
"@com_github_stretchr_testify//assert",
35+
],
36+
)

‎cmd/serverless-init/mode/BUILD.bazel‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
load("@rules_go//go:def.bzl", "go_library")
2+
load("//bazel/rules/go:dd_agent_go_test.bzl", "dd_agent_go_test")
3+
4+
go_library(
5+
name = "mode",
6+
srcs = [
7+
"initcontainer_mode.go",
8+
"mode.go",
9+
"mode_windows.go",
10+
"sidecarcontainer_mode.go",
11+
],
12+
importpath = "github.com/DataDog/datadog-agent/cmd/serverless-init/mode",
13+
visibility = ["//visibility:public"],
14+
deps = select({
15+
"@rules_go//go/platform:aix": [
16+
"//cmd/serverless-init/log",
17+
"//pkg/util/log",
18+
"@com_github_spf13_afero//:afero",
19+
],
20+
"@rules_go//go/platform:android": [
21+
"//cmd/serverless-init/log",
22+
"//pkg/util/log",
23+
"@com_github_spf13_afero//:afero",
24+
],
25+
"@rules_go//go/platform:darwin": [
26+
"//cmd/serverless-init/log",
27+
"//pkg/util/log",
28+
"@com_github_spf13_afero//:afero",
29+
],
30+
"@rules_go//go/platform:dragonfly": [
31+
"//cmd/serverless-init/log",
32+
"//pkg/util/log",
33+
"@com_github_spf13_afero//:afero",
34+
],
35+
"@rules_go//go/platform:freebsd": [
36+
"//cmd/serverless-init/log",
37+
"//pkg/util/log",
38+
"@com_github_spf13_afero//:afero",
39+
],
40+
"@rules_go//go/platform:illumos": [
41+
"//cmd/serverless-init/log",
42+
"//pkg/util/log",
43+
"@com_github_spf13_afero//:afero",
44+
],
45+
"@rules_go//go/platform:ios": [
46+
"//cmd/serverless-init/log",
47+
"//pkg/util/log",
48+
"@com_github_spf13_afero//:afero",
49+
],
50+
"@rules_go//go/platform:js": [
51+
"//cmd/serverless-init/log",
52+
"//pkg/util/log",
53+
"@com_github_spf13_afero//:afero",
54+
],
55+
"@rules_go//go/platform:linux": [
56+
"//cmd/serverless-init/log",
57+
"//pkg/util/log",
58+
"@com_github_spf13_afero//:afero",
59+
],
60+
"@rules_go//go/platform:netbsd": [
61+
"//cmd/serverless-init/log",
62+
"//pkg/util/log",
63+
"@com_github_spf13_afero//:afero",
64+
],
65+
"@rules_go//go/platform:openbsd": [
66+
"//cmd/serverless-init/log",
67+
"//pkg/util/log",
68+
"@com_github_spf13_afero//:afero",
69+
],
70+
"@rules_go//go/platform:osx": [
71+
"//cmd/serverless-init/log",
72+
"//pkg/util/log",
73+
"@com_github_spf13_afero//:afero",
74+
],
75+
"@rules_go//go/platform:plan9": [
76+
"//cmd/serverless-init/log",
77+
"//pkg/util/log",
78+
"@com_github_spf13_afero//:afero",
79+
],
80+
"@rules_go//go/platform:qnx": [
81+
"//cmd/serverless-init/log",
82+
"//pkg/util/log",
83+
"@com_github_spf13_afero//:afero",
84+
],
85+
"@rules_go//go/platform:solaris": [
86+
"//cmd/serverless-init/log",
87+
"//pkg/util/log",
88+
"@com_github_spf13_afero//:afero",
89+
],
90+
"@rules_go//go/platform:windows": [
91+
"//cmd/serverless-init/log",
92+
],
93+
"//conditions:default": [],
94+
}),
95+
)
96+
97+
dd_agent_go_test(
98+
name = "mode_test",
99+
srcs = [
100+
"initcontainer_mode_test.go",
101+
"mode_windows_test.go",
102+
],
103+
embed = [":mode"],
104+
deps = select({
105+
"@rules_go//go/platform:aix": [
106+
"//cmd/serverless-init/lifecycle",
107+
"//cmd/serverless-init/log",
108+
"@com_github_spf13_afero//:afero",
109+
"@com_github_stretchr_testify//assert",
110+
],
111+
"@rules_go//go/platform:android": [
112+
"//cmd/serverless-init/lifecycle",
113+
"//cmd/serverless-init/log",
114+
"@com_github_spf13_afero//:afero",
115+
"@com_github_stretchr_testify//assert",
116+
],
117+
"@rules_go//go/platform:darwin": [
118+
"//cmd/serverless-init/lifecycle",
119+
"//cmd/serverless-init/log",
120+
"@com_github_spf13_afero//:afero",
121+
"@com_github_stretchr_testify//assert",
122+
],
123+
"@rules_go//go/platform:dragonfly": [
124+
"//cmd/serverless-init/lifecycle",
125+
"//cmd/serverless-init/log",
126+
"@com_github_spf13_afero//:afero",
127+
"@com_github_stretchr_testify//assert",
128+
],
129+
"@rules_go//go/platform:freebsd": [
130+
"//cmd/serverless-init/lifecycle",
131+
"//cmd/serverless-init/log",
132+
"@com_github_spf13_afero//:afero",
133+
"@com_github_stretchr_testify//assert",
134+
],
135+
"@rules_go//go/platform:illumos": [
136+
"//cmd/serverless-init/lifecycle",
137+
"//cmd/serverless-init/log",
138+
"@com_github_spf13_afero//:afero",
139+
"@com_github_stretchr_testify//assert",
140+
],
141+
"@rules_go//go/platform:ios": [
142+
"//cmd/serverless-init/lifecycle",
143+
"//cmd/serverless-init/log",
144+
"@com_github_spf13_afero//:afero",
145+
"@com_github_stretchr_testify//assert",
146+
],
147+
"@rules_go//go/platform:js": [
148+
"//cmd/serverless-init/lifecycle",
149+
"//cmd/serverless-init/log",
150+
"@com_github_spf13_afero//:afero",
151+
"@com_github_stretchr_testify//assert",
152+
],
153+
"@rules_go//go/platform:linux": [
154+
"//cmd/serverless-init/lifecycle",
155+
"//cmd/serverless-init/log",
156+
"@com_github_spf13_afero//:afero",
157+
"@com_github_stretchr_testify//assert",
158+
],
159+
"@rules_go//go/platform:netbsd": [
160+
"//cmd/serverless-init/lifecycle",
161+
"//cmd/serverless-init/log",
162+
"@com_github_spf13_afero//:afero",
163+
"@com_github_stretchr_testify//assert",
164+
],
165+
"@rules_go//go/platform:openbsd": [
166+
"//cmd/serverless-init/lifecycle",
167+
"//cmd/serverless-init/log",
168+
"@com_github_spf13_afero//:afero",
169+
"@com_github_stretchr_testify//assert",
170+
],
171+
"@rules_go//go/platform:osx": [
172+
"//cmd/serverless-init/lifecycle",
173+
"//cmd/serverless-init/log",
174+
"@com_github_spf13_afero//:afero",
175+
"@com_github_stretchr_testify//assert",
176+
],
177+
"@rules_go//go/platform:plan9": [
178+
"//cmd/serverless-init/lifecycle",
179+
"//cmd/serverless-init/log",
180+
"@com_github_spf13_afero//:afero",
181+
"@com_github_stretchr_testify//assert",
182+
],
183+
"@rules_go//go/platform:qnx": [
184+
"//cmd/serverless-init/lifecycle",
185+
"//cmd/serverless-init/log",
186+
"@com_github_spf13_afero//:afero",
187+
"@com_github_stretchr_testify//assert",
188+
],
189+
"@rules_go//go/platform:solaris": [
190+
"//cmd/serverless-init/lifecycle",
191+
"//cmd/serverless-init/log",
192+
"@com_github_spf13_afero//:afero",
193+
"@com_github_stretchr_testify//assert",
194+
],
195+
"@rules_go//go/platform:windows": [
196+
"@com_github_stretchr_testify//assert",
197+
],
198+
"//conditions:default": [],
199+
}),
200+
)

0 commit comments

Comments
 (0)