Merge pull request #2 from newrelic-experimental/serverTweak

Server tweak

Author: dhilpipre

settings.gradle

@@ -4,6 +4,7 @@ include 'webmethods-isclient-9.x'
 include 'webmethods-b2b-server-10.x'
 include 'webmethods-b2b-server-9.x'
 include 'webmethods-adapter'
+include 'softwareag-adapter'
 include 'webmethods-dispatch'
 include 'webmethods-jms'
 include 'webmethods-sap'

softwareag-adapter/build.gradle

@@ -0,0 +1,34 @@
+
+// Build.gradle generated for instrumentation module webmethods-adapter
+
+apply plugin: 'java'
+
+dependencies {
+   // Declare a dependency on each JAR you want to instrument
+   // Example:
+   // implementation 'javax.servlet:servlet-api:2.5'
+
+   // New Relic Java Agent dependencies
+   implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'
+   implementation 'com.newrelic.agent.java:newrelic-api:6.4.0'
+   implementation fileTree(include: ['*.jar'], dir: 'lib')
+   implementation fileTree(include: ['*.jar'], dir: '../libs')
+   implementation fileTree(include: ['*.jar'], dir: '../test-lib')
+}
+
+jar {
+  manifest {
+    attributes 'Implementation-Title': 'com.newrelic.instrumentation.labs.softwareag-adapter'
+    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'
+}

softwareag-adapter/lib/adapter-api-10.11.0.0.jar

@@ -4,9 +4,8 @@
 apply plugin: 'java'
 
 dependencies {
-   // Declare a dependency on each JAR you want to instrument
-   // Example:
-   // implementation 'javax.servlet:servlet-api:2.5'
+   implementation group: 'javax.resource', name: 'javax.resource-api', version: '1.7.1'
+
 
    // New Relic Java Agent dependencies
    implementation 'com.newrelic.agent.java:newrelic-agent:6.4.0'

webmethods-adapter/src/main/java/com/softwareag/wsstack/adapter/api/Adapter.java renamed to softwareag-adapter/src/main/java/com/softwareag/wsstack/adapter/api/Adapter.java

@@ -10,6 +10,8 @@
 import com.newrelic.agent.service.ServiceFactory;
 import com.newrelic.api.agent.Config;
 import com.newrelic.api.agent.NewRelic;
+import com.wm.driver.comm.b2b.WmMessage;
+import com.wm.io.comm.IMessage;
 import com.wm.lang.flow.FlowElement;
 import com.wm.lang.flow.FlowRoot;
 import com.wm.lang.flow.FlowState;
@@ -77,6 +79,16 @@ public static String[] getMetricName(String... names) {
 		return namesArray;
 	}
 
+	public static void addIMessage(Map<String,Object> attributes, IMessage message) {
+		if(message != null) {
+			addValue(attributes, "IMessage-Command", message.getCommand());
+			if(message instanceof WmMessage) {
+				addValue(attributes, "IMessage-ContentType", ((WmMessage)message).getContentType());
+			}
+			addValue(attributes, "IMessage-UUID", message.getUUID());
+		}
+	}
+	
 	private static void processConfig(Config config) {
 		init();
 		String s = config.getValue(SERVICE_IGNORE);

webmethods-adapter/build.gradle

@@ -0,0 +1,36 @@
+package com.wm.app.b2b.server;
+
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.Transaction;
+import com.newrelic.api.agent.TransactionNamePriority;
+import com.newrelic.api.agent.TransportType;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+import com.newrelic.instrumentation.webmethods.b2bserver.HTTPHeaderWrapper;
+import com.wm.net.HttpHeader;
+
+@Weave
+public abstract class HTTPDocHandler {
+
+	@Trace(dispatcher = true)
+	public boolean process(ProtocolState state) {
+		String requestURL = state.getRequestUrl();
+		if(requestURL != null && !requestURL.isEmpty()) {
+			NewRelic.getAgent().getTracedMethod().addCustomAttribute("RequestURL", requestURL);
+		}
+		Transaction transaction = NewRelic.getAgent().getTransaction();
+		if(!transaction.isWebTransaction()) {
+			transaction.convertToWebTransaction();
+		}
+		HttpHeader header = state.getRequestHeader();
+		if(header != null) {
+			HTTPHeaderWrapper wrapper = new HTTPHeaderWrapper(header);
+			transaction.acceptDistributedTraceHeaders(TransportType.HTTP, wrapper);
+		}
+		transaction.setTransactionName(TransactionNamePriority.FRAMEWORK_HIGH, false, "HTTPDocHandler", "HTTPDocHandler");
+		NewRelic.getAgent().getTracedMethod().addCustomAttribute("RequestURI", state.getHttpRequestUrl());
+		return Weaver.callOriginal();
+	}
+	
+}

webmethods-b2b-server-10.x/src/main/java/com/newrelic/instrumentation/webmethods/b2bserver/WebMethodsUtils.java

@@ -0,0 +1,35 @@
+package com.wm.app.b2b.server;
+
+import com.newrelic.api.agent.NewRelic;
+import com.newrelic.api.agent.Trace;
+import com.newrelic.api.agent.Transaction;
+import com.newrelic.api.agent.TransactionNamePriority;
+import com.newrelic.api.agent.TransportType;
+import com.newrelic.api.agent.weaver.Weave;
+import com.newrelic.api.agent.weaver.Weaver;
+import com.newrelic.instrumentation.webmethods.b2bserver.HTTPHeaderWrapper;
+import com.wm.net.HttpHeader;
+
+@Weave
+public abstract class HTTPMessageHandler {
+
+	@Trace(dispatcher = true)
+	public boolean process(ProtocolState state)  {
+		String requestURL = state.getRequestUrl();
+		if(requestURL != null && !requestURL.isEmpty()) {
+			NewRelic.getAgent().getTracedMethod().addCustomAttribute("RequestURL", requestURL);
+		}
+		Transaction transaction = NewRelic.getAgent().getTransaction();
+		if(!transaction.isWebTransaction()) {
+			transaction.convertToWebTransaction();
+		}
+		transaction.setTransactionName(TransactionNamePriority.FRAMEWORK_HIGH, false, "HttpHandler", "HTTPMessageHandler");
+		HttpHeader header = state.getRequestHeader();
+		if(header != null) {
+			HTTPHeaderWrapper wrapper = new HTTPHeaderWrapper(header);
+			transaction.acceptDistributedTraceHeaders(TransportType.HTTP, wrapper);
+		}
+		NewRelic.getAgent().getTracedMethod().addCustomAttribute("RequestURI", state.getHttpRequestUrl());
+		return Weaver.callOriginal();
+	}
+}