Skip to content

refactor and update jvm support #1

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor and update jvm support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ apply plugin: 'idea'
import de.undercouch.gradle.tasks.download.Download


sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7

group = 'com.newrelic.gpo'
version = '3.5.1'
version = '3.5.2-SNAPSHOT'

def agentVersion='3.39.0'
def agentVersion='6.4.2'
def agentJar ='newrelic-agent-'+agentVersion+'.jar'
def agentRepo = 'https://repo1.maven.org/maven2/com/newrelic/agent/java/newrelic-agent/' + agentVersion + '/' + agentJar

Expand Down
174 changes: 84 additions & 90 deletions src/main/java/com/newrelic/gpo/jmx2insights/JMX2Insights.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.TabularData;
import javax.naming.InitialContext;

import java.lang.management.ManagementFactory;
import java.util.Collection;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
Expand All @@ -28,7 +27,6 @@
import com.newrelic.api.agent.NewRelic;
import com.newrelic.agent.config.AgentConfig;
import com.newrelic.agent.config.AgentConfigListener;
import com.newrelic.agent.deps.com.google.common.collect.Multiset.Entry;

/* jmx2insights */
import com.newrelic.gpo.jmx2insights.Constantz;
Expand All @@ -43,10 +41,12 @@ public class JMX2Insights extends AbstractService implements HarvestListener {
private int invocationCounter = 1;
private JMX2InsightsConfig jmx2insightsConfig = null;
private MemoryEventsThread memoryEventsThread = null; //first implementation of the memory thread.
private MBeanServer mbeanServer = null;

public JMX2Insights() {

super(JMX2Insights.class.getSimpleName());

Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Initializing Service Class.");


Expand Down Expand Up @@ -77,87 +77,75 @@ public void beforeHarvest(String _appName, StatsEngine _statsEngine) {
try {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Processing harvest event for Agent.");
if ((jmx2insightsConfig == null) || (!jmx2insightsConfig.isEnabled())){
Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Disabled.");
return;
}

if (jmx2insightsConfig != null) {

if (jmx2insightsConfig.isEnabled()) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Enabled.");

//execute interval counter should the frequency be equal to the counter
if (jmx2insightsConfig.getFrequency() == invocationCounter) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Matched invocation counter ... execute ops pending ....");
if (jmx2insightsConfig.getMode().equals("disco")) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting disco jmx harvest.");
executeDisco();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished disco jmx harvest.");

} //if
else if (jmx2insightsConfig.getMode().equals("strict")) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting strict jmx harvest.");
executeStrict();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished strict jmx harvest.");

} //else if
else if (jmx2insightsConfig.getMode().equals("promiscuous")) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting promiscuous jmx harvest.");
executePromiscuous();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished promiscuous jmx harvest.");

} //else if
else if (jmx2insightsConfig.getMode().equals("open")) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting open jmx harvest.");
executeOpen();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished open jmx harvest.");
} //else if
else {

Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Unknown JMX2Insights configuration mode: " + jmx2insightsConfig.getMode() + " must be one of strict, open, disco, or promiscuous.");
} //else

//process the listed operations
if (jmx2insightsConfig.operationsDefined()) {
Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Enabled.");

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting MBean operations execution.");
executeOperations();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished MBean operations execution.");
} //if
else {
//execute interval counter should the frequency be equal to the counter
if (jmx2insightsConfig.getFrequency() != invocationCounter) {

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] No MBean operations have been defined.");
} //else
boolean isInvocationCounterGreater= (invocationCounter > jmx2insightsConfig.getFrequency());

//reset the invocation counter to 1.
invocationCounter = 1;
} //if
else {
invocationCounter = (isInvocationCounterGreater)? 1: invocationCounter++;
String message = (isInvocationCounterGreater)?" Invocation counter was placed in an unexpected state. Resetting to 1" :"Skipping the harvest";

if (invocationCounter > jmx2insightsConfig.getFrequency()) {
Agent.LOG.info(String.format("[%s] %s",Constantz.EXTENSION_NAME , message));
return;
}

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Invocation counter was placed in an unexpected state. Resetting to 1. ");
invocationCounter = 1;
mbeanServer = ManagementFactory.getPlatformMBeanServer();

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Matched invocation counter ... execute ops pending ....");
switch(jmx2insightsConfig.getMode()){
case OperationMode.DISCO:
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting disco jmx harvest.");
executeDisco();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished disco jmx harvest.");

break;
case OperationMode.STRICT:
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting strict jmx harvest.");
executeStrict();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished strict jmx harvest.");

break;
case OperationMode.PROMISCUOUS:
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting promiscuous jmx harvest.");
executePromiscuous();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished promiscuous jmx harvest.");

break;
case OperationMode.OPEN:
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting open jmx harvest.");
executeOpen();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished open jmx harvest.");

break;
default:
Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Unknown JMX2Insights configuration mode: " + jmx2insightsConfig.getMode() + " must be one of strict, open, disco, or promiscuous.");
break;
}

} //if
else {

invocationCounter++;
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Skipping the harvest. " + invocationCounter);
} //else
//process the listed operations
if (jmx2insightsConfig.operationsDefined()) {

} //else
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Starting MBean operations execution.");
executeOperations();
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Finished MBean operations execution.");
} //if
else {

} //if
else {
Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] No MBean operations have been defined.");
} //else

Agent.LOG.fine("[" + Constantz.EXTENSION_NAME + "] Disabled.");
} //else
//reset the invocation counter to 1.
invocationCounter = 1;

} //if

} //try
catch (java.lang.Exception _e) {
Expand Down Expand Up @@ -289,7 +277,6 @@ private void executePromiscuous() {

private void executeStrict() {

MBeanServer __mbeanServer = ManagementFactory.getPlatformMBeanServer();
MBeanConfig[] __mbeans = jmx2insightsConfig.getMBeans();
ObjectName __tempMBean = null;

Expand Down Expand Up @@ -330,7 +317,7 @@ private void executeStrict() {
} //if

__tempMBean = new ObjectName(__mbeans[i].getMBeanName());
__oiSet = __mbeanServer.queryMBeans(__tempMBean, null);
__oiSet = mbeanServer.queryMBeans(__tempMBean, null);

if (__oiSet == null) {
Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Unable to find the bean defined by configuration: " + __mbeans[i].getMBeanName());
Expand Down Expand Up @@ -363,7 +350,7 @@ private void executeStrict() {

for (int ii = 0; ii < __macAttributes.length; ii++) {

handleAttributeValue(__mbeanServer.getAttribute(__oiInstance.getObjectName(), __macAttributes[ii].getAttributeName()), __macAttributes[ii], __tempEventAttributes, __tempTabularEventVector);
handleAttributeValue(mbeanServer.getAttribute(__oiInstance.getObjectName(), __macAttributes[ii].getAttributeName()), __macAttributes[ii], __tempEventAttributes, __tempTabularEventVector);
} //for


Expand Down Expand Up @@ -401,8 +388,7 @@ private void executeStrict() {

private void salope() {

MBeanServer __mbeanServer = ManagementFactory.getPlatformMBeanServer();
Set<ObjectInstance> __mbeanInstances = __mbeanServer.queryMBeans(null, null);
Set<ObjectInstance> __mbeanInstances = mbeanServer.queryMBeans(null, null);
Iterator<ObjectInstance> __iterator = __mbeanInstances.iterator();

Map<String, Object> __tempEventAttributes = null;
Expand All @@ -429,14 +415,14 @@ private void salope() {
__tempEventAttributes.put("MBeanInstanceType", (__htOIProperties.get("type") == null)? "unknown_type": __htOIProperties.get("type"));


__mbiTempInfo = __mbeanServer.getMBeanInfo(__oiInstance.getObjectName());
__mbiTempInfo = mbeanServer.getMBeanInfo(__oiInstance.getObjectName());
__mbaiAttributes = __mbiTempInfo.getAttributes();

for (int i = 0; i < __mbaiAttributes.length; i++) {

if (__mbaiAttributes[i].isReadable() && __mbaiAttributes[i].getName() != null) {

handleAttributeValue(__mbeanServer.getAttribute(__oiInstance.getObjectName(), __mbaiAttributes[i].getName()), new MBeanAttributeConfig(__mbaiAttributes[i].getName()), __tempEventAttributes, __tempTabularEventVector);
handleAttributeValue(mbeanServer.getAttribute(__oiInstance.getObjectName(), __mbaiAttributes[i].getName()), new MBeanAttributeConfig(__mbaiAttributes[i].getName()), __tempEventAttributes, __tempTabularEventVector);

} //if
else {
Expand Down Expand Up @@ -485,7 +471,6 @@ private void salope() {

private void executeOpen() {

MBeanServer __mbeanServer = ManagementFactory.getPlatformMBeanServer();
MBeanConfig[] __mbeans = jmx2insightsConfig.getMBeans();
ObjectName __tempMBean = null;
Map<String, Object> __tempEventAttributes = null;
Expand Down Expand Up @@ -518,7 +503,7 @@ private void executeOpen() {


__tempMBean = new ObjectName(__mbeans[i].getMBeanName());
__oiSet = __mbeanServer.queryMBeans(__tempMBean, null);
__oiSet = mbeanServer.queryMBeans(__tempMBean, null);
__oiIterator = __oiSet.iterator();

while (__oiIterator.hasNext()) {
Expand All @@ -536,15 +521,15 @@ private void executeOpen() {

try {

__mbiTempInfo = __mbeanServer.getMBeanInfo(__oiInstance.getObjectName());
__mbiTempInfo = mbeanServer.getMBeanInfo(__oiInstance.getObjectName());
__mbaiAttributes = __mbiTempInfo.getAttributes();

//report all the attributes for this mbean
for (int ii = 0; ii < __mbaiAttributes.length; ii++) {

if (__mbaiAttributes[ii].isReadable()) {

handleAttributeValue(__mbeanServer.getAttribute(__oiInstance.getObjectName(), __mbaiAttributes[ii].getName()), new MBeanAttributeConfig(__mbaiAttributes[ii].getName()), __tempEventAttributes, __tempTabularEventVector);
handleAttributeValue(mbeanServer.getAttribute(__oiInstance.getObjectName(), __mbaiAttributes[ii].getName()), new MBeanAttributeConfig(__mbaiAttributes[ii].getName()), __tempEventAttributes, __tempTabularEventVector);

} //if
else {
Expand Down Expand Up @@ -595,8 +580,7 @@ private void executeOpen() {

private void executeDisco() {

MBeanServer __mbeanServer = ManagementFactory.getPlatformMBeanServer();
Set<ObjectInstance> __mbeanInstances = __mbeanServer.queryMBeans(null, null);
Set<ObjectInstance> __mbeanInstances = mbeanServer.queryMBeans(null, null);
Iterator<ObjectInstance> __iterator = __mbeanInstances.iterator();

try {
Expand All @@ -613,7 +597,7 @@ private void executeDisco() {
Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Object Name Domain: " + objectName.getDomain());

Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] *** MBEAN ATTRIBUTES *** ");
MBeanInfo __info = __mbeanServer.getMBeanInfo(objectName);
MBeanInfo __info = mbeanServer.getMBeanInfo(objectName);
MBeanAttributeInfo[] __mbai = __info.getAttributes();

for (int i = 0; i < __mbai.length; i++) {
Expand Down Expand Up @@ -848,7 +832,6 @@ else if (_object instanceof int[]) {

private void executeOperations() {

MBeanServer __mbeanServer = ManagementFactory.getPlatformMBeanServer();
MBeanOperationConfig[] __operations = jmx2insightsConfig.getMBeanOperationConfigs();

ObjectName __tempMBean = null;
Expand All @@ -863,7 +846,7 @@ private void executeOperations() {
try {

__tempMBean = new ObjectName(__operations[i].getMBeanName());
__oiSet = __mbeanServer.queryMBeans(__tempMBean, null);
__oiSet = mbeanServer.queryMBeans(__tempMBean, null);

//determine what to do with a null result
if (__oiSet != null) {
Expand Down Expand Up @@ -907,15 +890,15 @@ private void executeOperations() {
//dynacache stats ...
Agent.LOG.info("[" + Constantz.EXTENSION_NAME + "] Beta --> Attempting WebSphere DynaCache operations. ");

String __cacheinstancenames[] = (String[]) __mbeanServer.invoke(__tempMBean, "getCacheInstanceNames", null, null);
String __cacheinstancenames[] = (String[]) mbeanServer.invoke(__tempMBean, "getCacheInstanceNames", null, null);

for (int k = 0; k < __cacheinstancenames.length; k++) {

String __cacheInstance = __cacheinstancenames[k];
String __cacheStats[] = {"MemoryCacheEntries", "MemoryCacheSizeInMB", "CacheHits", "CacheMisses", "CacheRemoves"};
Object __params[] = {__cacheInstance, __cacheStats};
String __signature[] = {String.class.getName(), String[].class.getName()};
String __result[] = (String[]) __mbeanServer.invoke(__tempMBean, "getCacheStatistics", __params, __signature);
String __result[] = (String[]) mbeanServer.invoke(__tempMBean, "getCacheStatistics", __params, __signature);

for (int l = 0; l < __result.length; l++) {

Expand Down Expand Up @@ -976,6 +959,7 @@ private void executeOperations() {

//listen to the agent configuration and reload if we need to - allows dynamic configuration of jmx2insights
protected final AgentConfigListener configListener = new AgentConfigListener() {

@Override
public void configChanged(String _appName, AgentConfig _agentConfig) {

Expand All @@ -1000,4 +984,14 @@ private void publishInsightsEvent(Map<String,Object> mAttribs){
NewRelic.getAgent().getInsights().recordCustomEvent(jmx2insightsConfig.getEventName(), params);

}
} //JMX2Insights
} //JMX2Insights


interface OperationMode {

static final String DISCO= "disco";
static final String STRICT= "strict";
static final String PROMISCUOUS= "promiscuous";
static final String OPEN= "open";

}