-
Notifications
You must be signed in to change notification settings - Fork 288
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
8 changed files
with
78 additions
and
193 deletions.
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
...tstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jmx/MBeanServerRegistry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package datadog.trace.bootstrap.instrumentation.jmx; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
import javax.management.MBeanServer; | ||
|
||
public class MBeanServerRegistry { | ||
private static final Map<String, MBeanServer> MAP = new HashMap<>(); | ||
|
||
public static Map<String, MBeanServer> get() { | ||
return MAP; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
38 changes: 38 additions & 0 deletions
38
...ent/agent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/AgentConnectionFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
package datadog.trace.agent.jmxfetch; | ||
|
||
import java.io.IOException; | ||
import java.util.Map; | ||
import javax.management.MBeanServer; | ||
import org.datadog.jmxfetch.Connection; | ||
import org.datadog.jmxfetch.ConnectionFactory; | ||
import org.datadog.jmxfetch.DefaultConnectionFactory; | ||
import org.datadog.jmxfetch.JvmDirectConnection; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
|
||
public class AgentConnectionFactory implements ConnectionFactory { | ||
private static final Logger LOGGER = LoggerFactory.getLogger(AgentConnectionFactory.class); | ||
|
||
private final ConnectionFactory defaultConnectionFactory = new DefaultConnectionFactory(); | ||
private final Map<String, MBeanServer> instanceStore; | ||
|
||
public AgentConnectionFactory(Map<String, MBeanServer> instanceStore) { | ||
this.instanceStore = instanceStore; | ||
} | ||
|
||
@Override | ||
public Connection createConnection(Map<String, Object> map) throws IOException { | ||
Object mbeanServerClass = map.get("mbean_server_class"); | ||
if (mbeanServerClass != null) { | ||
MBeanServer mBeanServer = instanceStore.get(mbeanServerClass.toString()); | ||
if (mBeanServer != null) { | ||
return new InitialMBeanServerConnection(mBeanServer); | ||
} | ||
LOGGER.warn( | ||
"Unable to provide a MBean server instance of {}. Falling back to platform default", | ||
mbeanServerClass); | ||
return new JvmDirectConnection(); | ||
} | ||
return defaultConnectionFactory.createConnection(map); | ||
} | ||
} |
16 changes: 16 additions & 0 deletions
16
...ent-jmxfetch/src/main/java/datadog/trace/agent/jmxfetch/InitialMBeanServerConnection.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package datadog.trace.agent.jmxfetch; | ||
|
||
import java.io.IOException; | ||
import javax.annotation.Nonnull; | ||
import javax.management.MBeanServerConnection; | ||
import org.datadog.jmxfetch.JvmDirectConnection; | ||
|
||
public class InitialMBeanServerConnection extends JvmDirectConnection { | ||
|
||
public InitialMBeanServerConnection(@Nonnull final MBeanServerConnection mbs) throws IOException { | ||
this.mbs = mbs; | ||
} | ||
|
||
@Override | ||
protected void createConnection() throws IOException {} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 0 additions & 59 deletions
59
...og/trace/instrumentation/java/lang/management/AgentMBeanServerUpgradeInstrumentation.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters