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

Jump to bottom

WIP: chore(engine): remove telemetry code #4465

Closed
wants to merge 8 commits into from
Closed

WIP: chore(engine): remove telemetry code #4465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
01f87e1
chore(engine): remove telemetry code
yanavasileva Jul 1, 2024
142a24f
cleanup engine
yanavasileva Jul 2, 2024
2dbc462
cleanup tests
yanavasileva Jul 2, 2024
f774519
remove connect and wiremock
yanavasileva Jul 2, 2024
1503351
add guava test dependency
yanavasileva Jul 2, 2024
4def9bf
adjust wildfly26
yanavasileva Jul 2, 2024
dfbeaec
remove telemetry from quarkus
yanavasileva Jul 2, 2024
b6e1bc2
adjust tests
yanavasileva Jul 3, 2024
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
1 change: 0 additions & 1 deletion distro/wildfly/modules/src/main/modules/org/camunda/bpm/camunda-engine/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<module name="org.camunda.commons.camunda-commons-logging" />
<module name="org.camunda.commons.camunda-commons-utils" />
<module name="org.camunda.commons.camunda-commons-typed-values" export="true" />
<module name="org.camunda.connect.camunda-connect-core" />
<module name="org.camunda.template-engines.camunda-template-engines-freemarker" services="import" />
<module name="org.camunda.spin.camunda-spin-core" services="import"/>

Expand Down
3 changes: 0 additions & 3 deletions ...odules/src/main/modules/org/camunda/bpm/wildfly/camunda-wildfly-subsystem/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@

<module name="org.camunda.bpm.camunda-engine-plugins" optional="true" />

<module name="org.camunda.connect.camunda-connect-core" />
<module name="org.camunda.connect.camunda-connect-http-client" services="import" />
<module name="org.camunda.connect.camunda-connect-soap-http-client" services="import" />

<!-- for LDAP plugin only -->
<module name="sun.jdk" />
Expand Down
34 changes: 0 additions & 34 deletions ...ain/java/org/camunda/bpm/container/impl/jboss/plugin/JBossConnectProcessEnginePlugin.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions .../java/org/camunda/bpm/container/impl/jboss/service/MscManagedProcessEngineController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

