root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #409 from cdupuis/SPR-11083 

* SPR-11083:
  Allow instrumentation to be used with Attach API
This commit is contained in:
Phillip Webb 2013-11-20 10:39:33 -08:00
parent 41cdbd292a f6f0adf63b
commit 63c143be61
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -327,6 +327,8 @@ project("spring-instrument") {
jar { jar {
manifest.attributes["Premain-Class"] = manifest.attributes["Premain-Class"] =
"org.springframework.instrument.InstrumentationSavingAgent" "org.springframework.instrument.InstrumentationSavingAgent"
manifest.attributes["Agent-Class"] =
"org.springframework.instrument.InstrumentationSavingAgent"
manifest.attributes["Can-Redefine-Classes"] = "true" manifest.attributes["Can-Redefine-Classes"] = "true"
manifest.attributes["Can-Retransform-Classes"] = "true" manifest.attributes["Can-Retransform-Classes"] = "true"
manifest.attributes["Can-Set-Native-Method-Prefix"] = "false" manifest.attributes["Can-Set-Native-Method-Prefix"] = "false"

14
spring-instrument/src/main/java/org/springframework/instrument/InstrumentationSavingAgent.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2013 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -39,6 +39,13 @@ public class InstrumentationSavingAgent {
instrumentation = inst; instrumentation = inst;
} }
/**
* Save the {@link Instrumentation} interface exposed by the JVM.
* This method is required to dynamically load this Agent with the Attach API.
*/
public static void agentmain(String agentArgs, Instrumentation inst) {
instrumentation = inst;
}
/** /**
* Return the {@link Instrumentation} interface exposed by the JVM. * Return the {@link Instrumentation} interface exposed by the JVM.
@ -48,8 +55,9 @@ public class InstrumentationSavingAgent {
* {@link org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver#getInstrumentation()} * {@link org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver#getInstrumentation()}
* instead - which will work without the agent class in the classpath as well. * instead - which will work without the agent class in the classpath as well.
* @return the {@code Instrumentation} instance previously saved when * @return the {@code Instrumentation} instance previously saved when
* the {@link #premain} method was called by the JVM; will be {@code null} * the {@link #premain} or {@link #agentmain} methods was called by the JVM;
* if this class was not used as Java agent when this JVM was started. * will be {@code null} if this class was not used as Java agent when this
* JVM was started or it wasn't installed as agent using the Attach API.
* @see org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver#getInstrumentation() * @see org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver#getInstrumentation()
*/ */
public static Instrumentation getInstrumentation() { public static Instrumentation getInstrumentation() {