Merge pull request #6 from newrelic-experimental/update_gradle

Update gradle

atomikos-cp-5.0/build.gradle

@@ -22,6 +22,6 @@ jar {
 }
 
 verifyInstrumentation {
-    passes 'com.atomikos:transactions-jdbc:[5.0.0]'
+    passes 'com.atomikos:transactions-jdbc:[5.0.0,)'
     excludeRegex '.*M[0-9]'
 }

atomikos-jms/build.gradle → atomikos-jms-3.9/build.gradle

@@ -4,8 +4,8 @@
 apply plugin: 'java'
 
 dependencies {
-    compile 'com.atomikos:transactions-jms:3.9.3'
-    compile 'javax.jms:jms-api:1.1-rev-1'
+    implementation  'com.atomikos:transactions-jms:3.9.3'
+    implementation 'javax.jms:jms-api:1.1-rev-1'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
@@ -15,17 +15,13 @@ dependencies {
 
 jar {
   manifest {
-    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.atomikos_jms'
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.atomikos_jms-3.9'
     attributes 'Implementation-Vendor': 'New Relic Labs'
     attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
     attributes 'Implementation-Version': 1.0
   }
 }
 
 verifyInstrumentation {
-  // Verifier plugin documentation:
-  // https://github.com/newrelic/newrelic-gradle-verify-instrumentation
-  // Example:
-  // passes 'javax.servlet:servlet-api:[2.2,2.5]'
-  // exclude 'javax.servlet:servlet-api:2.4.public_draft'
+	passes 'com.atomikos:transactions-jms:[3.9.0,5.0.0)'
 }

atomikos-transaction-core/build.gradle → atomikos-jms-5.0/build.gradle

@@ -1,12 +1,11 @@
 
-// Build.gradle generated for instrumentation module atomikos-transaction-core
+// Build.gradle generated for instrumentation module atomikos_jms
 
 apply plugin: 'java'
 
 dependencies {
-   // Declare a dependency on each JAR you want to instrument
-   // Example:
-   // implementation 'javax.servlet:servlet-api:2.5'
+    implementation  'com.atomikos:transactions-jms:5.0.0'
+    implementation 'javax.jms:jms-api:1.1-rev-1'
 
    // New Relic Labs Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.0.0'
@@ -16,17 +15,13 @@ dependencies {
 
 jar {
   manifest {
-    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.atomikos-transaction-core'
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.atomikos_jms-5.0'
     attributes 'Implementation-Vendor': 'New Relic Labs'
     attributes 'Implementation-Vendor-Id': 'com.newrelic.labs'
     attributes 'Implementation-Version': 1.0
   }
 }
 
 verifyInstrumentation {
-  // Verifier plugin documentation:
-  // https://github.com/newrelic/newrelic-gradle-verify-instrumentation
-  // Example:
-  // passes 'javax.servlet:servlet-api:[2.2,2.5]'
-  // exclude 'javax.servlet:servlet-api:2.4.public_draft'
-}
+	passes 'com.atomikos:transactions-jms:[5.0.0,)'
+}

atomikos-jms-5.0/src/main/java/com/atomikos/jms/AtomikosConnectionFactoryBean.java

@@ -0,0 +1,43 @@
+package com.atomikos.jms;
+
+import javax.jms.Connection;
+
+import com.newrelic.api.agent.weaver.NewField;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+import com.nr.instrumentation.atomikos.jms.DataSourceSampler;
+
+@Weave
+public abstract class AtomikosConnectionFactoryBean {
+
+	public abstract String getUniqueResourceName();
+
+	public abstract int poolAvailableSize();
+
+	public abstract int poolTotalSize();
+
+	@NewField
+	private boolean initialized = false;
+
+
+	public Connection createConnection() {
+		if(!initialized) {
+			if(!DataSourceSampler.getInstance().contains(this)) {
+				DataSourceSampler.getInstance().addPool(this);
+			}
+			initialized = true;
+		}
+		return Weaver.callOriginal();
+	}
+
+	public AtomikosConnectionFactoryBean() {
+		DataSourceSampler.getInstance().addPool(this);
+		initialized = true;
+	}
+
+
+	public synchronized void close() {
+		DataSourceSampler.getInstance().removePool(this);
+		Weaver.callOriginal();
+	}
+}

atomikos-jms-5.0/src/main/java/com/atomikos/jms/AtomikosJmsXAConnectionFactory.java

@@ -0,0 +1,8 @@
+package com.atomikos.jms;
+
+import com.newrelic.api.agent.weaver.SkipIfPresent;
+
+@SkipIfPresent
+abstract class AtomikosJmsXAConnectionFactory {
+
+}

atomikos-jms-5.0/src/main/java/com/nr/instrumentation/atomikos/jms/DataSourceSampler.java

@@ -0,0 +1,61 @@
+package com.nr.instrumentation.atomikos.jms;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import com.atomikos.jms.AtomikosConnectionFactoryBean;
+import com.newrelic.agent.bridge.AgentBridge;
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.weaver.Weaver;
+
+public class DataSourceSampler implements Runnable {
+
+	private static List<AtomikosConnectionFactoryBean> pools;
+
+	private static String METRIC_PREFIX = "Custom/Atomikos Connection Pools/JMS/";
+
+	private static DataSourceSampler instance = null;
+
+	public static DataSourceSampler getInstance() {
+		if(instance == null) {
+			instance = new DataSourceSampler();
+		}
+		return instance;
+	}
+
+	public boolean contains(AtomikosConnectionFactoryBean b) {
+		return pools.contains(b);
+	}
+
+	public void addPool(AtomikosConnectionFactoryBean b) {
+		if(!pools.contains(b)) {
+			pools.add(b);
+		}
+	}
+
+	public boolean removePool(AtomikosConnectionFactoryBean b) {
+		return pools.remove(b);
+	}
+
+	private DataSourceSampler() {
+		pools = new ArrayList<AtomikosConnectionFactoryBean>();
+		AgentBridge.instrumentation.registerCloseable(Weaver.getImplementationTitle(),AgentBridge.privateApi.addSampler(this, 15, TimeUnit.SECONDS));
+	}
+
+	@Override
+	public void run() {
+		NewRelic.recordMetric(METRIC_PREFIX+"Pools Monitored", pools.size());
+		for(AtomikosConnectionFactoryBean pool : pools) {
+			String poolName = pool.getUniqueResourceName();
+			int available = pool.poolAvailableSize();
+			int total = pool.poolTotalSize();
+			String metricName = METRIC_PREFIX + poolName + "/Available";
+			NewRelic.recordMetric(metricName, available);
+			metricName = METRIC_PREFIX + poolName + "/Total";
+			NewRelic.recordMetric(metricName, total);
+
+		}
+	}
+
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,5 +1,6 @@
 rootProject.name = 'newrelic-java-atomikos'
 include 'atomikos-cp'
-include 'atomikos-jms'
+include 'atomikos-jms-3.9'
+include 'atomikos-jms-5.0'
 include 'atomikos-cp-4.0'
 include 'atomikos-cp-5.0'