fix sample

Author: alramlechner

samples/webrequest/src/main/java/com/dynatrace/oneagent/sdk/samples/webrequest/FakedHttpClient.java

@@ -58,7 +58,7 @@ public void executeRequest() {
 		} catch (UnknownHostException e) {
 			clientIp = "192.168.4.5"; // fake IP
 		}
-		httpRequest = new HttpRequest(url.getPath() + "?" + url.getQuery(), method, clientIp);
+		httpRequest = new HttpRequest(url.getPath() + "?" + url.getQuery(), method, clientIp, requestHeaders);
 
 		// ... and queue it for processing: 
 		WebRequestApp.instance.webServer.enqeueHttpRequestForProcessing(httpRequest, this);

samples/webrequest/src/main/java/com/dynatrace/oneagent/sdk/samples/webrequest/FakedWebserver.java

@@ -76,12 +76,13 @@ public static class HttpRequest {
 		private final String remoteIpAddress;
 		private final String uri;
 		private final String method;
-		Map<String, String> requestHeaders = new HashMap<String, String>();
+		private final Map<String, List<String>> requestHeaders;
 
-		public HttpRequest(String uri, String method, String remoteIpAddress) {
+		public HttpRequest(String uri, String method, String remoteIpAddress, Map<String, List<String>> requestHeaders) {
 			this.uri = uri;
 			this.method = method;
 			this.remoteIpAddress = remoteIpAddress;
+			this.requestHeaders = requestHeaders;
 		}
 
 		public String getUri() {
@@ -92,7 +93,7 @@ public String getMethod() {
 			return method;
 		}
 
-		public Map<String, String> getHeaders() {
+		public Map<String, List<String>> getHeaders() {
 			return requestHeaders;
 		}
 
@@ -112,12 +113,14 @@ private void serve(HttpRequest request, HttpResponse response) {
 		IncomingWebRequestTracer incomingWebrequestTracer = oneAgentSDK.traceIncomingWebRequest(webAppInfo, url, request.getMethod());
 
 		// add request header, parameter and remote address before start:
-		for (Entry<String, String> headerField : request.getHeaders().entrySet()) {
-			incomingWebrequestTracer.addRequestHeader(headerField.getKey(), headerField.getValue());
-		}
-		for (Entry<String, List<String>> headerField : request.getParameters().entrySet()) {
+		for (Entry<String, List<String>> headerField : request.getHeaders().entrySet()) {
 			for (String value : headerField.getValue()) {
-				incomingWebrequestTracer.addParameter(headerField.getKey(), value);
+				incomingWebrequestTracer.addRequestHeader(headerField.getKey(), value);
+			}
+		}
+		for (Entry<String, List<String>> parameter : request.getParameters().entrySet()) {
+			for (String value : parameter.getValue()) {
+				incomingWebrequestTracer.addParameter(parameter.getKey(), value);
 			}
 		}
 		incomingWebrequestTracer.setRemoteAddress(request.getRemoteIpAddress());

samples/webrequest/src/main/java/com/dynatrace/oneagent/sdk/samples/webrequest/WebRequestApp.java

@@ -62,7 +62,7 @@ public static void main(String args[]) {
 	}
 
 	private void runFakedWebrequest() {
-		String url = "http://localhost:80/my/path?param1=value1&param2=value2";
+		String url = "http://localhost:80/billing/my/path?param1=value1&param2=value2";
 		System.out.println("[Client] request " + url);
 		OutgoingWebRequestTracer outgoingWebRequestTracer = oneAgentSdk.traceOutgoingWebRequest(url, "GET");
 		outgoingWebRequestTracer.start();