Merge branch 'fix/ZSTAC-61988' into '5.5.12'

<fix>[telemetry]: fix Sentry transaction loss and add debug logging

See merge request zstackio/zstack!9220

Author: gitlab

build/pom.xml

@@ -731,9 +731,9 @@
             <groupId>io.sentry</groupId>
             <artifactId>sentry-opentelemetry-bootstrap</artifactId>
         </dependency>
-        <!-- Legacy semconv 1.23.1-alpha for top-level SemanticAttributes (sentry-opentelemetry-bootstrap) -->
+        <!-- Semconv 1.28.0-alpha: both legacy SemanticAttributes and new split classes for Sentry OTel -->
         <dependency>
-            <groupId>io.opentelemetry</groupId>
+            <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
         </dependency>
         <dependency>

core/pom.xml

@@ -167,11 +167,6 @@
             <groupId>io.opentelemetry.semconv</groupId>
             <artifactId>opentelemetry-semconv</artifactId>
         </dependency>
-        <!-- Legacy semconv (groupId io.opentelemetry) for SemanticAttributes at runtime (Sentry/OTel) -->
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-semconv</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.opentelemetry</groupId>
             <artifactId>opentelemetry-sdk-metrics</artifactId>

core/src/main/java/org/zstack/core/telemetry/SentryInitHelper.java

@@ -1,6 +1,7 @@
 package org.zstack.core.telemetry;
 
 import io.sentry.Sentry;
+import io.sentry.SentryLevel;
 import org.zstack.core.cloudbus.CloudBusGlobalProperty;
 import org.zstack.utils.Utils;
 import org.zstack.utils.logging.CLogger;
@@ -54,6 +55,42 @@ public static boolean initIfNeeded() {
                 Sentry.init(options -> {
                     options.setDsn(finalDsn);
                     options.setTracesSampleRate(tracesSampleRate);
+                    options.setMaxQueueSize(1000);
+                    if (TelemetryGlobalProperty.SENTRY_DEBUG) {
+                        options.setDebug(true);
+                        options.setDiagnosticLevel(SentryLevel.DEBUG);
+                        options.setLogger(new io.sentry.ILogger() {
+                            @Override
+                            public void log(SentryLevel level, String message, Object... args) {
+                                String formatted = args.length > 0 ? String.format(message, args) : message;
+                                switch (level) {
+                                    case ERROR: logger.warn("[Sentry] " + formatted); break;
+                                    case WARNING: logger.warn("[Sentry] " + formatted); break;
+                                    default: logger.info("[Sentry] " + formatted); break;
+                                }
+                            }
+
+                            @Override
+                            public void log(SentryLevel level, String message, Throwable throwable) {
+                                switch (level) {
+                                    case ERROR: logger.warn("[Sentry] " + message, throwable); break;
+                                    case WARNING: logger.warn("[Sentry] " + message, throwable); break;
+                                    default: logger.info("[Sentry] " + message, throwable); break;
+                                }
+                            }
+
+                            @Override
+                            public void log(SentryLevel level, Throwable throwable, String message, Object... args) {
+                                String formatted = args.length > 0 ? String.format(message, args) : message;
+                                log(level, formatted, throwable);
+                            }
+
+                            @Override
+                            public boolean isEnabled(SentryLevel level) {
+                                return true;
+                            }
+                        });
+                    }
                 });
                 logger.info("Sentry initialized (tracesSampleRate=" + tracesSampleRate + ")");
                 return true;

core/src/main/java/org/zstack/core/telemetry/TelemetryGlobalProperty.java

@@ -147,6 +147,12 @@ public class TelemetryGlobalProperty {
     @GlobalProperty(name = "Telemetry.shutdownTimeoutMs", defaultValue = "10000")
     public static int SHUTDOWN_TIMEOUT_MS;
 
+    /**
+     * Enable Sentry SDK debug logging (outputs to management-server.log via log4j).
+     */
+    @GlobalProperty(name = "Telemetry.sentryDebug", defaultValue = "false")
+    public static boolean SENTRY_DEBUG;
+
     /**
      * Environment types enumeration
      */

pom.xml

@@ -550,17 +550,11 @@
                 <artifactId>opentelemetry-context</artifactId>
                 <version>1.35.0</version>
             </dependency>
-            <!-- OpenTelemetry Semconv (1.37+ has UrlAttributes required by Sentry OpenTelemetryAttributesExtractor) -->
+            <!-- OpenTelemetry Semconv 1.28.0-alpha: has both legacy SemanticAttributes (top-level) and new split classes (UrlAttributes/HttpAttributes/ServerAttributes) required by sentry-opentelemetry-core 8.16 -->
             <dependency>
                 <groupId>io.opentelemetry.semconv</groupId>
                 <artifactId>opentelemetry-semconv</artifactId>
-                <version>1.37.0</version>
-            </dependency>
-            <!-- Legacy semconv (groupId io.opentelemetry): 1.23.1-alpha has top-level io.opentelemetry.semconv.SemanticAttributes required by sentry-opentelemetry-bootstrap at runtime -->
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-semconv</artifactId>
-                <version>1.23.1-alpha</version>
+                <version>1.28.0-alpha</version>
             </dependency>
             <!-- OpenTelemetry SDK Metrics -->
             <dependency>