Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(EUM-server): Add conversion-service to EUM server #1346

Merged
merged 2 commits into from
Mar 9, 2022
Merged

fix(EUM-server): Add conversion-service to EUM server #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42cd24b
Add conversionService to EUM-Server
aaronweissler Mar 7, 2022
ad3b064
Refactor Conditional annotations
aaronweissler Mar 7, 2022
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
7 changes: 7 additions & 0 deletions ...-server/src/main/java/rocks/inspectit/oce/eum/server/configuration/BeanConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import io.opencensus.stats.ViewManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.ConversionService;
import rocks.inspectit.ocelot.config.conversion.InspectitConfigConversionService;

import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -38,4 +40,9 @@ public ViewManager viewManager() {
public ScheduledExecutorService scheduledExecutor() {
return Executors.newScheduledThreadPool(4);
}

@Bean("conversionService")
public ConversionService getConversionService() {
return InspectitConfigConversionService.getInstance();
}
}
4 changes: 3 additions & 1 deletion ...ver/src/main/java/rocks/inspectit/oce/eum/server/exporters/beacon/BeaconHttpExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component;
import rocks.inspectit.oce.eum.server.beacon.Beacon;
import rocks.inspectit.oce.eum.server.configuration.model.BeaconHttpExporterSettings;
Expand All @@ -17,7 +18,8 @@
*/
@Component
@Slf4j
@ConditionalOnExpression("NOT new String('${inspectit-eum-server.exporters.beacons.http.enabled}').equals('DISABLED')")
@ConditionalOnProperty({"inspectit-eum-server.exporters.beacons.http.enabled"})
@ConditionalOnExpression("NOT new String('${inspectit-eum-server.exporters.beacons.http.enabled}').toUpperCase().equals(T(rocks.inspectit.ocelot.config.model.exporters.ExporterEnabledState).DISABLED.toString())")
public class BeaconHttpExporter {

/**
Expand Down
4 changes: 3 additions & 1 deletion ...er/src/main/java/rocks/inspectit/oce/eum/server/exporters/beacon/ExportWorkerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -28,7 +29,8 @@
*/
@Slf4j
@Component
@ConditionalOnExpression("NOT new String('${inspectit-eum-server.exporters.beacons.http.enabled}').equals('DISABLED')")
@ConditionalOnProperty({"inspectit-eum-server.exporters.beacons.http.enabled"})
@ConditionalOnExpression("NOT new String('${inspectit-eum-server.exporters.beacons.http.enabled}').toUpperCase().equals(T(rocks.inspectit.ocelot.config.model.exporters.ExporterEnabledState).DISABLED.toString())")
public class ExportWorkerFactory {

/**
Expand Down
2 changes: 1 addition & 1 deletion ...a/rocks/inspectit/oce/eum/server/exporters/configuration/TraceExportersConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void logWrongJaegerConfig() {

@Bean(destroyMethod = "shutdown")
@ConditionalOnProperty({"inspectit-eum-server.exporters.tracing.jaeger.enabled", "inspectit-eum-server.exporters.tracing.jaeger.grpc"})
@ConditionalOnExpression("NOT new String('${inspectit-eum-server.exporters.tracing.jaeger.enabled}').equals('DISABLED') AND new String('${inspectit-eum-server.exporters.tracing.jaeger.grpc}').length() > 0")
@ConditionalOnExpression("(NOT new String('${inspectit-eum-server.exporters.tracing.jaeger.enabled}').toUpperCase().equals(T(rocks.inspectit.ocelot.config.model.exporters.ExporterEnabledState).DISABLED.toString())) AND (new String('${inspectit-eum-server.exporters.tracing.jaeger.grpc}').length() > 0)")
public SpanExporter jaegerSpanExporter() {
JaegerExporterSettings jaegerExporterSettings = configuration.getExporters().getTracing().getJaeger();

Expand Down