Skip to content

Commit

Permalink
upgrade OTEL exporter to stable version
Browse files Browse the repository at this point in the history
  • Loading branch information
swaroopar committed Oct 14, 2024
1 parent c185dc2 commit 8824937
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<logbook.version>3.9.0</logbook.version>
<nimbusds.oidc.sdk.version>11.20</nimbusds.oidc.sdk.version>
<lombok.version>1.18.30</lombok.version>
<opentelemetry.version>1.32.0</opentelemetry.version>
<opentelemetry.version>2.8.0</opentelemetry.version>
<eclipse.dash.tool.plugin>1.1.0</eclipse.dash.tool.plugin>
<jgit.version>7.0.0.202409031743-r</jgit.version>
<semver4j.version>5.4.0</semver4j.version>
Expand Down Expand Up @@ -108,7 +108,7 @@
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-spring-boot-starter</artifactId>
<version>${opentelemetry.version}-alpha</version>
<version>${opentelemetry.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application-opentelemetry.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@
</Pattern>
</encoder>
</appender>
<springProfile name="opentelemetry">
<appender name="OpenTelemetry" class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
</appender>
<logger additivity="false" level="info" name="org.eclipse.xpanse">
<appender-ref ref="OpenTelemetry"/>
</logger>
<root level="error">
<appender-ref ref="OpenTelemetry"/>
</root>
</springProfile>

<logger additivity="false" level="info" name="org.eclipse.xpanse">
<appender-ref ref="Console"/>
</logger>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8824937

Please sign in to comment.