Merge remote-tracking branch 'upstream/FISH-7278-MicroProfile-6.1' in…

…to FISH-7776-adding-last-version-of-mp-specs-6.1
payara · Oct 5, 2023 · da984fe · da984fe
2 parents 24d3f2c + 5a750a9
commit da984fe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/api/payara-bom/pom.xml b/api/payara-bom/pom.xml
@@ -252,12 +252,6 @@
                 <version>${opentelemetry.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-api-logs</artifactId>
-                <version>${opentelemetry.alpha26.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>io.opentelemetry</groupId>
                 <artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>

diff --git a/...y/src/main/java/fish/payara/microprofile/telemetry/tracing/WithSpanMethodInterceptor.java b/...y/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/...pentelemetry/src/test/java/fish/payara/samples/otel/spanname/OpenTelemetryWithSpanIT.java b/...pentelemetry/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
@@ -147,7 +147,6 @@
         <trilead-ssh2.version>build-217-jenkins-16</trilead-ssh2.version>
         <opentelemetry.version>1.29.0</opentelemetry.version>
         <opentelemetry.alpha.version>1.29.0-alpha</opentelemetry.alpha.version>
-        <opentelemetry.alpha26.version>1.26.0-alpha</opentelemetry.alpha26.version>
         <testng.version>7.4.0</testng.version>
         <bouncycastle-jdk15on.version>1.64</bouncycastle-jdk15on.version>
         <jsftemplating.version>3.0.0</jsftemplating.version>