Skip to content

Commit

Permalink
Double the number of processor build-and-test targets (open-telemetry…
Browse files Browse the repository at this point in the history
…#32526)

Description: Double the number of processor test groups so that new
tests can be added, e.g., the new tests in

open-telemetry#31946

Testing: These changes were applied in
open-telemetry#31946
and they appeared to help with spurious test timeouts.

Similar to
open-telemetry#32496
  • Loading branch information
jmacd committed May 1, 2024
1 parent 9c96d14 commit 36ffd33
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-and-test-windows.yml
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down Expand Up @@ -140,7 +141,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down Expand Up @@ -258,7 +260,8 @@ jobs:
- receiver-1
- receiver-2
- receiver-3
- processor
- processor-0
- processor-1
- exporter-0
- exporter-1
- exporter-2
Expand Down Expand Up @@ -357,7 +360,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
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)
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

0 comments on commit 36ffd33

Please sign in to comment.