Skip to content

Commit d8d3837

Browse files
committed
update to get method name
1 parent 807fd56 commit d8d3837

File tree

2 files changed

+29
-5
lines changed
  • instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src

2 files changed

+29
-5
lines changed

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerCodeAttributesGetter.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public Class<?> getCodeClass(Object handler) {
2525
@Nullable
2626
@Override
2727
public String getMethodName(Object handler) {
28+
if (handler instanceof HandlerMethod) {
29+
HandlerMethod handlerMethod = (HandlerMethod) handler;
30+
return handlerMethod.getMethod().getName();
31+
}
2832
return "handle";
2933
}
3034
}

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/SpringWebfluxTest.java

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,11 @@ void basicGetTest(Parameter parameter) {
139139
span.hasKind(SpanKind.INTERNAL)
140140
.hasParent(trace.getSpan(0))
141141
.hasAttributesSatisfyingExactly(
142-
equalTo(CODE_FUNCTION, "handle"),
142+
satisfies(
143+
CODE_FUNCTION,
144+
parameter.annotatedMethod == null
145+
? val -> val.isEqualTo("handle")
146+
: val -> val.isEqualTo(parameter.annotatedMethod)),
143147
satisfies(
144148
CODE_NAMESPACE,
145149
parameter.annotatedMethod == null
@@ -259,7 +263,11 @@ void getAsyncResponseTest(Parameter parameter) {
259263
span.hasKind(SpanKind.INTERNAL)
260264
.hasParent(trace.getSpan(0))
261265
.hasAttributesSatisfyingExactly(
262-
equalTo(CODE_FUNCTION, "handle"),
266+
satisfies(
267+
CODE_FUNCTION,
268+
parameter.annotatedMethod == null
269+
? val -> val.isEqualTo("handle")
270+
: val -> val.isEqualTo(parameter.annotatedMethod)),
263271
satisfies(
264272
CODE_NAMESPACE,
265273
parameter.annotatedMethod == null
@@ -366,7 +374,11 @@ void createSpanDuringHandlerFunctionTest(Parameter parameter) {
366374
span.hasKind(SpanKind.INTERNAL)
367375
.hasParent(trace.getSpan(0))
368376
.hasAttributesSatisfyingExactly(
369-
equalTo(CODE_FUNCTION, "handle"),
377+
satisfies(
378+
CODE_FUNCTION,
379+
parameter.annotatedMethod == null
380+
? val -> val.isEqualTo("handle")
381+
: val -> val.isEqualTo(parameter.annotatedMethod)),
370382
satisfies(
371383
CODE_NAMESPACE,
372384
parameter.annotatedMethod == null
@@ -548,7 +560,11 @@ void getToBadEndpointTest(Parameter parameter) {
548560
EXCEPTION_STACKTRACE,
549561
val -> val.isInstanceOf(String.class))))
550562
.hasAttributesSatisfyingExactly(
551-
equalTo(CODE_FUNCTION, "handle"),
563+
satisfies(
564+
CODE_FUNCTION,
565+
parameter.annotatedMethod == null
566+
? val -> val.isEqualTo("handle")
567+
: val -> val.isEqualTo(parameter.annotatedMethod)),
552568
satisfies(
553569
CODE_NAMESPACE,
554570
parameter.annotatedMethod == null
@@ -695,7 +711,11 @@ void multipleGetsToDelayingRoute(Parameter parameter) {
695711
span.hasKind(SpanKind.INTERNAL)
696712
.hasParent(trace.getSpan(0))
697713
.hasAttributesSatisfyingExactly(
698-
equalTo(CODE_FUNCTION, "handle"),
714+
satisfies(
715+
CODE_FUNCTION,
716+
parameter.annotatedMethod == null
717+
? val -> val.isEqualTo("handle")
718+
: val -> val.isEqualTo(parameter.annotatedMethod)),
699719
satisfies(
700720
CODE_NAMESPACE,
701721
parameter.annotatedMethod == null

0 commit comments

Comments
 (0)