Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.vality</groupId>
<artifactId>service-parent-pom</artifactId>
<version>3.1.7</version>
<version>3.1.8</version>
</parent>

<artifactId>org-manager</artifactId>
Expand All @@ -29,14 +29,14 @@
<swag.organizations.version>1.38-8c9b968</swag.organizations.version>
<wiremock-jre8-standalone.version>2.32.0</wiremock-jre8-standalone.version>
<damsel.version>1.685-5c25c2e</damsel.version>
<shared-resources.version>3.0.1</shared-resources.version>
</properties>

<dependencies>
<!--vality-->
<dependency>
<groupId>dev.vality.woody</groupId>
<artifactId>woody-thrift</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
Expand Down Expand Up @@ -169,6 +169,11 @@
<version>2.0</version>
</dependency>

<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-semconv</artifactId>
<version>1.29.0-alpha</version>
</dependency>

<!--test-->
<dependency>
Expand Down
70 changes: 70 additions & 0 deletions src/main/java/dev/vality/orgmanager/config/OtelConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package dev.vality.orgmanager.config;

import dev.vality.orgmanager.config.properties.OtelProperties;
import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
import io.opentelemetry.sdk.trace.samplers.Sampler;
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.time.Duration;

@Slf4j
@Configuration
@ConditionalOnProperty(value = "otel.enabled", havingValue = "true", matchIfMissing = true)
@RequiredArgsConstructor
public class OtelConfig {

private final OtelProperties otelProperties;

@Value("${spring.application.name}")
private String applicationName;

@Bean
public OpenTelemetry openTelemetryConfig() {
var resource = Resource.getDefault()
.merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, applicationName)));
var sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(BatchSpanProcessor.builder(OtlpHttpSpanExporter.builder()
.setEndpoint(otelProperties.getResource())
.setTimeout(Duration.ofMillis(otelProperties.getTimeout()))
.build())
.build())
.setSampler(Sampler.alwaysOn())
.setResource(resource)
.build();
var openTelemetrySdk = OpenTelemetrySdk.builder()
.setTracerProvider(sdkTracerProvider)
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
.build();
registerGlobalOpenTelemetry(openTelemetrySdk);
return openTelemetrySdk;
}

private static void registerGlobalOpenTelemetry(OpenTelemetry openTelemetry) {
try {
GlobalOpenTelemetry.set(openTelemetry);
} catch (Throwable ex) {
log.warn("Please initialize the ObservabilitySdk before starting the application", ex);
GlobalOpenTelemetry.resetForTest();
try {
GlobalOpenTelemetry.set(openTelemetry);
} catch (Throwable ex1) {
log.warn("Unable to set GlobalOpenTelemetry", ex1);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package dev.vality.orgmanager.config.properties;

import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

@Getter
@Setter
@Component
@ConfigurationProperties(prefix = "otel")
public class OtelProperties {

private String resource;
private Long timeout;

}
5 changes: 5 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,8 @@ bouncer:

access-check:
enabled: false

otel:
resource: http://localhost:4318/v1/traces
timeout: 60000
enabled: false
Loading