Addition of pcp2opentelemetry tool #1972
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| QA output created by 1827 | ||
| pcp2openmetrics invocation | ||
| pcp2openmetrics HTTP POST (sorted): | ||
| INFO:root:Starting httpd... | ||
|
|
||
| INFO:root:POST request, | ||
| Path: / | ||
| Headers: | ||
| Host: localhost:PORT | ||
| User-Agent: python-requests VERSION | ||
| Accept: */* | ||
| Content-Type: application/openmetrics-text | ||
| Content-Length: SIZE | ||
|
|
||
|
|
||
|
|
||
| Body: | ||
| # PCP5 hinv_ncpu 60.0.32 u32 PM_INDOM_NULL discrete | ||
| # HELP hinv_ncpu b'number of CPUs in the system' | ||
| # TYPE hinv_ncpu gauge | ||
| hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="linux"} N (cpus) | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| #!/bin/sh | ||
| # PCP QA Test No. 1827 | ||
| # Exercise pcp2opentelemetry HTTP POST functionality. | ||
| # | ||
| # Copyright (c) 2024 Red Hat. All Rights Reserved. | ||
| # | ||
|
|
||
|
|
||
| seq=`basename $0` | ||
| echo "QA output created by $seq" | ||
|
|
||
| . ./common.python | ||
|
|
||
| which pcp2opentelemetry >/dev/null 2>&1 || _notrun "pcp2opentelemetry not installed" | ||
|
|
||
|
|
||
| _cleanup() | ||
| { | ||
| cd $here | ||
| $sudo rm -rf $tmp $tmp.* | ||
| } | ||
|
|
||
| status=0 # success is the default! | ||
| cpus=`pmprobe -v hinv.ncpu | awk '{print $3}'` | ||
| hostname=`hostname` | ||
| machineid=`_machine_id` | ||
| domainid=`_domain_name` | ||
| $sudo rm -rf $tmp $tmp.* $seq.full | ||
| trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
|
|
||
| _filter_pcp2opentelemetry_http() | ||
| { | ||
| tee -a $here/$seq.full \ | ||
| | col -b \ | ||
| | sed \ | ||
| -e '/\"asDouble\":/ s/[0-9][0-9]*/NCPU/' \ | ||
| -e 's/\"'$machineid'\"/MACHINEID/' \ | ||
| -e 's/\"'$hostname'\"/HOSTNAME/' \ | ||
| -e 's/\"'$domainid'\"/DOMAINID/' \ | ||
| -e 's/\"agent\": .*/\"agent\": \"'$OSTYPE'\"/' \ | ||
| -e 's/\"startTimeUnixNano\": .*/\"startTimeUnixNano\": TIME/' \ | ||
| -e 's/\"userid\": .*/\"userid\": USERID/' \ | ||
| -e 's/\"userid\": .*/\"userid\": GROUPID/' \ | ||
| -e '/HTTP/d' | ||
| } >> $tmp.python2.out | ||
|
|
||
|
There was a problem hiding this comment. since this pattern is repeated in three or four tests now, let's make a _filter_python_http_reponse shell function in one of the qa/common.xxx files and share it. There was a problem hiding this comment. @natoscott should this go in a specific common.xxx file or make a new one? There was a problem hiding this comment. @lmchilton lets put it in common.python |
||
|
|
||
| # real QA test starts here | ||
| port=`_find_free_port` | ||
| $PCP_PYTHON_PROG $here/src/pythonserver.py $port >$tmp.python.out 2>&1 & | ||
| pid=$! | ||
| sleep 2 # let server start up | ||
|
|
||
|
|
||
| echo "pcp2opentelemetry invocation" | tee -a $here/$seq.full | ||
| pcp2opentelemetry -s1 -u http://localhost:$port/receive hinv.ncpu >$tmp.json.out 2>$tmp.openjson.err | ||
|
|
||
|
|
||
| echo "pcp2opentelemetry HTTP POST (sorted):" | ||
| _filter_pcp2opentelemetry_http <$tmp.python.out | ||
| _check_http_filter <$tmp.python2.out | ||
|
|
||
|
|
||
| # terminate pythonserver.py now | ||
| pmsignal $pid >/dev/null 2>&1 | ||
|
|
||
| # success, all done | ||
| exit | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to upgrade your PCP python installation (./Makepkgs FTW) - this b'...' issue will be resolved then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@natoscott I upgraded the packages, ran configure and make and still the b' issue was still there when I re ran the test?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hmm, that is a mystery - its definitely fixed for me (and in CI). I wonder if somehow an older version of the python library is being found somewhere on your system, unexpectedly.