4.x Add support for @SpanAttribute annotation, use entire path for REST resource span name
#8216
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
Signed-off-by: Tim Quinn <tim.quinn@oracle.com>
oracle-contributor-agreement
bot
added
the
OCA Verified
tjquinno
requested review from
spericas,
dalexandrov,
tomas-langer and
ljnelson
ljnelson
reviewed
Jan 11, 2024
...lemetry/src/main/java/io/helidon/microprofile/telemetry/HelidonTelemetryContainerFilter.java
Outdated
Show resolved
Hide resolved
ljnelson
reviewed
Jan 11, 2024
| if (app == null) { | ||
| return ""; | ||
| } | ||
| ApplicationPath applicationPath = getRealClass(app.getClass()).getAnnotation(ApplicationPath.class); |
There was a problem hiding this comment.
Since you've already used things like ExtendedUriInfo maybe there's a Jersey class that will give you whatever the @ApplicationPath annotation ends up setting indirectly?
There was a problem hiding this comment.
I didn't see a way to do that, after quite some looking.
If you have a specific suggestion I'd welcome it but I didn't find a way to do what you suggested. The security code Tomas pointed to (in internal Slack) uses the same technique to get the Application.
ljnelson
requested changes
Jan 11, 2024
Comment on lines
93
to
103
| if (paramType.isAssignableFrom(String.class)) { | ||
| spanBuilder.setAttribute(attrName, (String) pValue); | ||
| } else if (paramType.isAssignableFrom(long.class) || paramType.isAssignableFrom(Long.class)) { | ||
| spanBuilder.setAttribute(attrName, (long) pValue); | ||
| } else if (paramType.isAssignableFrom(double.class) || paramType.isAssignableFrom(Double.class)) { | ||
| spanBuilder.setAttribute(attrName, (double) pValue); | ||
| } else if (paramType.isAssignableFrom(boolean.class) || paramType.isAssignableFrom(Boolean.class)) { | ||
| spanBuilder.setAttribute(attrName, (boolean) pValue); | ||
| } else { | ||
| spanBuilder.setAttribute(attrName, pValue.toString()); | ||
| } |
There was a problem hiding this comment.
I'm pretty sure these are backwards. You want String.class.isAssignableFrom(paramType). Or you want to do something like:
switch (paramType) {
case Class<?> x when Long.class.isAssignableFrom(paramType): // this may? work for primitives too? can't remember if autoboxing kicks in?
spanBuilder.setAttribute(attrName, x.cast(pValue));
break;
case Class<?> x when Double.class.isAssignableFrom(paramType):
spanBuilder.setAttribute(attrName, x.cast(pValue));
break;
case Class<?> x when Boolean.class.isAssignableFrom(paramType):
spanBuilder.setAttribute(attrName, x.cast(pValue));
break;
default:
spanBuilder.setAttribute(attrName, pValue.toString());
break;
}
There was a problem hiding this comment.
Ah, yes. Fixed.
We could use the switch-case-with-break approach but I chose to stay with the if-then-else-if because to me at least it's slightly clearer.
microprofile/telemetry/src/main/java/io/helidon/microprofile/telemetry/WithSpanInterceptor.java
Show resolved
Hide resolved
ljnelson
previously approved these changes
Jan 11, 2024
… name to pass TCK tests that do not expect it
tjquinno
changed the title
@SpanAttribute annotation@SpanAttribute annotation, use entire path for REST resource span name
… update separate tests now that our filter correctly precedes the path with a slash
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.
Description
Resolves #8157
Resolves #8162
Highlights:
WithSpanInterceptorso it also processes@SpanAttributeannotations.Documentation
Bug fix; no doc impact.