remove telemetry in distro/run and spring-boot-starter

camunda · Jul 12, 2024 · 74ea9e7 · 74ea9e7
1 parent a370fe1
commit 74ea9e7
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 30 deletions.
diff --git a/distro/run/core/src/test/resources/application.yml b/distro/run/core/src/test/resources/application.yml
diff --git a/distro/run/qa/integration-tests/src/test/resources/base-test-application.yml b/distro/run/qa/integration-tests/src/test/resources/base-test-application.yml
@@ -2,8 +2,6 @@ camunda.bpm:
   admin-user:
     id: demo
     password: demo
-    generic-properties.properties:
-      telemetry-reporter-activate: false
   run.example.enabled: true 
 
 spring.datasource:

diff --git a/distro/run/qa/integration-tests/src/test/resources/example-disabled.yml b/distro/run/qa/integration-tests/src/test/resources/example-disabled.yml
@@ -2,8 +2,6 @@ camunda.bpm:
   admin-user:
     id: demo
     password: demo
-    generic-properties.properties:
-      telemetry-reporter-activate: false
   run.example.enabled: false 
 
 spring.datasource:

diff --git a/...t-starter/starter-qa/integration-test-liquibase/src/test/resources/application.properties b/...t-starter/starter-qa/integration-test-liquibase/src/test/resources/application.properties
@@ -1,2 +1 @@
-camunda.bpm.generic-properties.properties.telemetry-reporter-activate=false
 spring.liquibase.change-log=classpath:org/camunda/bpm/engine/db/liquibase/camunda-changelog.xml
