GH-456 Fix Azure logging

Added static delegate context which holds target context and is also refreshed with new context on each request

Resolves #456
This commit is contained in:
Oleg Zhurakousky
2020-04-02 16:36:54 +02:00
parent d3345576bd
commit aa721a7b43
6 changed files with 59 additions and 75 deletions

View File

@@ -22,6 +22,8 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import com.microsoft.azure.functions.ExecutionContext;
@SpringBootApplication
public class Config {
@@ -30,58 +32,12 @@ public class Config {
}
@Bean
public Function<Foo, Bar> uppercase() {
return foo -> new Bar(foo.getValue().toUpperCase());
public Function<String, String> uppercase(ExecutionContext context) {
return value -> {
context.getLogger().info("Uppercasing " + value);
return value.toUpperCase();
};
}
}
class Foo {
private String value;
Foo() {
}
Foo(String value) {
this.value = value;
}
public String lowercase() {
return this.value.toLowerCase();
}
public String uppercase() {
return this.value.toUpperCase();
}
public String getValue() {
return this.value;
}
public void setValue(String value) {
this.value = value;
}
}
class Bar {
private String value;
Bar() {
}
Bar(String value) {
this.value = value;
}
public String getValue() {
return this.value;
}
public void setValue(String value) {
this.value = value;
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@ import org.springframework.cloud.function.adapter.azure.AzureSpringBootRequestHa
/**
* @author Soby Chacko
*/
public class FooHandler extends AzureSpringBootRequestHandler<Foo, Bar> {
public class UppercaseHandler extends AzureSpringBootRequestHandler<String, String> {
@FunctionName("uppercase")
public Bar execute(@HttpTrigger(name = "req", methods = {HttpMethod.GET,
HttpMethod.POST}, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<Foo>> request,
public String execute(@HttpTrigger(name = "req", methods = {HttpMethod.GET,
HttpMethod.POST}, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
ExecutionContext context) {
return handleRequest(request.getBody().get(), context);
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,19 +28,13 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class MapTests {
@Test
public void test() {
Bar result = new Config().uppercase().apply(new Foo("foo"));
assertThat(result.getValue()).isEqualTo("FOO");
}
@Test
public void start() throws Exception {
AzureSpringBootRequestHandler<Foo, Bar> handler = new AzureSpringBootRequestHandler<>(
AzureSpringBootRequestHandler<String, String> handler = new AzureSpringBootRequestHandler<>(
Config.class);
Bar result = handler.handleRequest(new Foo("foo"), null);
String result = handler.handleRequest("foo", null);
handler.close();
assertThat(result.getValue()).isEqualTo("FOO");
assertThat(result).isEqualTo("FOO");
}
}