Skip to content

Commit

Permalink
Merge pull request #696 from fomars/develop
Browse files Browse the repository at this point in the history
fix jmeter data processing
  • Loading branch information
fomars committed Dec 19, 2018
2 parents fc93c97 + b1459bd commit a518e5f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions yandextank/plugins/JMeter/reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,10 @@ def fix_latency(row):

# timeStamp,elapsed,label,responseCode,success,bytes,grpThreads,allThreads,Latency
def string_to_df(data):
chunk = pd.read_csv(
StringIO(data), sep='\t', names=jtl_columns, dtype=jtl_types)
chunk = pd.read_csv(StringIO(data),
sep='\t',
names=jtl_columns, dtype=jtl_types,
keep_default_na=False)
chunk["receive_ts"] = (chunk["send_ts"] + chunk['interval_real']) / 1000.0
chunk['receive_sec'] = chunk["receive_ts"].astype(np.int64)
chunk['interval_real'] = chunk["interval_real"] * 1000 # convert to µs
Expand Down Expand Up @@ -183,7 +185,6 @@ def _read_jtl_chunk(self, jtl):
self.buffer = parts[1]
df = string_to_df(ready_chunk)
self.stat_queue.put(df)

return df
else:
self.buffer += parts[0]
Expand Down

0 comments on commit a518e5f

Please sign in to comment.