Merge upstream changes #6
Conversation
Closes: jupp0r#295
Control symbol visibility and add SONAME
Use bazel local defines
Code format
chore: Simplify external templates
This works around civetweb/civetweb#663
Fix symbol visibilities for CMake (and Bazel)
Use GitHub actions
Add three different insert strategies for the Registry. The `NonStandardAppend` is only there and selected for backward compatibility and most likely will go away in the future.
core: Add option to merge families
chore(doc): Add GitHub CI badge
Issue: jupp0r#293 Issue: jupp0r#526 Issue: jupp0r#531
``` before: BM_Registry_CreateFamily 49.2 ns 49.0 ns 11087352 BM_Registry_CreateCounter/0 165 ns 165 ns 4170191 BM_Registry_CreateCounter/1 1967 ns 1958 ns 556346 BM_Registry_CreateCounter/8 4280 ns 4269 ns 176711 BM_Registry_CreateCounter/64 27091 ns 27009 ns 25755 BM_Registry_CreateCounter/512 224201 ns 223581 ns 3023 BM_Registry_CreateCounter/4096 2056280 ns 2049876 ns 330 after: BM_Registry_CreateFamily 47.8 ns 47.8 ns 15131733 BM_Registry_CreateCounter/0 158 ns 158 ns 4295006 BM_Registry_CreateCounter/1 1009 ns 1009 ns 1169219 BM_Registry_CreateCounter/8 3238 ns 3231 ns 203179 BM_Registry_CreateCounter/64 25989 ns 25949 ns 27008 BM_Registry_CreateCounter/512 211288 ns 211220 ns 3265 BM_Registry_CreateCounter/4096 1960240 ns 1959743 ns 350 ``` Fixes: jupp0r#532
|
@jbangelo I wasn't 100% sure who should review this PR. I guess this repo is owned by the Orion team? |
|
I don't think we can reasonably review all of the upstream changes. @ljbade were there any conflicts that we should focus on? All I can see is commit d3847e5. Something else to consider, would it be cleaner to try and rebase our changes on top of the upstream master rather than merging in the upstream master. We'll end up in the same place, but it would make it a little more clear that we are simply adding a handful of modifications on top of the upstream rather than a massively divergent fork. |
|
@jbangelo yeah that might be an easier way to do this. There were a lot of merge conflicts because some of the code has been moved around. |
|
Replaced by #7 |
20 participants
Our fork of prometheus-cpp is fairly out of date and I want to use some of the fixes and improvements from upstream.