This is an automated email from the ASF dual-hosted git repository. DaanHoogland pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fb5e24fa086880b0b3058278c0878ef404af0e59 Merge: 5ed4894e97b d5101b0c905 Author: Daan Hoogland <[email protected]> AuthorDate: Mon Jun 29 15:42:25 2026 +0200 Merge branch '4.22' .../src/main/java/com/cloud/usage/dao/UsageJobDaoImpl.java | 8 +------- .../spring/lifecycle/CloudStackExtendedLifeCycle.java | 3 ++- .../spring/module/model/impl/DefaultModuleDefinitionSet.java | 12 ++++-------- pom.xml | 12 ++++++++++++ server/pom.xml | 8 ++++++++ server/src/main/java/com/cloud/api/ApiServer.java | 8 ++++++++ server/src/main/java/com/cloud/server/StatsCollector.java | 12 +++++++++++- tools/docker/supervisord.conf | 1 + ui/src/components/view/ImageDeployInstanceButton.vue | 5 +++-- ui/src/views/compute/wizard/VnfNicsSelection.vue | 2 +- 10 files changed, 51 insertions(+), 20 deletions(-) diff --cc pom.xml index 38a559ba831,8392a099b57..cc14a86fb8b --- a/pom.xml +++ b/pom.xml @@@ -195,7 -189,8 +195,9 @@@ <cs.ini.version>0.5.4</cs.ini.version> <cs.caffeine.version>3.1.7</cs.caffeine.version> <cs.protobuf.version>3.25.5</cs.protobuf.version> + <cs.minio.version>8.6.0</cs.minio.version> + <cs.opentelemetry.version>1.51.0</cs.opentelemetry.version> + <cs.opentelemetry-instrumentation.version>2.16.0</cs.opentelemetry-instrumentation.version> </properties> <distributionManagement> diff --cc server/pom.xml index 2b35a0f42ac,19cc0ca4583..2698f1264ac --- a/server/pom.xml +++ b/server/pom.xml @@@ -194,9 -194,17 +194,17 @@@ <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-extensions</artifactId> - <version>4.22.2.0-SNAPSHOT</version> + <version>4.23.0.0-SNAPSHOT</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>io.opentelemetry.instrumentation</groupId> + <artifactId>opentelemetry-instrumentation-annotations</artifactId> + </dependency> + <dependency> + <groupId>io.opentelemetry</groupId> + <artifactId>opentelemetry-api</artifactId> + </dependency> </dependencies> <build> <plugins> diff --cc server/src/main/java/com/cloud/api/ApiServer.java index 1bda053ec19,e3a64649078..1aaf593a8da --- a/server/src/main/java/com/cloud/api/ApiServer.java +++ b/server/src/main/java/com/cloud/api/ApiServer.java @@@ -62,10 -58,19 +62,13 @@@ import javax.naming.ConfigurationExcept import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; + import io.opentelemetry.api.trace.Span; + import io.opentelemetry.instrumentation.annotations.WithSpan; + -import com.cloud.cluster.ManagementServerHostVO; -import com.cloud.cluster.dao.ManagementServerHostDao; -import com.cloud.user.Account; -import com.cloud.user.AccountManager; -import com.cloud.user.AccountManagerImpl; -import com.cloud.user.DomainManager; -import com.cloud.user.User; -import com.cloud.user.UserAccount; -import com.cloud.user.UserVO; import org.apache.cloudstack.acl.APIChecker; +import org.apache.cloudstack.acl.ApiKeyPairManagerImpl; +import org.apache.cloudstack.acl.apikeypair.ApiKeyPair; +import org.apache.cloudstack.acl.apikeypair.ApiKeyPairPermission; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode;