diff --git a/...tegration-test-plugins/spin/spin-dataformat-all/src/test/resources/application.properties b/...tegration-test-plugins/spin/spin-dataformat-all/src/test/resources/application.properties
diff --git a/...-test-plugins/spin/spin-dataformat-json-jackson/src/test/resources/application.properties b/...-test-plugins/spin/spin-dataformat-json-jackson/src/test/resources/application.properties
diff --git a/...arter/starter-qa/integration-test-request-scope/src/test/resources/application.properties b/...arter/starter-qa/integration-test-request-scope/src/test/resources/application.properties
diff --git a/...imple/src/test/java/org/camunda/bpm/springboot/project/qa/simple/SimpleApplicationIT.java b/...imple/src/test/java/org/camunda/bpm/springboot/project/qa/simple/SimpleApplicationIT.java
@@ -20,7 +20,7 @@
 
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.RuntimeService;
-import org.camunda.bpm.engine.impl.telemetry.TelemetryRegistry;
+import org.camunda.bpm.engine.impl.diagnostics.DiagnosticsRegistry;
 import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServerImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,10 +52,10 @@ public void shouldStartApplicationSuccessfully() {
   @Test
   public void shouldNotDetermineApplicationServer() {
 
-    TelemetryRegistry telemetryRegistry = processEngine.getProcessEngineConfiguration().getTelemetryRegistry();
+    DiagnosticsRegistry diagnosticsRegistry = processEngine.getProcessEngineConfiguration().getDiagnosticsRegistry();
 
     // then
-    ApplicationServerImpl applicationServer = telemetryRegistry.getApplicationServer();
+    ApplicationServerImpl applicationServer = diagnosticsRegistry.getApplicationServer();
     assertThat(applicationServer).isNull();
   }
 

diff --git a/...boot-starter/starter-qa/integration-test-simple/src/test/resources/application.properties b/...boot-starter/starter-qa/integration-test-simple/src/test/resources/application.properties
diff --git a/...er/starter-qa/integration-test-webapp/invoice-example/src/main/resources/application.yaml b/...er/starter-qa/integration-test-webapp/invoice-example/src/main/resources/application.yaml
@@ -1,3 +1 @@
 server.port: 58080
-
-camunda.bpm.generic-properties.properties.telemetry-reporter-activate: false
diff --git a/...rter/starter-qa/integration-test-webapp/runtime/src/test/resources/application.properties b/...rter/starter-qa/integration-test-webapp/runtime/src/test/resources/application.properties
diff --git a/spring-boot-starter/starter-rest/src/test/resources/application.properties b/spring-boot-starter/starter-rest/src/test/resources/application.properties
@@ -7,5 +7,3 @@ camunda.bpm.job-execution.active=true
 camunda.bpm.database.schema-update=true
 
 spring.main.allow-bean-definition-overriding=true
-
-camunda.bpm.generic-properties.properties.telemetry-reporter-activate=false 
diff --git a/spring-boot-starter/starter-webapp-core/src/test/resources/application.properties b/spring-boot-starter/starter-webapp-core/src/test/resources/application.properties
diff --git a/...in/java/org/camunda/bpm/spring/boot/starter/telemetry/CamundaIntegrationDeterminator.java b/...in/java/org/camunda/bpm/spring/boot/starter/telemetry/CamundaIntegrationDeterminator.java
@@ -20,7 +20,7 @@
 
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.camunda.bpm.engine.impl.telemetry.CamundaIntegration;
+import org.camunda.bpm.engine.impl.diagnostics.CamundaIntegration;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -31,6 +31,7 @@ public class CamundaIntegrationDeterminator implements InitializingBean {
   @Autowired
   protected ProcessEngine processEngine;
 
+  @Override
   public void afterPropertiesSet() throws Exception {
     ProcessEngineConfigurationImpl configuration = (ProcessEngineConfigurationImpl) processEngine.getProcessEngineConfiguration();
 

diff --git a/...t-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/TelemetryNonPaIT.java b/...t-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/TelemetryNonPaIT.java
@@ -21,8 +21,8 @@
 import java.util.Set;
 
 import org.camunda.bpm.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.camunda.bpm.engine.impl.telemetry.CamundaIntegration;
-import org.camunda.bpm.engine.impl.telemetry.TelemetryRegistry;
+import org.camunda.bpm.engine.impl.diagnostics.CamundaIntegration;
+import org.camunda.bpm.engine.impl.diagnostics.DiagnosticsRegistry;
 import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServerImpl;
 import org.camunda.bpm.engine.impl.telemetry.dto.TelemetryDataImpl;
 import org.camunda.bpm.spring.boot.starter.test.nonpa.TestApplication;
@@ -41,10 +41,10 @@ public class TelemetryNonPaIT extends AbstractCamundaAutoConfigurationIT {
 
   @Test
   public void shouldSubmitApplicationServerData() {
-    TelemetryRegistry telemetryRegistry = processEngine.getProcessEngineConfiguration().getTelemetryRegistry();
+    DiagnosticsRegistry diagnosticsRegistry = processEngine.getProcessEngineConfiguration().getDiagnosticsRegistry();
 
     // then
-    ApplicationServerImpl applicationServer = telemetryRegistry.getApplicationServer();
+    ApplicationServerImpl applicationServer = diagnosticsRegistry.getApplicationServer();
     assertThat(applicationServer).isNotNull();
     assertThat(applicationServer.getVendor()).isEqualTo("Apache Tomcat");
     assertThat(applicationServer.getVersion()).isNotNull();

diff --git a/...boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/TelemetryPaIT.java b/...boot-starter/starter/src/test/java/org/camunda/bpm/spring/boot/starter/TelemetryPaIT.java
@@ -18,7 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.camunda.bpm.engine.impl.telemetry.TelemetryRegistry;
+import org.camunda.bpm.engine.impl.diagnostics.DiagnosticsRegistry;
 import org.camunda.bpm.engine.impl.telemetry.dto.ApplicationServerImpl;
 import org.camunda.bpm.spring.boot.starter.test.pa.TestProcessApplication;
 import org.junit.Test;
@@ -38,10 +38,10 @@ public class TelemetryPaIT extends AbstractCamundaAutoConfigurationIT {
 
   @Test
   public void shouldSubmitApplicationServerData() {
-    TelemetryRegistry telemetryRegistry = processEngine.getProcessEngineConfiguration().getTelemetryRegistry();
+    DiagnosticsRegistry diagnosticsRegistry = processEngine.getProcessEngineConfiguration().getDiagnosticsRegistry();
 
     // then
-    ApplicationServerImpl applicationServer = telemetryRegistry.getApplicationServer();
+    ApplicationServerImpl applicationServer = diagnosticsRegistry.getApplicationServer();
     assertThat(applicationServer).isNotNull();
     assertThat(applicationServer.getVendor()).isEqualTo("Apache Tomcat");
     assertThat(applicationServer.getVersion()).isNotNull();

diff --git a/spring-boot-starter/starter/src/test/resources/application.properties b/spring-boot-starter/starter/src/test/resources/application.properties
@@ -1,2 +1 @@
-camunda.bpm.generic-properties.properties.telemetry-reporter-activate=false
 camunda.bpm.generic-properties.properties.enforce-history-time-to-live=false