Skip to content

Commit 903b3f7

Browse files
mergify[bot]mergify[bot]
authored
Merge branch '7.x' into backport/7.x/pr-4883
2 parents 1cf741a + 19d467c commit 903b3f7

772 files changed

Lines changed: 15926 additions & 10445 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
CHANGELOG.asciidoc merge=union
2+
internal/otel_collector linguist-generated=true

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pipeline {
188188
Build on a mac environment.
189189
*/
190190
stage('OSX build-test') {
191-
agent { label 'macosx' }
191+
agent { label 'macosx && x86_64' }
192192
options {
193193
skipDefaultCheckout()
194194
warnError('OSX execution failed')

‎Makefile‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ GOLINT=$(GOOSBUILD)/golint
1919
MAGE=$(GOOSBUILD)/mage
2020
REVIEWDOG=$(GOOSBUILD)/reviewdog
2121
STATICCHECK=$(GOOSBUILD)/staticcheck
22+
ELASTICPACKAGE=$(GOOSBUILD)/elastic-package
2223

2324
PYTHON_ENV?=.
2425
PYTHON_BIN:=$(PYTHON_ENV)/build/ve/$(shell $(GO) env GOOS)/bin
@@ -71,20 +72,16 @@ SYSTEM_TEST_TARGET?=./tests/system
7172
PYTEST_OPTIONS?=--timeout=90 --durations=20 --junit-xml=build/TEST-system.xml
7273

7374
.PHONY: check-full
74-
check-full: update check golint staticcheck
75+
check-full: update check golint staticcheck check-docker-compose
7576

7677
.PHONY: check-approvals
7778
check-approvals: $(APPROVALS)
7879
@$(APPROVALS)
7980

8081
.PHONY: check
81-
check: $(MAGE) check-fmt check-headers
82+
check: $(MAGE) check-fmt check-headers check-package
8283
@$(MAGE) check
8384

84-
.PHONY: gen-package
85-
gen-package: $(GENPACKAGE)
86-
@$(GENPACKAGE)
87-
8885
.PHONY: bench
8986
bench:
9087
@$(GO) test -benchmem -run=XXX -benchtime=100ms -bench='.*' ./...
@@ -122,6 +119,11 @@ fields_sources=\
122119
$(shell find model -name fields.yml) \
123120
$(shell find x-pack/apm-server/fields -name fields.yml)
124121

122+
.PHONY: gen-package gen-package-only
123+
gen-package: gen-package-only format-package build-package
124+
gen-package-only: $(GENPACKAGE)
125+
@$(GENPACKAGE)
126+
125127
fields: include/fields.go x-pack/apm-server/include/fields.go
126128
include/fields.go x-pack/apm-server/include/fields.go: $(MAGE) magefile.go $(fields_sources)
127129
@$(MAGE) fields
@@ -132,7 +134,7 @@ apm-server.yml apm-server.docker.yml: $(MAGE) magefile.go _meta/beat.yml
132134

133135
.PHONY: go-generate
134136
go-generate:
135-
@$(GO) generate
137+
@$(GO) generate . ./ingest/pipeline
136138

137139
notice: NOTICE.txt
138140
NOTICE.txt: $(PYTHON) go.mod
@@ -191,7 +193,6 @@ update-beats-module:
191193
$(GO) get -d -u $(BEATS_MODULE)@$(BEATS_VERSION) && $(GO) mod tidy
192194
diff -u .go-version $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/.go-version \
193195
|| { code=$$?; echo ".go-version out of sync with Beats"; exit $$code; }
194-
rsync -crv --delete $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/testing/environments testing/
195196

196197
##############################################################################
197198
# Kibana synchronisation.
@@ -231,6 +232,17 @@ ifndef CHECK_HEADERS_DISABLED
231232
@$(GOLICENSER) -d -exclude build -license Elastic x-pack
232233
endif
233234

235+
.PHONY: check-docker-compose
236+
check-docker-compose: $(PYTHON_BIN)
237+
@PATH=$(PYTHON_BIN):$(PATH) ./script/check_docker_compose.sh $(BEATS_VERSION)
238+
239+
.PHONY: check-package format-package build-package
240+
check-package: $(ELASTICPACKAGE)
241+
@for x in apmpackage/apm/*; do (cd $$x; echo "Checking $$x"; $(CURDIR)/$(ELASTICPACKAGE) check); done
242+
format-package: $(ELASTICPACKAGE)
243+
@for x in apmpackage/apm/*; do (cd $$x; echo "Formatting $$x"; $(CURDIR)/$(ELASTICPACKAGE) format); done
244+
build-package: $(ELASTICPACKAGE)
245+
@for x in apmpackage/apm/*; do (cd $$x; echo "Building $$x"; $(CURDIR)/$(ELASTICPACKAGE) build); done
234246

235247
.PHONY: check-gofmt check-autopep8 gofmt autopep8
236248
check-fmt: check-gofmt check-autopep8
@@ -280,6 +292,9 @@ $(GOLICENSER): go.mod
280292
$(REVIEWDOG): go.mod
281293
$(GO) build -o $@ github.com/reviewdog/reviewdog/cmd/reviewdog
282294

295+
$(ELASTICPACKAGE): go.mod
296+
$(GO) build -o $@ github.com/elastic/elastic-package
297+
283298
$(PYTHON): $(PYTHON_BIN)
284299
$(PYTHON_BIN): $(PYTHON_BIN)/activate
285300
$(PYTHON_BIN)/activate: $(MAGE)

0 commit comments

Comments
 (0)