Skip to content

Add client ID to metrics #1831

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

Merged
gbanasiak merged 1 commit into from
Mar 14, 2024
Merged

Add client ID to metrics #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion esrally/driver/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,12 +1025,14 @@ def __call__(self, raw_samples):
for idx, sample in enumerate(raw_samples):
if idx % self.downsample_factor == 0:
final_sample_count += 1
client_id_meta_data = {"client_id": sample.client_id}
meta_data = self.merge(
self.track_meta_data,
self.challenge_meta_data,
sample.operation_meta_data,
sample.task.meta_data,
sample.request_meta_data,
client_id_meta_data,
)

self.metrics_store.put_value_cluster_level(
Expand Down Expand Up @@ -1083,7 +1085,7 @@ def __call__(self, raw_samples):
sample_type=timing.sample_type,
absolute_time=timing.absolute_time,
relative_time=timing.relative_time,
meta_data=timing.request_meta_data,
meta_data=self.merge(timing.request_meta_data, client_id_meta_data),
)

end = time.perf_counter()
Expand Down
35 changes: 18 additions & 17 deletions tests/driver/driver_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,14 @@ def test_all_samples(self, metrics_store):
]

post_process(samples)

meta_data = {"client_id": 0}
calls = [
self.latency(38598, 24, 10.0),
self.service_time(38598, 24, 7.0),
self.processing_time(38598, 24, 9.0),
self.latency(38599, 25, 10.0),
self.service_time(38599, 25, 7.0),
self.processing_time(38599, 25, 9.0),
self.latency(38598, 24, 10.0, meta_data),
self.service_time(38598, 24, 7.0, meta_data),
self.processing_time(38598, 24, 9.0, meta_data),
self.latency(38599, 25, 10.0, meta_data),
self.service_time(38599, 25, 7.0, meta_data),
self.processing_time(38599, 25, 9.0, meta_data),
self.throughput(38598, 24, 5000),
self.throughput(38599, 25, 5000),
]
Expand All @@ -432,12 +432,12 @@ def test_downsamples(self, metrics_store):
]

post_process(samples)

meta_data = {"client_id": 0}
calls = [
# only the first out of two request samples is included, throughput metrics are still complete
self.latency(38598, 24, 10.0),
self.service_time(38598, 24, 7.0),
self.processing_time(38598, 24, 9.0),
self.latency(38598, 24, 10.0, meta_data),
self.service_time(38598, 24, 7.0, meta_data),
self.processing_time(38598, 24, 9.0, meta_data),
self.throughput(38598, 24, 5000),
self.throughput(38599, 25, 5000),
]
Expand Down Expand Up @@ -491,14 +491,15 @@ def test_dependent_samples(self, metrics_store):
]

post_process(samples)
meta_data = {"meta_key": "meta_value"}
meta_data = {"client_id": 0}
meta_data_with_key = {"client_id": 0, "meta_key": "meta_value"}
calls = [
self.latency(38598, 24, 10.0),
self.service_time(38598, 24, 7.0),
self.processing_time(38598, 24, 9.0),
self.latency(38598, 24, 10.0, meta_data),
self.service_time(38598, 24, 7.0, meta_data),
self.processing_time(38598, 24, 9.0, meta_data),
# dependent timings
self.service_time(38601, 25, 50.0, meta_data),
self.service_time(38602, 26, 80.0, meta_data),
self.service_time(38601, 25, 50.0, meta_data_with_key),
self.service_time(38602, 26, 80.0, meta_data_with_key),
# we don't currently calculate dependent throughput
self.throughput(38598, 24, 5000),
]
Expand Down