Merge pull request #3016 from IsuruMaduranga/transactional-pricing

Disable existing transaction counter
wso2 · Nov 1, 2023 · 51a95f0 · 51a95f0
2 parents ce169c9 + 645d42c
commit 51a95f0
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 64 deletions.
diff --git a/.github/workflows/transaction-tests.yml b/.github/workflows/transaction-tests.yml
diff --git a/...ndpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSInjectHandler.java b/...ndpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSInjectHandler.java
@@ -152,9 +152,6 @@ public boolean invoke(Object object, String name) throws SynapseException {
             }
             axis2MsgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, transportHeaders);
 
-            // set transaction property
-            axis2MsgCtx.setProperty(BaseConstants.INTERNAL_TRANSACTION_COUNTED,
-                                    msg.getBooleanProperty(BaseConstants.INTERNAL_TRANSACTION_COUNTED));
             // set the JMS Message ID as the Message ID of the MessageContext
             try {
                 if (msg.getJMSMessageID() != null) {

diff --git a/...nbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSUtils.java b/...nbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/jms/JMSUtils.java
@@ -429,10 +429,6 @@ public static Map<String, Object> getTransportHeaders(Message message, MessageCo
             log.error("Error while reading the Transport Headers from JMS Message", e);
         }
 
-        // remove "INTERNAL_TRANSACTION_COUNTED" header from the transport level headers map.
-        // this property will be maintained in the message context. Therefore, no need to set this in the transport
-        // headers.
-        map.remove(BaseConstants.INTERNAL_TRANSACTION_COUNTED);
         return map;
     }
 

diff --git a/...t.apis/src/main/java/org/wso2/micro/integrator/management/apis/ManagementInternalApi.java b/...t.apis/src/main/java/org/wso2/micro/integrator/management/apis/ManagementInternalApi.java
@@ -101,8 +101,7 @@ public ManagementInternalApi() {
         resourcesList.add(new ApiResourceAdapter(PREFIX_LOGOUT, new LogoutResource()));
         resourcesList.add(new ApiResourceAdapter(PREFIX_SERVER_DATA, new MetaDataResource()));
         resourcesList.add(new LogFilesResource(PREFIX_LOG_FILES));
-        resourcesList.add(new ApiResourceAdapter(PREFIX_TRANSACTION + PATH_PARAM_TRANSACTION,
-                                                 new RequestCountResource()));
+
         resourcesList.add(new ExternalVaultResource(PREFIX_EXTERNAL_VAULTS
                 + PATH_PARAM_EXTERNAL_VAULT_NAME));
         resourcesList.add(new ApiResourceAdapter(PREFIX_DATA_SOURCES, new DataSourceResource()));

diff --git a/...nt.apis/src/main/java/org/wso2/micro/integrator/management/apis/RequestCountResource.java b/...nt.apis/src/main/java/org/wso2/micro/integrator/management/apis/RequestCountResource.java
@@ -50,6 +50,9 @@
 
 
 /**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ *
  * Resource for a retrieving aggregated transaction count.
  * <p>
  * Handles resources in the form "management/transactions/{param}"

diff --git a/...nitializer/src/main/java/org/wso2/micro/integrator/initializer/ServiceBusInitializer.java b/...nitializer/src/main/java/org/wso2/micro/integrator/initializer/ServiceBusInitializer.java
@@ -58,8 +58,6 @@
 import org.wso2.micro.integrator.initializer.deployment.application.deployer.CappDeployer;
 import org.wso2.micro.integrator.initializer.handler.ProxyLogHandler;
 import org.wso2.micro.integrator.initializer.handler.SynapseExternalPropertyConfigurator;
-import org.wso2.micro.integrator.initializer.handler.transaction.TransactionCountHandler;
-import org.wso2.micro.integrator.initializer.handler.transaction.TransactionCountHandlerComponent;
 import org.wso2.micro.integrator.initializer.persistence.MediationPersistenceManager;
 import org.wso2.micro.integrator.initializer.services.SynapseConfigurationService;
 import org.wso2.micro.integrator.initializer.services.SynapseConfigurationServiceImpl;
@@ -80,10 +78,7 @@
 import java.nio.file.Paths;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -111,10 +106,6 @@ public class ServiceBusInitializer {
 
     private DataSourceService dataSourceService;
 
-    private TransactionCountHandlerComponent transactionCountHandlerComponent;
-
-    private ExecutorService transactionCountExecutor;
-
     @Activate
     protected void activate(ComponentContext ctxt) {
 
@@ -198,14 +189,6 @@ protected void activate(ComponentContext ctxt) {
                 synapseEnvironment.registerSynapseHandler(new SynapseExternalPropertyConfigurator());
                 synapseEnvironment.registerSynapseHandler(new ProxyLogHandler());
 
-                // Register internal transaction synapse handler
-                boolean transactionPropertyEnabled = TransactionCountHandlerComponent.isTransactionPropertyEnabled();
-                if (transactionPropertyEnabled) {
-                    transactionCountHandlerComponent = new TransactionCountHandlerComponent();
-                    transactionCountHandlerComponent.start(dataSourceService);
-                    transactionCountExecutor = Executors.newFixedThreadPool(100);
-                    synapseEnvironment.registerSynapseHandler(new TransactionCountHandler(transactionCountExecutor));
-                }
                 if (log.isDebugEnabled()) {
                     log.debug("SynapseEnvironmentService Registered");
                 }
@@ -260,12 +243,6 @@ private String getMainSequenceName(String cappName) {
 
     @Deactivate
     protected void deactivate(ComponentContext ctxt) {
-        if (Objects.nonNull(transactionCountHandlerComponent)) {
-            transactionCountHandlerComponent.cleanup();
-        }
-        if (Objects.nonNull(transactionCountExecutor)) {
-            transactionCountExecutor.shutdownNow();
-        }
         List handlers = serverManager.getServerContextInformation().getSynapseEnvironment().getSynapseHandlers();
         Iterator<SynapseHandler> iterator = handlers.iterator();
         while (iterator.hasNext()) {

diff --git a/...r.initializer/src/main/java/org/wso2/micro/integrator/initializer/handler/DataHolder.java b/...r.initializer/src/main/java/org/wso2/micro/integrator/initializer/handler/DataHolder.java
@@ -21,7 +21,9 @@
 import org.wso2.micro.integrator.initializer.handler.transaction.store.TransactionStore;
 
 /**
- * DataHolder class for transaction count component.
+ * This feature is deprecated and will be removed in a future release.
+ *
+ * @deprecated
  */
 public class DataHolder {
 

diff --git a/.../java/org/wso2/micro/integrator/initializer/handler/transaction/TransactionConstants.java b/.../java/org/wso2/micro/integrator/initializer/handler/transaction/TransactionConstants.java
@@ -22,6 +22,10 @@
 
 import java.io.File;
 
+/**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ */
 public class TransactionConstants {
 
     public static final String PUBLIC_KEY = System.getProperty(ServerConstants.CARBON_HOME) + File.separator

diff --git a/...va/org/wso2/micro/integrator/initializer/handler/transaction/TransactionCountHandler.java b/...va/org/wso2/micro/integrator/initializer/handler/transaction/TransactionCountHandler.java
@@ -30,6 +30,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 
+/**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ */
 public class TransactionCountHandler extends AbstractSynapseHandler {
 
     private static final Log LOG = LogFactory.getLog(TransactionCountHandler.class);

diff --git a/...o2/micro/integrator/initializer/handler/transaction/TransactionCountHandlerComponent.java b/...o2/micro/integrator/initializer/handler/transaction/TransactionCountHandlerComponent.java
@@ -39,7 +39,8 @@
 import javax.sql.DataSource;
 
 /**
- * This class represents the internal transaction count handler component.
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
  */
 public class TransactionCountHandlerComponent {
 

diff --git a/...cro/integrator/initializer/handler/transaction/exception/TransactionCounterException.java b/...cro/integrator/initializer/handler/transaction/exception/TransactionCounterException.java
@@ -18,6 +18,10 @@
 
 package org.wso2.micro.integrator.initializer.handler.transaction.exception;
 
+/**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ */
 public class TransactionCounterException extends Exception {
 
     public TransactionCounterException(String msg, Exception e) {

diff --git a/.../initializer/handler/transaction/exception/TransactionCounterInitializationException.java b/.../initializer/handler/transaction/exception/TransactionCounterInitializationException.java
@@ -18,6 +18,10 @@
 
 package org.wso2.micro.integrator.initializer.handler.transaction.exception;
 
+/**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ */
 public class TransactionCounterInitializationException extends Exception {
 
     public TransactionCounterInitializationException(String msg) {

diff --git a/...n/java/org/wso2/micro/integrator/initializer/handler/transaction/security/CryptoUtil.java b/...n/java/org/wso2/micro/integrator/initializer/handler/transaction/security/CryptoUtil.java
@@ -42,6 +42,9 @@
 import javax.xml.bind.DatatypeConverter;
 
 /**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ *
  * This class will provide the required methods to encrypt a given value.
  */
 public class CryptoUtil {

diff --git a/...ava/org/wso2/micro/integrator/initializer/handler/transaction/store/TransactionStore.java b/...ava/org/wso2/micro/integrator/initializer/handler/transaction/store/TransactionStore.java
@@ -28,6 +28,9 @@
 import javax.sql.DataSource;
 
 /**
+ * This feature is deprecated and will be removed in a future release.
+ * @deprecated
+ *
  * The layer which connects to the transaction data.
  */
 public class TransactionStore {

diff --git a/distribution/src/dbscripts/db2/db2_transaction_count.sql b/distribution/src/dbscripts/db2/db2_transaction_count.sql
@@ -1,3 +1,4 @@
+-- Related to the deprecated transaction counter feature
 CREATE TABLE IF NOT EXISTS CURRENT_STATS (
   TIME_STAMP DATE NOT NULL,
   NODE_ID VARCHAR(40) NOT NULL,

diff --git a/distribution/src/dbscripts/mssql/mssql_transaction_count.sql b/distribution/src/dbscripts/mssql/mssql_transaction_count.sql
@@ -1,3 +1,4 @@
+-- Related to the deprecated transaction counter feature
 IF NOT  EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[CURRENT_STATS]') AND TYPE IN (N'U'))
 CREATE TABLE  CURRENT_STATS (
   TIME_STAMP DATE NOT NULL,

diff --git a/distribution/src/dbscripts/mysql/mysql_transaction_count.sql b/distribution/src/dbscripts/mysql/mysql_transaction_count.sql
@@ -1,3 +1,4 @@
+-- Related to the deprecated transaction counter feature
 CREATE TABLE IF NOT EXISTS CURRENT_STATS (
   TIME_STAMP DATE NOT NULL,
   NODE_ID VARCHAR(40) NOT NULL,

diff --git a/distribution/src/dbscripts/oracle-rac/oracle_rac_transaction_count.sql b/distribution/src/dbscripts/oracle-rac/oracle_rac_transaction_count.sql
@@ -1,3 +1,4 @@
+-- Related to the deprecated transaction counter feature
 CREATE TABLE CURRENT_STATS (
   TIME_STAMP DATE NOT NULL,
   NODE_ID VARCHAR(40) NOT NULL,

diff --git a/distribution/src/dbscripts/oracle/oracle_transaction_count.sql b/distribution/src/dbscripts/oracle/oracle_transaction_count.sql
@@ -1,3 +1,4 @@
+-- Related to the deprecated transaction counter feature
 CREATE TABLE CURRENT_STATS (
   TIME_STAMP DATE NOT NULL,
   NODE_ID VARCHAR(40) NOT NULL,

diff --git a/distribution/src/dbscripts/postgres/postgresql_transaction_count.sql b/distribution/src/dbscripts/postgres/postgresql_transaction_count.sql
@@ -1,3 +1,4 @@
+-- Related to the deprecated transaction counter feature
 CREATE TABLE IF NOT EXISTS CURRENT_STATS (
   TIME_STAMP DATE NOT NULL,
   NODE_ID VARCHAR(40) NOT NULL,

diff --git a/distribution/src/resources/config-tool/deployment-full.toml b/distribution/src/resources/config-tool/deployment-full.toml
@@ -1098,13 +1098,6 @@ user.password = "pwd-2"
 [internal_apis.file_user_store]
 enable = false
 
-#################### Transaction Counter Handler ############################
-[transaction_counter]
-enable = true
-data_source = "WSO2_COORDINATION_DB"
-update_interval = 2
-
-
 #################### Service Catalog #######################################
 [[service_catalog]]
 apim_host = "https://127.0.0.1:9443"

diff --git a/integration/mediation-tests/tests-platform/pom.xml b/integration/mediation-tests/tests-platform/pom.xml
@@ -35,8 +35,8 @@
         <module>tests-rabbitmq</module>
         <module>tests-coordination</module>
         <module>tests-userstore</module>
-        <module>tests-transaction</module>
-<!--        <module>tests-wso2mb</module>-->
+
+        <!--<module>tests-wso2mb</module>-->
         <!--<module>tests-sap</module>-->
     </modules>