Fix NPE in buffering request (#68)

* Fix NPE in buffering request

Signed-off-by: Pavol Loffay <[email protected]>

* Fix changes in the SB app

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

instrumentation/servlet/servlet-3.0/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_0/BufferingHttpServletRequest.java

@@ -181,7 +181,7 @@ public BufferedReader getReader() throws IOException {
     if (reader == null) {
       reader = super.getReader();
       if (shouldReadContent()) {
-        reader = new BufferedReaderWrapper(reader, this.charBufferData);
+        reader = new BufferedReaderWrapper(reader, this.getCharBuffer());
       }
     }
     return reader;

instrumentation/servlet/servlet-3.1/src/main/java/io/opentelemetry/instrumentation/hypertrace/servlet/v3_1/BufferingHttpServletRequest.java

@@ -182,7 +182,7 @@ public BufferedReader getReader() throws IOException {
     if (reader == null) {
       reader = super.getReader();
       if (shouldReadContent()) {
-        reader = new BufferedReaderWrapper(reader, this.charBufferData);
+        reader = new BufferedReaderWrapper(reader, this.getCharBuffer());
       }
     }
     return reader;

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootDisabledBodyCaptureTest.java

@@ -72,9 +72,8 @@ public void springBootSmokeTest() throws IOException {
     Assertions.assertEquals(response.body().string(), "Hi!");
     Assertions.assertEquals(1, countSpansByName(traces, "/greeting"));
     Assertions.assertEquals(1, countSpansByName(traces, "webcontroller.greeting"));
-    Assertions.assertEquals(1, countSpansByName(traces, "webcontroller.withspan"));
     Assertions.assertEquals(
-        3,
+        2,
         getSpanStream(traces)
             .flatMap(s -> s.getAttributesList().stream())
             .filter(a -> a.getKey().equals(OTEL_LIBRARY_VERSION_ATTRIBUTE))

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootTest.java

@@ -73,9 +73,8 @@ public void springBootSmokeTest() throws IOException {
     Assertions.assertEquals(response.body().string(), "Hi!");
     Assertions.assertEquals(1, countSpansByName(traces, "/greeting"));
     Assertions.assertEquals(1, countSpansByName(traces, "webcontroller.greeting"));
-    Assertions.assertEquals(1, countSpansByName(traces, "webcontroller.withspan"));
     Assertions.assertEquals(
-        3,
+        2,
         getSpanStream(traces)
             .flatMap(s -> s.getAttributesList().stream())
             .filter(a -> a.getKey().equals(OTEL_LIBRARY_VERSION_ATTRIBUTE))