chore: finalize release 1.11.0 (#424)

Informatievlaanderen · Dec 6, 2023 · 6d07363 · 6d07363
2 parents 4f327da + e47be07
commit 6d07363
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/ldi-orchestrator/ldio-application/pom.xml b/ldi-orchestrator/ldio-application/pom.xml
@@ -42,6 +42,10 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
 
         <!-- TEST -->
 

diff --git a/.../main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/FlowAutoConfiguration.java b/.../main/java/be/vlaanderen/informatievlaanderen/ldes/ldio/config/FlowAutoConfiguration.java
@@ -41,11 +41,11 @@ public class FlowAutoConfiguration {
 	private final ObservationRegistry observationRegistry;
 
 	public FlowAutoConfiguration(OrchestratorConfig orchestratorConfig,
-								 ConfigurableApplicationContext configContext, ApplicationEventPublisher eventPublisher) {
+								 ConfigurableApplicationContext configContext, ApplicationEventPublisher eventPublisher, ObservationRegistry observationRegistry) {
 		this.orchestratorConfig = orchestratorConfig;
 		this.configContext = configContext;
 		this.eventPublisher = eventPublisher;
-		this.observationRegistry = ObserveConfiguration.observationRegistry();
+		this.observationRegistry = observationRegistry;
 	}
 
 	@PostConstruct

diff --git a/ldio.Dockerfile b/ldio.Dockerfile
@@ -50,4 +50,4 @@ COPY --from=app-stage ldi-orchestrator/ldio-connectors/ldio-repository-materiali
 RUN mkdir "state"
 RUN chmod -R 777 ./state
 
-CMD ["java", "-cp", "ldio-application.jar", "-Dloader.path=lib/", "org.springframework.boot.loader.PropertiesLauncher"]
+CMD ["java", "-cp", "ldio-application.jar", "-Dloader.path=lib/", "org.springframework.boot.loader.launch.PropertiesLauncher"]
diff --git a/pom.xml b/pom.xml
@@ -58,8 +58,6 @@
         <jena.version>4.8.0</jena.version>
 
         <!-- LOGGING -->
-        <spring.aop.version>3.2.0</spring.aop.version>
-        <spring-boot.actuator.version>3.2.0</spring-boot.actuator.version>
         <micrometer-prometheus.version>1.12.0</micrometer-prometheus.version>
         <micrometer-tracing.version>1.2.0</micrometer-tracing.version>
         <zipkin-reporter.version>2.16.4</zipkin-reporter.version>
@@ -231,16 +229,6 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-aop</artifactId>
-                <version>${spring.aop.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-actuator</artifactId>
-                <version>${spring-boot.actuator.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.micrometer</groupId>
                 <artifactId>micrometer-registry-prometheus</artifactId>