Skip to content

add 'setConfiguration' method for external configuration #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
jcooky wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add 'setConfiguration' method for external configuration #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3838649
add 'setConfiguration' method for external configuration
jcooky Sep 11, 2014
9decdef
change measure unit from milliseconds to nanoseconds
jcooky Jan 12, 2015
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
15 changes: 8 additions & 7 deletions jrat-agent/src/main/java/org/shiftone/jrat/core/Environment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
package org.shiftone.jrat.core;

import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Date;
import org.shiftone.jrat.core.config.Configuration;
import org.shiftone.jrat.core.config.ConfigurationParser;
import org.shiftone.jrat.core.config.Settings;
import org.shiftone.jrat.util.io.IOUtil;
import org.shiftone.jrat.util.io.ResourceUtil;
import org.shiftone.jrat.util.log.Logger;

import java.io.*;
import java.util.Date;

/**
* @author jeff@shiftone.org (Jeff Drost)
*/
Expand All @@ -22,7 +19,7 @@ public class Environment {
private static final String CONFIG_FILE = "jrat.xml";
private static final String DEFAULT_FILE = "org/shiftone/jrat/core/default-jrat.xml";
public static final Environment INSTANCE = new Environment();
private final Configuration configuration;
private Configuration configuration;

public Environment() {

Expand Down Expand Up @@ -79,6 +76,10 @@ private void copyDefaultFile(File file) {
}
}

public static void setConfiguration(Configuration configuration) {
INSTANCE.configuration = configuration;
}

public static Configuration getConfiguration() {
return INSTANCE.configuration;
}
Expand Down
4 changes: 2 additions & 2 deletions jrat-agent/src/main/java/org/shiftone/jrat/core/ThreadState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public long begin(MethodHandler methodHandler) {

methodHandler.onMethodStart();

long end = System.currentTimeMillis();
long end = System.nanoTime();

// clockSkew += (end - begin);
return end; // - clockSkew;
Expand All @@ -43,7 +43,7 @@ public long begin(MethodHandler methodHandler) {

public void end(MethodHandler methodHandler, long startTime, Throwable throwable) {

long begin = System.currentTimeMillis();
long begin = System.nanoTime();
long duration = begin - startTime;

methodHandler.onMethodFinish(duration, throwable);
Expand Down
2 changes: 1 addition & 1 deletion jrat-agent/src/main/java/org/shiftone/jrat/core/spi/MethodHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ public interface MethodHandler {

void onMethodStart();

void onMethodFinish(long durationMillis, Throwable throwable);
void onMethodFinish(long durationNanos, Throwable throwable);
}