From 263458ebcbae6aebf754168e5c7a8442cdd340e4 Mon Sep 17 00:00:00 2001
From: Roman Kvasnytskyi <roman@kvasnytskyi.net>
Date: Mon, 22 Jan 2024 12:35:30 +0100
Subject: [PATCH] Make Netty Instrumentation HttpServerRequestTracingHandler
 propagate "Channel Inactive" event to downstream according to parent contract

---
 .../v4_1/internal/server/HttpServerRequestTracingHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java
index 69f90c7e8815..14618125bd8f 100644
--- a/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java
+++ b/instrumentation/netty/netty-4.1/library/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/internal/server/HttpServerRequestTracingHandler.java
@@ -73,12 +73,13 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
   }
 
   @Override
-  public void channelInactive(ChannelHandlerContext ctx) {
+  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
     // connection was closed, close all remaining requests
     Attribute<Deque<ServerContext>> contextAttr = ctx.channel().attr(AttributeKeys.SERVER_CONTEXT);
     Deque<ServerContext> serverContexts = contextAttr.get();
 
     if (serverContexts == null) {
+      super.channelInactive(ctx);
       return;
     }
 
@@ -86,6 +87,7 @@ public void channelInactive(ChannelHandlerContext ctx) {
     while ((serverContext = serverContexts.pollFirst()) != null) {
       instrumenter.end(serverContext.context(), serverContext.request(), null, null);
     }
+    super.channelInactive(ctx);
   }
 
   private static <T> Deque<T> getOrCreate(Channel channel, AttributeKey<Deque<T>> key) {