Skip to content

Adding env vars to be logged before each invocation #195

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

Merged
nishalad95 merged 5 commits into from
Apr 12, 2019
Merged

Adding env vars to be logged before each invocation #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e8ba92
WIP adding logframer and tests to fdk-java, before each function invo…
nishalad95 Apr 11, 2019
7cff542
WIP debugging test
nishalad95 Apr 11, 2019
5b58491
Quick fix..?
jan-g Apr 11, 2019
736813e
checking if env variables are logged out to stdout and stderr, stdout…
nishalad95 Apr 11, 2019
b5da35d
removing comments of test in wrong file
nishalad95 Apr 11, 2019
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
22 changes: 22 additions & 0 deletions runtime/src/main/java/com/fnproject/fn/runtime/MethodFunctionInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,26 @@
*/
public class MethodFunctionInvoker implements FunctionInvoker {

/*
* If enabled, print the logging framing content
*/
public void logFramer(FunctionRuntimeContext rctx, InputEvent evt) {
String framer = rctx.getConfigurationByKey("FN_LOGFRAME_NAME").orElse("");

if (framer != "") {
String valueSrc = rctx.getConfigurationByKey("FN_LOGFRAME_HDR").orElse("");

if (valueSrc != "") {
String id = evt.getHeaders().get(valueSrc).orElse("");
if (id != "") {
System.out.println(framer + "=" + id);
System.err.println(framer + "=" + id);
}
}
}
}


/**
* Invoke the function wrapped by this loader
*
Expand All @@ -33,6 +53,8 @@ public Optional<OutputEvent> tryInvoke(InvocationContext ctx, InputEvent evt) th

Object rawResult;

logFramer(runtimeContext, evt);

try {
rawResult = method.getTargetMethod().invoke(ctx.getRuntimeContext().getInvokeInstance().orElse(null), userFunctionParams);
} catch (IllegalAccessException | InvocationTargetException e) {
Expand Down
13 changes: 13 additions & 0 deletions runtime/src/test/java/com/fnproject/fn/runtime/EndToEndInvokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,19 @@ public void shouldReadBytesOnDefaultCodec() throws Exception {

}

@Test
public void shouldPrintLogFrame() throws Exception {
fn.setConfig("FN_LOGFRAME_NAME", "containerID");
fn.setConfig("FN_LOGFRAME_HDR", "fnID");
fn.givenEvent().withHeader("fnID", "fnIDVal").withBody( "Hello world!").enqueue();

fn.thenRun(TestFn.class, "fnEcho");
assertThat(fn.getOnlyOutputAsString()).isEqualTo("Hello world!");
// stdout gets redirected to stderr - hence printing out twice
assertThat(fn.getStdErrAsString()).isEqualTo("containerID=fnIDVal\ncontainerID=fnIDVal\n");

}


@Test
public void shouldWriteBytesOnDefaultCodec() throws Exception {
Expand Down