diff --git a/README.md b/README.md
index e5394bc..c8423a7 100644
--- a/README.md
+++ b/README.md
@@ -191,14 +191,14 @@ java -jar target/helidon-demo-mp.jar
export REMOTE_REPO_PREFIX=iad.ocir.io/some-tenant/some-path/
# イメージの作成とタグ付け
-mvn exec:exec@docker-build [-Ddocker.file=<任意のDockerfileを指定したい場合>]
+mvn -f pom-docker.xml exec:exec@docker-build [-Ddocker.file=<任意のDockerfileを指定したい場合>]
# iad.ocir.io/some-tenant/some-path/helidon-mp-demo への image push
-mvn exec:exec@docker-push-latest exec:exec@docker-push-version
+mvn -f pom-docker.xml exec:exec@docker-push-latest exec:exec@docker-push-version
# ローカル・イメージの作成だけ行いたい場合
# イメージの名前は helidon-mp-demo:{version} となる
-mvn exec:exec@docker-local-build [-Ddocker.file=<任意のDockerfileを指定したい場合>]
+mvn -f pom-docker.xml exec:exec@docker-local-build [-Ddocker.file=<任意のDockerfileを指定したい場合>]
```
```bash
diff --git a/pom-docker.xml b/pom-docker.xml
new file mode 100644
index 0000000..f8d776b
--- /dev/null
+++ b/pom-docker.xml
@@ -0,0 +1,104 @@
+
+
+ 4.0.0
+
+ oracle.demo
+ helidon-demo-mp
+ 2.3.0.0
+
+ ${project.artifactId}
+
+
+
+ ${env.REMOTE_REPO_PREFIX}
+ Dockerfile
+
+
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 3.0.0
+
+
+
+ docker-local-build
+
+ exec
+
+
+ docker
+
+ build
+ -t
+ ${docker.repo.prefix}${project.artifactId}:${project.version}
+ -t
+ ${docker.repo.prefix}${project.artifactId}:latest
+ -f
+ ${docker.file}
+ .
+
+ ${project.basedir}
+
+
+
+
+ docker-build
+
+ exec
+
+
+ docker
+
+ build
+ -t
+ ${docker.repo.prefix}${project.artifactId}:${project.version}
+ -t
+ ${docker.repo.prefix}${project.artifactId}:latest
+ -t
+ ${docker.repo.remote.prefix}${project.artifactId}:${project.version}
+ -t
+ ${docker.repo.remote.prefix}${project.artifactId}:latest
+ -f
+ ${docker.file}
+ .
+
+ ${project.basedir}
+
+
+
+
+ docker-push-latest
+
+ exec
+
+
+ docker
+
+ push
+ ${docker.repo.remote.prefix}${project.artifactId}:latest
+
+
+
+
+ docker-push-version
+
+ exec
+
+
+ docker
+
+ push
+ ${docker.repo.remote.prefix}${project.artifactId}:${project.version}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6a3cd39..c711198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
io.helidon.applications
helidon-mp
- 2.3.0
+ 2.3.2
oracle.demo
helidon-demo-mp
- 2.3.0.0
+ 2.3.2.0
${project.artifactId}
@@ -123,14 +123,14 @@
apm-java-agent-tracer
- 1.0.1389
+ RELEASE
com.oracle.apm.agent.java
apm-java-agent-helidon
- 1.0.1389
+ RELEASE
@@ -473,88 +473,6 @@
-
-
- org.codehaus.mojo
- exec-maven-plugin
- 3.0.0
-
-
-
- docker-local-build
-
- exec
-
-
- docker
-
- build
- -t
- ${docker.repo.prefix}${project.artifactId}:${project.version}
- -t
- ${docker.repo.prefix}${project.artifactId}:latest
- -f
- ${docker.file}
- .
-
- ${project.basedir}
-
-
-
-
- docker-build
-
- exec
-
-
- docker
-
- build
- -t
- ${docker.repo.prefix}${project.artifactId}:${project.version}
- -t
- ${docker.repo.prefix}${project.artifactId}:latest
- -t
- ${docker.repo.remote.prefix}${project.artifactId}:${project.version}
- -t
- ${docker.repo.remote.prefix}${project.artifactId}:latest
- -f
- ${docker.file}
- .
-
- ${project.basedir}
-
-
-
-
- docker-push-latest
-
- exec
-
-
- docker
-
- push
- ${docker.repo.remote.prefix}${project.artifactId}:latest
-
-
-
-
- docker-push-version
-
- exec
-
-
- docker
-
- push
- ${docker.repo.remote.prefix}${project.artifactId}:${project.version}
-
-
-
-
-
-
diff --git a/src/main/java/oracle/demo/tracing/TracingResource.java b/src/main/java/oracle/demo/tracing/TracingResource.java
index da04e29..a544ea6 100644
--- a/src/main/java/oracle/demo/tracing/TracingResource.java
+++ b/src/main/java/oracle/demo/tracing/TracingResource.java
@@ -3,6 +3,7 @@
import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
import javax.enterprise.context.ApplicationScoped;
import javax.ws.rs.POST;
@@ -11,6 +12,8 @@
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
@@ -27,10 +30,14 @@ public class TracingResource{
@POST
@Path("/invoke")
@Produces(MediaType.TEXT_PLAIN)
- public Response handleRequest(TraceOrder[] orders){
+ public Response handleRequest(TraceOrder[] orders, @Context HttpHeaders headers){
logger.info("!!! New request");
+ headers.getRequestHeaders().forEach((key, values) -> {
+ values.forEach(val -> logger.info(String.format("Header: %s=%s", key, val)));
+ });
+
// SpanContext spanContext = serverRequest.spanContext(); // you can comment out this line
// optional, you could also use GlobalTracer.get() if it is configured
// Tracer tracer = serverRequest.webServer().configuration().tracer(); // you can comment out this line