Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Double the number of processor build-and-test targets #32526

Merged
merged 5 commits into from
May 1, 2024
Merged

Double the number of processor build-and-test targets #32526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01ed9c2
Double the number of processor build-and-test groups
jmacd Apr 18, 2024
f4e307a
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Apr 23, 2024
48bf731
Merge branch 'main' into jmacd/double_processor_groups
jmacd Apr 23, 2024
e65520e
Merge branch 'main' into jmacd/double_processor_groups
jmacd Apr 24, 2024
fe6d075
Merge branch 'main' into jmacd/double_processor_groups
jmacd Apr 24, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down Expand Up @@ -141,7 +142,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down Expand Up @@ -259,7 +261,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down Expand Up @@ -355,7 +358,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down
15 changes: 14 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ RECEIVER_MODS_1 := $(shell find ./receiver/[g-o]* $(FIND_MOD_ARGS) -exec $(TO_MO
RECEIVER_MODS_2 := $(shell find ./receiver/[p]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) ) # Prometheus is special and gets its own section.
RECEIVER_MODS_3 := $(shell find ./receiver/[q-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
RECEIVER_MODS := $(RECEIVER_MODS_0) $(RECEIVER_MODS_1) $(RECEIVER_MODS_2) $(RECEIVER_MODS_3)
PROCESSOR_MODS := $(shell find ./processor/* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
PROCESSOR_MODS_0 := $(shell find ./processor/[a-o]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
PROCESSOR_MODS_1 := $(shell find ./processor/[p-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
PROCESSOR_MODS := $(PROCESSOR_MODS_0) $(PROCESSOR_MODS_1)
Comment on lines +32 to +33
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This gives an 12/11 breakdown.

EXPORTER_MODS_0 := $(shell find ./exporter/[a-m]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXPORTER_MODS_1 := $(shell find ./exporter/[n-z]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXPORTER_MODS := $(EXPORTER_MODS_0) $(EXPORTER_MODS_1)
EXPORTER_MODS_0 := $(shell find ./exporter/[a-c]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXPORTER_MODS_1 := $(shell find ./exporter/[d-i]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
EXPORTER_MODS_2 := $(shell find ./exporter/[k-o]* $(FIND_MOD_ARGS) -exec $(TO_MOD_DIR) )
Expand Down Expand Up @@ -62,6 +67,8 @@ all-groups:
@echo "\nreceiver-2: $(RECEIVER_MODS_2)"
@echo "\nreceiver-3: $(RECEIVER_MODS_3)"
@echo "\nreceiver: $(RECEIVER_MODS)"
@echo "\nprocessor-0: $(PROCESSOR_MODS_0)"
@echo "\nprocessor-1: $(PROCESSOR_MODS_1)"
@echo "\nprocessor: $(PROCESSOR_MODS)"
@echo "\nexporter-0: $(EXPORTER_MODS_0)"
@echo "\nexporter-1: $(EXPORTER_MODS_1)"
Expand Down Expand Up @@ -190,6 +197,12 @@ for-receiver-3-target: $(RECEIVER_MODS_3)
.PHONY: for-processor-target
for-processor-target: $(PROCESSOR_MODS)

.PHONY: for-processor-0-target
for-processor-0-target: $(PROCESSOR_MODS_0)

.PHONY: for-processor-1-target
for-processor-1-target: $(PROCESSOR_MODS_1)

.PHONY: for-exporter-target
for-exporter-target: $(EXPORTER_MODS)

Expand Down