Skip to content
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.

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

Implement "Prometheus mode" for better micrometer->OTel->Prometheus support #4274

Merged
merged 2 commits into from
Mar 22, 2022

Conversation

mateuszrzeszutek
Copy link
Member

This PR copies open-telemetry/opentelemetry-java-instrumentation#5537 into this repo's micrometer shim.

@codecov
Copy link

codecov bot commented Mar 18, 2022

Codecov Report

Merging #4274 (c547325) into main (345060e) will decrease coverage by 0.06%.
The diff coverage is 83.33%.

@@             Coverage Diff              @@
##               main    #4274      +/-   ##
============================================
- Coverage     89.91%   89.85%   -0.07%     
- Complexity     4795     4830      +35     
============================================
  Files           568      569       +1     
  Lines         14909    15034     +125     
  Branches       1414     1428      +14     
============================================
+ Hits          13406    13509     +103     
- Misses         1045     1059      +14     
- Partials        458      466       +8     
Impacted Files Coverage Δ
...rometer1shim/OpenTelemetryDistributionSummary.java 85.41% <0.00%> (ø)
...icrometer1shim/PrometheusModeNamingConvention.java 77.77% <77.77%> (ø)
...ry/micrometer1shim/OpenTelemetryMeterRegistry.java 94.87% <100.00%> (ø)
...ometer1shim/OpenTelemetryMeterRegistryBuilder.java 100.00% <100.00%> (ø)
...ntelemetry/micrometer1shim/OpenTelemetryTimer.java 88.46% <100.00%> (+1.92%) ⬆️
...entelemetry/exporter/jaeger/PostSpansResponse.java 0.00% <0.00%> (-100.00%) ⬇️
...trace/jaeger/sampler/OkHttpGrpcServiceBuilder.java 76.19% <0.00%> (-9.00%) ⬇️
...etry/exporter/prometheus/PrometheusHttpServer.java 72.34% <0.00%> (-5.32%) ⬇️
...exporter/jaeger/MarshalerCollectorServiceGrpc.java 85.71% <0.00%> (-4.77%) ⬇️
...race/jaeger/sampler/DefaultGrpcServiceBuilder.java 75.80% <0.00%> (-3.86%) ⬇️
... and 45 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 345060e...c547325. Read the comment docs.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only a NIT from me.

@jack-berg jack-berg merged commit 1a4fe14 into open-telemetry:main Mar 22, 2022
@mateuszrzeszutek mateuszrzeszutek deleted the prometheus-mode branch March 22, 2022 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants