diff --git a/pom.xml b/pom.xml index d528c56..0cf8a43 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.9.0 11.20 1.18.30 - 1.32.0 + 2.8.0 1.1.0 7.0.0.202409031743-r 5.4.0 @@ -108,7 +108,7 @@ io.opentelemetry.instrumentation opentelemetry-spring-boot-starter - ${opentelemetry.version}-alpha + ${opentelemetry.version} org.eclipse.jgit diff --git a/src/main/resources/application-opentelemetry.properties b/src/main/resources/application-opentelemetry.properties index e40d3ad..da39cf9 100644 --- a/src/main/resources/application-opentelemetry.properties +++ b/src/main/resources/application-opentelemetry.properties @@ -2,5 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 # SPDX-FileCopyrightText: Huawei Inc. # -otel.exporter.otlp.endpoint=http://localhost:4317 -otel.exporter.otlp.enabled=true +otel.exporter.otlp.endpoint=http://localhost:4318 +otel.sdk.disabled=false diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f4c0c08..1280881 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,7 +11,7 @@ http.logging.exclude.uri=/v3/**,/swagger-ui/**,/favicon.ico,/h2-console/** log.opentofu.stdout.stderr=true opentofu.binary.location= opentofu.log.level=INFO -otel.exporter.otlp.enabled=false +otel.sdk.disabled=true opentofu.root.module.directory= deployment.clean.workspace.enabled=true spring.retry.max-attempts=3 diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index d38a068..af6b788 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -14,17 +14,6 @@ - - - - - - - - - - - diff --git a/src/test/java/org/eclipse/xpanse/tofu/maker/opentofu/tool/OpenTofuInstallerTest.java b/src/test/java/org/eclipse/xpanse/tofu/maker/opentofu/tool/OpenTofuInstallerTest.java index f4cd1fa..0957a07 100644 --- a/src/test/java/org/eclipse/xpanse/tofu/maker/opentofu/tool/OpenTofuInstallerTest.java +++ b/src/test/java/org/eclipse/xpanse/tofu/maker/opentofu/tool/OpenTofuInstallerTest.java @@ -5,12 +5,19 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.annotation.Resource; + import java.io.File; + import org.eclipse.xpanse.tofu.maker.models.exceptions.InvalidOpenTofuToolException; +import org.eclipse.xpanse.tofu.maker.opentofu.utils.SystemCmd; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest +@SpringBootTest(classes = {OpenTofuInstaller.class, + OpenTofuVersionsHelper.class, + OpenTofuVersionsCache.class, + OpenTofuVersionsFetcher.class, + SystemCmd.class}) class OpenTofuInstallerTest { @Resource