diff --git a/api/payara-bom/pom.xml b/api/payara-bom/pom.xml
index fc9c7cc1dd7..0a582b3f96e 100644
--- a/api/payara-bom/pom.xml
+++ b/api/payara-bom/pom.xml
@@ -252,12 +252,6 @@
${opentelemetry.version}
provided
-
- io.opentelemetry
- opentelemetry-api-logs
- ${opentelemetry.alpha26.version}
- provided
-
io.opentelemetry
opentelemetry-sdk-extension-autoconfigure-spi
diff --git a/appserver/payara-appserver-modules/microprofile/telemetry/src/main/java/fish/payara/microprofile/telemetry/tracing/WithSpanMethodInterceptor.java b/appserver/payara-appserver-modules/microprofile/telemetry/src/main/java/fish/payara/microprofile/telemetry/tracing/WithSpanMethodInterceptor.java
index dbfc7d334f0..778a8058ce6 100644
--- a/appserver/payara-appserver-modules/microprofile/telemetry/src/main/java/fish/payara/microprofile/telemetry/tracing/WithSpanMethodInterceptor.java
+++ b/appserver/payara-appserver-modules/microprofile/telemetry/src/main/java/fish/payara/microprofile/telemetry/tracing/WithSpanMethodInterceptor.java
@@ -274,8 +274,13 @@ private boolean isWebServiceMethod(InvocationContext invocationContext, Invocati
private String getWithSpanValue(final InvocationContext invocationContext, final WithSpan withSpan) {
final String withSpanValue = withSpan.value();
if (withSpanValue.isEmpty()) {
- return invocationContext.getMethod().getDeclaringClass().getCanonicalName()
- + "." + invocationContext.getMethod().getName();
+ if (invocationContext.getMethod().getDeclaringClass().getName().contains("$")) {
+ return invocationContext.getMethod().getDeclaringClass().getSimpleName()
+ + "." + invocationContext.getMethod().getName();
+ } else {
+ return invocationContext.getMethod().getDeclaringClass().getCanonicalName()
+ + "." + invocationContext.getMethod().getName();
+ }
}
return withSpanValue;
}
diff --git a/appserver/tests/payara-samples/samples/opentelemetry/src/test/java/fish/payara/samples/otel/spanname/OpenTelemetryWithSpanIT.java b/appserver/tests/payara-samples/samples/opentelemetry/src/test/java/fish/payara/samples/otel/spanname/OpenTelemetryWithSpanIT.java
index dba27c137b6..ca53890a45f 100644
--- a/appserver/tests/payara-samples/samples/opentelemetry/src/test/java/fish/payara/samples/otel/spanname/OpenTelemetryWithSpanIT.java
+++ b/appserver/tests/payara-samples/samples/opentelemetry/src/test/java/fish/payara/samples/otel/spanname/OpenTelemetryWithSpanIT.java
@@ -138,7 +138,7 @@ public void spanChild() {
spanBean.spanChild();
var spans = exporter.getSpans();
assertEquals(2, spans.size());
- assertEquals("fish.payara.samples.otel.annotation.SpanBean.SpanChildBean.spanChild", spans.get(0).getName());
+ assertEquals("SpanChildBean.spanChild", spans.get(0).getName());
assertEquals("fish.payara.samples.otel.annotation.SpanBean.spanChild", spans.get(1).getName());
assertEquals(spans.get(0).getParentSpanId(), spans.get(1).getSpanId());
}
diff --git a/core/pom.xml b/core/pom.xml
index 8a06f0387c3..2aaddba9382 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -147,7 +147,6 @@
build-217-jenkins-16
1.29.0
1.29.0-alpha
- 1.26.0-alpha
7.4.0
1.64
3.0.0