Manual fix items for servlet-common:library

instrumentation/servlet/servlet-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/v2_2/Servlet2HttpAttributesGetter.java

@@ -29,7 +29,7 @@ public Integer getHttpResponseStatusCode(
       @Nullable Throwable error) {
     HttpServletResponse response = responseContext.response();
 
-    if (!accessor.isResponseCommitted(response) && error != null) {
+    if (response != null && !accessor.isResponseCommitted(response) && error != null) {
       // if response is not committed and there is a throwable set status to 500 /
       // INTERNAL_SERVER_ERROR, due to servlet spec
       // https://javaee.github.io/servlet-spec/downloads/servlet-4.0/servlet-4_0_FINAL.pdf:

instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletHttpAttributesGetter.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.instrumentation.servlet.internal;
 
+import static java.util.Collections.emptyList;
+
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerAttributesGetter;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -83,6 +85,10 @@ public List<String> getHttpResponseHeader(
       ServletRequestContext<REQUEST> requestContext,
       ServletResponseContext<RESPONSE> responseContext,
       String name) {
+    RESPONSE response = responseContext.response();
+    if (response == null) {
+      return emptyList();
+    }
     return accessor.getResponseHeaderValues(responseContext.response(), name);
   }
 

instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletResponseContext.java

@@ -5,20 +5,25 @@
 
 package io.opentelemetry.instrumentation.servlet.internal;
 
+import static java.util.Objects.requireNonNull;
+
+import javax.annotation.Nullable;
+
 /**
  * This class is internal and is hence not for public use. Its APIs are unstable and can change at
  * any time.
  */
 public class ServletResponseContext<T> {
-  private final T response;
+  @Nullable private final T response;
   // used for servlet 2.2 where request status can't be extracted from HttpServletResponse
-  private Integer status;
-  private Long timeout;
+  @Nullable private Integer status;
+  @Nullable private Long timeout;
 
-  public ServletResponseContext(T response) {
+  public ServletResponseContext(@Nullable T response) {
     this.response = response;
   }
 
+  @Nullable
   public T response() {
     return response;
   }
@@ -28,7 +33,7 @@ public void setStatus(int status) {
   }
 
   public int getStatus() {
-    return status;
+    return requireNonNull(status);
   }
 
   public boolean hasStatus() {
@@ -40,7 +45,7 @@ public void setTimeout(long timeout) {
   }
 
   public long getTimeout() {
-    return timeout;
+    return requireNonNull(timeout);
   }
 
   public boolean hasTimeout() {