-
Notifications
You must be signed in to change notification settings - Fork 867
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
Micrometer instrumentation, part 3 #5017
Merged
mateuszrzeszutek
merged 4 commits into
open-telemetry:main
from
mateuszrzeszutek:micrometer-3
Jan 12, 2022
Merged
Micrometer instrumentation, part 3 #5017
mateuszrzeszutek
merged 4 commits into
open-telemetry:main
from
mateuszrzeszutek:micrometer-3
Jan 12, 2022
Conversation
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
mateuszrzeszutek
force-pushed
the
micrometer-3
branch
from
January 5, 2022 12:25
67d2a16
to
2813c60
Compare
mateuszrzeszutek
force-pushed
the
micrometer-3
branch
from
January 10, 2022 12:26
2813c60
to
36a2e16
Compare
anuraaga
approved these changes
Jan 12, 2022
trask
approved these changes
Jan 12, 2022
Comment on lines
+29
to
+33
// we're always locking lock on the whole instrument map; the add/remove methods aren't called | ||
// that often, so it's probably better to opt for correctness in that case - there is a small | ||
// window between removing a single measurement and removing the whole instrument (if it has no | ||
// more measurements) when potentially a new measurement could be added; a ConcurrentHashMap | ||
// wouldn't be enough in this case |
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.
thx
.../test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/LongTaskTimerTest.java
Outdated
Show resolved
Hide resolved
.../test/java/io/opentelemetry/javaagent/instrumentation/micrometer/v1_5/LongTaskTimerTest.java
Show resolved
Hide resolved
@@ -38,5 +39,13 @@ static String baseUnit(Meter.Id id) { | |||
return baseUnit == null ? "1" : baseUnit; | |||
} | |||
|
|||
static String statisticInstrumentName(Meter.Id id, Statistic statistic) { | |||
String prefix = id.getName() + "."; | |||
// use "total_time" instead of "total" to avoid clashing with Statistic.TOTAL |
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.
👍
RashmiRam
pushed a commit
to RashmiRam/opentelemetry-auto-instr-java
that referenced
this pull request
May 23, 2022
* Micrometer instrumentation, part 3 * fix compilation * add comment * code review comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Continuation of #5001
This PR includes the last missing instruments:
LongTaskTimer
andMeter
.