import org.camunda.bpm.container.impl.jboss.config.ManagedJtaProcessEngineConfiguration;
import org.camunda.bpm.container.impl.jboss.config.ManagedProcessEngineMetadata;
import org.camunda.bpm.container.impl.jboss.plugin.JBossConnectProcessEnginePlugin;
import org.camunda.bpm.container.impl.jboss.util.JBossCompatibilityExtension;
import org.camunda.bpm.container.impl.jboss.util.Tccl;
import org.camunda.bpm.container.impl.jboss.util.Tccl.Operation;
Expand Down Expand Up @@ -67,8 +66,6 @@ public class MscManagedProcessEngineController extends MscManagedProcessEngine {

private final static Logger LOGGER = Logger.getLogger(MscManagedProcessEngineController.class.getName());

protected static final String CONNECT_PROCESS_ENGINE_PLUGIN_NAME = "org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin";

protected Supplier<ExecutorService> executorSupplier;

// Providing these values makes the MSC aware of our dependencies on these resources.
Expand Down Expand Up @@ -195,8 +192,6 @@ protected void addProcessEnginePlugins(JakartaTransactionProcessEngineConfigurat
// add process engine plugins:
List<ProcessEnginePluginXml> pluginConfigurations = processEngineMetadata.getPluginConfigurations();

boolean isConnectPluginAdded = false;

for (ProcessEnginePluginXml pluginXml : pluginConfigurations) {
// create plugin instance
ProcessEnginePlugin plugin = null;
Expand All @@ -214,15 +209,8 @@ protected void addProcessEnginePlugins(JakartaTransactionProcessEngineConfigurat
// add to configuration
processEngineConfiguration.getProcessEnginePlugins().add(plugin);

if(pluginClassName.equals(CONNECT_PROCESS_ENGINE_PLUGIN_NAME)) {
isConnectPluginAdded = true;
}
}

// add connect plugin to load connectors
if (!isConnectPluginAdded) {
processEngineConfiguration.getProcessEnginePlugins().add(new JBossConnectProcessEnginePlugin());
}
}

protected JakartaTransactionProcessEngineConfiguration createProcessEngineConfiguration() {
Expand Down
1 change: 0 additions & 1 deletion distro/wildfly26/modules/src/main/modules/org/camunda/bpm/camunda-engine/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<module name="org.camunda.commons.camunda-commons-logging" />
<module name="org.camunda.commons.camunda-commons-utils" />
<module name="org.camunda.commons.camunda-commons-typed-values" export="true" />
<module name="org.camunda.connect.camunda-connect-core" />
<module name="org.camunda.template-engines.camunda-template-engines-freemarker" services="import" />
<module name="org.camunda.spin.camunda-spin-core" services="import"/>

Expand Down
4 changes: 0 additions & 4 deletions ...odules/src/main/modules/org/camunda/bpm/wildfly/camunda-wildfly-subsystem/main/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@

<module name="org.camunda.bpm.camunda-engine-plugins" optional="true" />

<module name="org.camunda.connect.camunda-connect-core" />
<module name="org.camunda.connect.camunda-connect-http-client" services="import" />
<module name="org.camunda.connect.camunda-connect-soap-http-client" services="import" />

<!-- for LDAP plugin only -->
<module name="sun.jdk" />

Expand Down
34 changes: 0 additions & 34 deletions ...ain/java/org/camunda/bpm/container/impl/jboss/plugin/JBossConnectProcessEnginePlugin.java
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions .../java/org/camunda/bpm/container/impl/jboss/service/MscManagedProcessEngineController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import org.camunda.bpm.container.impl.jboss.config.ManagedJtaProcessEngineConfiguration;
import org.camunda.bpm.container.impl.jboss.config.ManagedProcessEngineMetadata;
import org.camunda.bpm.container.impl.jboss.plugin.JBossConnectProcessEnginePlugin;
import org.camunda.bpm.container.impl.jboss.util.JBossCompatibilityExtension;
import org.camunda.bpm.container.impl.jboss.util.Tccl;
import org.camunda.bpm.container.impl.jboss.util.Tccl.Operation;
Expand Down Expand Up @@ -64,7 +63,6 @@ public class MscManagedProcessEngineController extends MscManagedProcessEngine {

private final static Logger LOGGER = Logger.getLogger(MscManagedProcessEngineController.class.getName());

protected static final String CONNECT_PROCESS_ENGINE_PLUGIN_NAME = "org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin";

protected InjectedValue<ExecutorService> executorInjector = new InjectedValue<ExecutorService>();

Expand Down Expand Up @@ -185,8 +183,6 @@ protected void addProcessEnginePlugins(JtaProcessEngineConfiguration processEngi
// add process engine plugins:
List<ProcessEnginePluginXml> pluginConfigurations = processEngineMetadata.getPluginConfigurations();

boolean isConnectPluginAdded = false;

for (ProcessEnginePluginXml pluginXml : pluginConfigurations) {
// create plugin instance
ProcessEnginePlugin plugin = null;
Expand All @@ -203,16 +199,8 @@ protected void addProcessEnginePlugins(JtaProcessEngineConfiguration processEngi

// add to configuration
processEngineConfiguration.getProcessEnginePlugins().add(plugin);

if(pluginClassName.equals(CONNECT_PROCESS_ENGINE_PLUGIN_NAME)) {
isConnectPluginAdded = true;
}
}

// add connect plugin to load connectors
if (!isConnectPluginAdded) {
processEngineConfiguration.getProcessEnginePlugins().add(new JBossConnectProcessEnginePlugin());
}
}

protected JtaProcessEngineConfiguration createProcessEngineConfiguration() {
Expand Down
1 change: 0 additions & 1 deletion ...nect-plugin/src/main/java/org/camunda/connect/plugin/impl/ConnectProcessEnginePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public void preInit(ProcessEngineConfigurationImpl processEngineConfiguration) {

addConnectorParseListener(processEngineConfiguration);

processEngineConfiguration.setTelemetryHttpConnector(Connectors.getConnector(Connectors.HTTP_CONNECTOR_ID));
}

private void addConnectorParseListener(ProcessEngineConfigurationImpl processEngineConfiguration) {
Expand Down
42 changes: 7 additions & 35 deletions engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,29 +118,6 @@
<artifactId>gson</artifactId>
</dependency>

<dependency>
<groupId>org.camunda.connect</groupId>
<artifactId>camunda-connect-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.camunda.connect</groupId>
<artifactId>camunda-connect-connectors-all</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.camunda.connect</groupId>
<artifactId>camunda-connect-http-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.camunda.connect</groupId>
<artifactId>camunda-connect-soap-http-client</artifactId>
</exclusion>
</exclusions>
<scope>runtime</scope>
</dependency>

<!-- provided dependencies -->

<dependency>
Expand Down Expand Up @@ -300,12 +277,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
Expand Down Expand Up @@ -342,6 +313,13 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.2-jre</version>
<scope>test</scope>
</dependency>
</dependencies>


Expand Down Expand Up @@ -484,20 +462,14 @@
<exclude>org.camunda.bpm.dmn:*</exclude>
<exclude>org.camunda.bpm.juel:*</exclude>
<exclude>org.camunda.commons:*</exclude>
<exclude>org.camunda.connect:*</exclude>
<exclude>org.camunda.feel:*</exclude>

<exclude>org.springframework:*</exclude>
<exclude>org.slf4j:*</exclude>
<exclude>org.apache.commons:*</exclude>
<exclude>com.sun.mail:*</exclude>
<exclude>javax.activation:*</exclude>
<exclude>org.mybatis:mybatis:*</exclude>
<exclude>commons-logging:*</exclude>
<exclude>joda-time:*</exclude>
<exclude>org.apache.httpcomponents:httpclient</exclude>
<exclude>org.apache.httpcomponents:httpcore</exclude>
<exclude>commons-codec:commons-codec</exclude>
</excludes>
</artifactSet>
<relocations>
Expand Down
63 changes: 0 additions & 63 deletions engine/src/main/java/org/camunda/bpm/engine/impl/BootstrapEngineCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.camunda.bpm.engine.impl.telemetry.dto.TelemetryDataImpl;
import org.camunda.bpm.engine.impl.telemetry.dto.LicenseKeyDataImpl;
import org.camunda.bpm.engine.impl.telemetry.reporter.TelemetryReporter;
import org.camunda.bpm.engine.impl.util.TelemetryUtil;

/**
* @author Nikola Koevski
Expand All @@ -57,7 +56,6 @@ public Void execute(CommandContext commandContext) {
createHistoryCleanupJob(commandContext);
}

initializeTelemetryProperty(commandContext);
// installationId needs to be updated in the telemetry data
updateTelemetryData(commandContext);
startTelemetryReporter(commandContext);
Expand Down Expand Up @@ -105,61 +103,6 @@ protected boolean isHistoryCleanupEnabled(CommandContext commandContext) {
.isHistoryCleanupEnabled();
}

public void initializeTelemetryProperty(CommandContext commandContext) {
try {

checkTelemetryLockExists(commandContext);

acquireExclusiveTelemetryLock(commandContext);
PropertyEntity databaseTelemetryProperty = databaseTelemetryConfiguration(commandContext);

ProcessEngineConfigurationImpl processEngineConfiguration = commandContext.getProcessEngineConfiguration();
if (databaseTelemetryProperty == null) {
LOG.noTelemetryPropertyFound();
createTelemetryProperty(commandContext);
}

// reset collected dynamic data
if ((databaseTelemetryProperty == null && processEngineConfiguration.isInitializeTelemetry())
|| (databaseTelemetryProperty != null && Boolean.parseBoolean(databaseTelemetryProperty.getValue()))) {
TelemetryUtil.toggleLocalTelemetry(true,
processEngineConfiguration.getTelemetryRegistry(),
processEngineConfiguration.getMetricsRegistry());
}

} catch (Exception e) {
LOG.errorConfiguringTelemetryProperty(e);
}
}

protected void checkTelemetryLockExists(CommandContext commandContext) {
PropertyEntity telemetryLockProperty = commandContext.getPropertyManager().findPropertyById("telemetry.lock");
if (telemetryLockProperty == null) {
LOG.noTelemetryLockPropertyFound();
}
}

protected PropertyEntity databaseTelemetryConfiguration(CommandContext commandContext) {
try {
return commandContext.getPropertyManager().findPropertyById(TELEMETRY_PROPERTY_NAME);
} catch (Exception e) {
LOG.errorFetchingTelemetryPropertyInDatabase(e);
return null;
}
}

protected void createTelemetryProperty(CommandContext commandContext) {
Boolean telemetryEnabled = commandContext.getProcessEngineConfiguration().isInitializeTelemetry();
PropertyEntity property = null;
if (telemetryEnabled != null) {
property = new PropertyEntity(TELEMETRY_PROPERTY_NAME, Boolean.toString(telemetryEnabled));
} else {
property = new PropertyEntity(TELEMETRY_PROPERTY_NAME, "null");
}
commandContext.getPropertyManager().insert(property);
LOG.creatingTelemetryPropertyInDatabase(telemetryEnabled);
}

public void initializeInstallationId(CommandContext commandContext) {
checkInstallationIdLockExists(commandContext);

Expand Down Expand Up @@ -244,12 +187,6 @@ protected void startTelemetryReporter(CommandContext commandContext) {
}
}

protected void acquireExclusiveTelemetryLock(CommandContext commandContext) {
PropertyManager propertyManager = commandContext.getPropertyManager();
//exclusive lock
propertyManager.acquireExclusiveLockForTelemetry();
}

protected void acquireExclusiveInstallationIdLock(CommandContext commandContext) {
PropertyManager propertyManager = commandContext.getPropertyManager();
//exclusive lock
Expand Down
Loading