diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-16cores.yaml b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-16cores.yaml index 9fb9048bbd..dabd1f7666 100644 --- a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-16cores.yaml +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-16cores.yaml @@ -4,8 +4,8 @@ from_template: variables: num_cores: 16 engine_core_range: "0-15" - loadgen_cores: 48 - loadgen_core_range: "16-63" + loadgen_cores: 32 + loadgen_core_range: "16-47" backend_cores: 16 - backend_core_range: "64-79" + backend_core_range: "48-63" max_batch_size: 512 diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-1core.yaml b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-1core.yaml index acb5d38a35..4dfb4eeb62 100644 --- a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-1core.yaml +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-1core.yaml @@ -4,8 +4,8 @@ from_template: variables: num_cores: 1 engine_core_range: "0-0" - loadgen_cores: 3 - loadgen_core_range: "1-3" + loadgen_cores: 2 + loadgen_core_range: "1-2" backend_cores: 1 - backend_core_range: "4-4" + backend_core_range: "3-3" max_batch_size: 512 diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-2cores.yaml b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-2cores.yaml index 9bcf8d06c6..57c7b9b224 100644 --- a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-2cores.yaml +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-2cores.yaml @@ -4,8 +4,8 @@ from_template: variables: num_cores: 2 engine_core_range: "0-1" - loadgen_cores: 6 - loadgen_core_range: "2-7" + loadgen_cores: 4 + loadgen_core_range: "2-5" backend_cores: 2 - backend_core_range: "8-9" + backend_core_range: "6-7" max_batch_size: 512 diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-32cores.yaml b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-32cores.yaml new file mode 100644 index 0000000000..f6b287816b --- /dev/null +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-32cores.yaml @@ -0,0 +1,11 @@ +# Saturation test with 32 core df_engine +from_template: + path: test_suites/integration/continuous/saturation-cores-template.yaml.j2 + variables: + num_cores: 32 + engine_core_range: "0-31" + loadgen_cores: 64 + loadgen_core_range: "32-95" + backend_cores: 32 + backend_core_range: "96-127" + max_batch_size: 512 diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-4cores.yaml b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-4cores.yaml index f2d078495a..42c4af9d4d 100644 --- a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-4cores.yaml +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-4cores.yaml @@ -4,8 +4,8 @@ from_template: variables: num_cores: 4 engine_core_range: "0-3" - loadgen_cores: 12 - loadgen_core_range: "4-15" + loadgen_cores: 8 + loadgen_core_range: "4-11" backend_cores: 4 - backend_core_range: "16-19" + backend_core_range: "12-15" max_batch_size: 512 diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-8cores.yaml b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-8cores.yaml index 99bbfa1751..5bbf396ce6 100644 --- a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-8cores.yaml +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-8cores.yaml @@ -4,8 +4,8 @@ from_template: variables: num_cores: 8 engine_core_range: "0-7" - loadgen_cores: 24 - loadgen_core_range: "8-31" + loadgen_cores: 16 + loadgen_core_range: "8-23" backend_cores: 8 - backend_core_range: "32-39" + backend_core_range: "24-31" max_batch_size: 512 diff --git a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-cores-template.yaml.j2 b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-cores-template.yaml.j2 index c28a034031..cf23c53d07 100644 --- a/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-cores-template.yaml.j2 +++ b/tools/pipeline_perf_test/test_suites/integration/continuous/saturation-cores-template.yaml.j2 @@ -78,3 +78,5 @@ tests: observation_interval: 60 signals_per_second: null # Using null means loadgen don't self-cap the rate. max_batch_size: {{max_batch_size}} + data_source: static + log_body_size_bytes: 1024 diff --git a/tools/pipeline_perf_test/test_suites/integration/templates/configs/loadgen/config.yaml.j2 b/tools/pipeline_perf_test/test_suites/integration/templates/configs/loadgen/config.yaml.j2 index 70405f2475..b6ccd79539 100644 --- a/tools/pipeline_perf_test/test_suites/integration/templates/configs/loadgen/config.yaml.j2 +++ b/tools/pipeline_perf_test/test_suites/integration/templates/configs/loadgen/config.yaml.j2 @@ -16,7 +16,7 @@ groups: receiver: type: "urn:otel:receiver:traffic_generator" config: - data_source: semantic_conventions + data_source: {{ data_source | default("semantic_conventions") }} generation_strategy: {{ generation_strategy | default("pre_generated") }} traffic_config: max_batch_size: {{ max_batch_size | default(1000) }} @@ -24,6 +24,7 @@ groups: metric_weight: {{ metric_weight | default(0) }} trace_weight: {{ trace_weight | default(0) }} log_weight: {{ log_weight | default(100) }} + {% if log_body_size_bytes is defined %}log_body_size_bytes: {{ log_body_size_bytes }}{% endif %} {%- set exporter_type = loadgen_exporter_type | default("otap") %} {%- set engine_host = engine_hostname | default("localhost") %} diff --git a/tools/pipeline_perf_test/test_suites/integration/templates/test_steps/df-loadgen-steps-docker.yaml b/tools/pipeline_perf_test/test_suites/integration/templates/test_steps/df-loadgen-steps-docker.yaml index 87301270d7..10331d9285 100644 --- a/tools/pipeline_perf_test/test_suites/integration/templates/test_steps/df-loadgen-steps-docker.yaml +++ b/tools/pipeline_perf_test/test_suites/integration/templates/test_steps/df-loadgen-steps-docker.yaml @@ -78,6 +78,8 @@ steps: # compression_method: zstd # Default is 'zstd' for otap, 'gzip' for otlp engine_hostname: df-engine loadgen_exporter_type: '{{loadgen_exporter_type}}' + data_source: {{data_source | default("semantic_conventions")}} + {% if log_body_size_bytes is defined %}log_body_size_bytes: {{log_body_size_bytes}}{% endif %} post: # Wait for the telemetry endpoint to be active (TODO: switch to healthcheck endpoint when available).