Let Prometheus exporter plugin support utf8 characters by DaanHoogland · Pull Request #8228 · apache/cloudstack

DaanHoogland · 2023-11-13T15:06:59Z

Description

This PR fixes a bug where the length of the httpresponse was set to the length of the contents before unicode conversion. Any non english character would break this.

Fixes: #8203

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

BLOCKER
Critical
Major
[x ] Minor
Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

in simulator,

the prometheus exporter was enabled
domains with names ééñ and 中文 were created
a curl done

cloudstack_domain_resource_count{domain="/", type="memory"} 0
cloudstack_domain_resource_count{domain="/", type="cpu"} 0
cloudstack_domain_resource_count{domain="/", type="primary_storage"} 0
cloudstack_domain_resource_count{domain="/", type="secondary_storage"} 4294967296
cloudstack_domain_resource_count{domain="/ééñ/", type="memory"} 0
cloudstack_domain_resource_count{domain="/ééñ/", type="cpu"} 0
cloudstack_domain_resource_count{domain="/ééñ/", type="primary_storage"} 0
cloudstack_domain_resource_count{domain="/ééñ/", type="secondary_storage"} 0
cloudstack_domain_resource_count{domain="/中文/", type="memory"} 0
cloudstack_domain_resource_count{domain="/中文/", type="cpu"} 0
cloudstack_domain_resource_count{domain="/中文/", type="primary_storage"} 0
cloudstack_domain_resource_count{domain="/中文/", type="secondary_storage"} 0

DaanHoogland · 2023-11-13T15:09:30Z

@blueorangutan package

blueorangutan · 2023-11-13T15:10:03Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

weizhouapache

code lgtm

blueorangutan · 2023-11-13T16:12:36Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7733

codecov · 2023-11-13T16:20:40Z

Codecov Report

Attention: 10 lines in your changes are missing coverage. Please review.

Comparison is base (b79e393) 13.09% compared to head (cab7dd4) 13.09%.
Report is 1 commits behind head on 4.18.

Files	Patch %	Lines
...oudstack/metrics/PrometheusExporterServerImpl.java	0.00%	10 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.18    #8228      +/-   ##
============================================
- Coverage     13.09%   13.09%   -0.01%     
  Complexity     9123     9123              
============================================
  Files          2720     2720              
  Lines        257627   257638      +11     
  Branches      40165    40168       +3     
============================================
  Hits          33746    33746              
- Misses       219616   219627      +11     
  Partials       4265     4265

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

harikrishna-patnala

Code LGTM

DaanHoogland · 2023-11-14T08:28:33Z

@blueorangutan test

blueorangutan · 2023-11-14T08:30:04Z

@DaanHoogland a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

DaanHoogland · 2023-11-14T08:33:35Z

tested by reporter: #8203 (comment)

DaanHoogland · 2023-11-14T09:29:23Z

@blueorangutan package

blueorangutan · 2023-11-14T09:30:03Z

@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2023-11-14T10:33:26Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7745

DaanHoogland · 2023-11-14T10:36:13Z

@blueorangutan LLtest alma8 vmware-70u3

blueorangutan · 2023-11-14T10:38:03Z

@DaanHoogland a [LL] Trillian-Jenkins test job (alma8 mgmt + vmware-70u3) has been kicked to run smoke tests

blueorangutan · 2023-11-14T23:19:15Z

[SF] Trillian test result (tid-8315)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 51855 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8228-t8315-kvm-centos7.zip
Smoke tests completed. 108 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_invalid_upgrade_kubernetes_cluster	`Failure`	3615.48	test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster	`Failure`	3617.11	test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster	`Failure`	0.05	test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	`Failure`	46.85	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	96.02	test_kubernetes_clusters.py

* 4.18: Fixed spelling and added missing states to response (#8248) Let Prometheus exporter plugin support utf8 characters (#8228)

* 4.18: Fixed spelling and added missing states to response (apache#8248) Let Prometheus exporter plugin support utf8 characters (apache#8228)

use length of bytearray after unicode conversion

1e88137

DaanHoogland requested review from kiranchavala and shwstppr November 13, 2023 15:07

DaanHoogland added type:bug Severity:Major component:prometheus labels Nov 13, 2023

DaanHoogland added this to the 4.18.2.0 milestone Nov 13, 2023

DaanHoogland mentioned this pull request Nov 13, 2023

Prometheus Plugin not support chinese characters #8203

Closed

DaanHoogland changed the title ~~use length of bytearray after unicode conversion~~ Let Prometheus exporter plugin support utf8 characters Nov 13, 2023

weizhouapache approved these changes Nov 13, 2023

View reviewed changes

harikrishna-patnala approved these changes Nov 14, 2023

View reviewed changes

DaanHoogland commented Nov 14, 2023

View reviewed changes

Comment thread ...ons/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java Outdated

added suggestion from @havengit in apache#8203

cab7dd4

DaanHoogland linked an issue Nov 14, 2023 that may be closed by this pull request

Prometheus Plugin not support chinese characters #8203

Closed

DaanHoogland merged commit 1a2dbeb into apache:4.18 Nov 15, 2023

DaanHoogland deleted the 8203-prometheus-plugin-support-utf8-characters branch November 15, 2023 08:48

DaanHoogland added a commit that referenced this pull request Nov 18, 2023

Merge release branch 4.18 to main

98d643e

* 4.18: Fixed spelling and added missing states to response (#8248) Let Prometheus exporter plugin support utf8 characters (#8228)

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Nov 29, 2023

Merge release branch 4.18 to main

61c58ef

* 4.18: Fixed spelling and added missing states to response (apache#8248) Let Prometheus exporter plugin support utf8 characters (apache#8228)

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jan 17, 2024

Let Prometheus exporter plugin support utf8 characters (apache#8228)

1469770

Uh oh!

Conversation

DaanHoogland commented Nov 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

DaanHoogland commented Nov 13, 2023

Uh oh!

blueorangutan commented Nov 13, 2023

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Nov 13, 2023

Uh oh!

codecov Bot commented Nov 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Nov 14, 2023

Uh oh!

blueorangutan commented Nov 14, 2023

Uh oh!

DaanHoogland commented Nov 14, 2023

Uh oh!

Uh oh!

DaanHoogland commented Nov 14, 2023

Uh oh!

blueorangutan commented Nov 14, 2023

Uh oh!

blueorangutan commented Nov 14, 2023

Uh oh!

DaanHoogland commented Nov 14, 2023

Uh oh!

blueorangutan commented Nov 14, 2023

Uh oh!

blueorangutan commented Nov 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DaanHoogland commented Nov 13, 2023 •

edited

Loading

codecov Bot commented Nov 13, 2023 •

edited

Loading