Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Changes default instrumentation engine to ASM #2216

Merged
merged 1 commit into from
Nov 2, 2016
Merged

Changes default instrumentation engine to ASM #2216

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
2 changes: 1 addition & 1 deletion agent/src/main/resources-local/pinpoint.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ profiler.callstack.max.depth=64
profiler.interceptor.exception.propagate=false

# Allow bytecode framework (JAVASSIST or ASM)
profiler.instrument.engine=JAVASSIST
profiler.instrument.engine=ASM

# bytecode dump option
# java bytecode debug option
Expand Down
2 changes: 1 addition & 1 deletion agent/src/main/resources-release/pinpoint.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ profiler.callstack.max.depth=64
profiler.interceptor.exception.propagate=false

# Allow bytecode framework (JAVASSIST or ASM)
profiler.instrument.engine=JAVASSIST
profiler.instrument.engine=ASM

# bytecode dump option
# java bytecode debug option
Expand Down
2 changes: 1 addition & 1 deletion agent/src/main/resources/pinpoint-real-env-lowoverhead-sample.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ profiler.callstack.max.depth=64
profiler.interceptor.exception.propagate=false

# Allow bytecode framework (JAVASSIST or ASM)
profiler.instrument.engine=JAVASSIST
profiler.instrument.engine=ASM

# java bytecode dump option
bytecode.dump.enable=false
Expand Down
2 changes: 1 addition & 1 deletion agent/src/test/resources/pinpoint-disabled-plugin-test.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ profiler.agentInfo.send.retry.interval=300000
profiler.tcpdatasender.command.accept.enable=true

# Allow bytecode framework (JAVASSIST or ASM)
profiler.instrument.engine=JAVASSIST
profiler.instrument.engine=ASM


###########################################################
Expand Down
3 changes: 2 additions & 1 deletion ...rap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class DefaultProfilerConfig implements ProfilerConfig {
private final Properties properties;
private final PropertyPlaceholderHelper propertyPlaceholderHelper = new PropertyPlaceholderHelper("${", "}");

@Deprecated
public static final String INSTRUMENT_ENGINE_JAVASSIST = "JAVASSIST";
public static final String INSTRUMENT_ENGINE_ASM = "ASM";

Expand Down Expand Up @@ -370,7 +371,7 @@ void readPropertyValues() {
final ValueResolver placeHolderResolver = new PlaceHolderResolver();

this.profileEnable = readBoolean("profiler.enable", true);
this.profileInstrumentEngine = readString("profiler.instrument.engine", INSTRUMENT_ENGINE_JAVASSIST);
this.profileInstrumentEngine = readString("profiler.instrument.engine", INSTRUMENT_ENGINE_ASM);

this.interceptorRegistrySize = readInt("profiler.interceptorregistry.size", 1024*8);

Expand Down
19 changes: 19 additions & 0 deletions quickstart/agent/src/main/resources/pinpoint.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,25 @@ profiler.tcpdatasender.command.accept.enable=true
# Trace Agent active thread info
profiler.pinpoint.activethread=true

## Call Stack
# Set max depth, if -1 is unlimited and min is 2.
profiler.callstack.max.depth=64

# weather or not to propagate exceptions occurred at interceptor
profiler.interceptor.exception.propagate=false

# Allow bytecode framework (JAVASSIST or ASM)
profiler.instrument.engine=ASM

# bytecode dump option
# java bytecode debug option
bytecode.dump.enable=false
#bytecode.dump.classlist=com.naver.user.UserService,com.pinpoint.debug.TestClass
bytecode.dump.classlist=
bytecode.dump.bytecode=false
bytecode.dump.verify=false
bytecode.dump.asm=false

###########################################################
# application type #
###########################################################
Expand Down
19 changes: 19 additions & 0 deletions quickstart/conf/pinpoint.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,25 @@ profiler.tcpdatasender.command.accept.enable=true
# Trace Agent active thread info
profiler.pinpoint.activethread=true

## Call Stack
# Set max depth, if -1 is unlimited and min is 2.
profiler.callstack.max.depth=64

# weather or not to propagate exceptions occurred at interceptor
profiler.interceptor.exception.propagate=false

# Allow bytecode framework (JAVASSIST or ASM)
profiler.instrument.engine=ASM

# bytecode dump option
# java bytecode debug option
bytecode.dump.enable=false
#bytecode.dump.classlist=com.naver.user.UserService,com.pinpoint.debug.TestClass
bytecode.dump.classlist=
bytecode.dump.bytecode=false
bytecode.dump.verify=false
bytecode.dump.asm=false

###########################################################
# application type #
###########################################################
Expand Down