fixes

Author: Mateusz Rzeszutek

instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpCommonAttributesExtractor.java

@@ -122,7 +122,7 @@ public void onEnd(
 
     if (SemconvStability.emitStableHttpSemconv()) {
       String errorType;
-      if (statusCode != null) {
+      if (statusCode != null && statusCode > 0) {
         errorType = statusCodeConverter.getErrorType(statusCode);
       } else {
         errorType = getter.getErrorType(request, response, error);

instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientAttributesExtractorStableSemconvTest.java

@@ -341,6 +341,7 @@ void shouldExtractErrorType_httpStatusCode() {
   @Test
   void shouldExtractErrorType_getter() {
     Map<String, String> request = new HashMap<>();
+    request.put("statusCode", "0");
     request.put("errorType", "custom error type");
 
     AttributesExtractor<Map<String, String>, Map<String, String>> extractor =

instrumentation-api-semconv/src/testStableHttpSemconv/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpServerAttributesExtractorStableSemconvTest.java

@@ -382,6 +382,7 @@ void shouldExtractErrorType_httpStatusCode() {
   @Test
   void shouldExtractErrorType_getter() {
     Map<String, String> request = new HashMap<>();
+    request.put("statusCode", "0");
     request.put("errorType", "custom error type");
 
     AttributesExtractor<Map<String, String>, Map<String, String>> extractor =

instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java

@@ -15,11 +15,14 @@
 import static org.assertj.core.api.Assertions.catchThrowable;
 
 import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.instrumentation.api.instrumenter.http.internal.HttpAttributes;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.test.utils.PortUtils;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
+import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.SemanticAttributes;
 import java.io.DataOutputStream;
@@ -29,6 +32,8 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -337,6 +342,19 @@ public void traceRequestWithConnectionFailure(String scheme) {
                       connection.getInputStream();
                     }));
 
+    List<AttributeAssertion> attributes =
+        new ArrayList<>(
+            Arrays.asList(
+                equalTo(getAttributeKey(SemanticAttributes.NET_PROTOCOL_NAME), "http"),
+                equalTo(getAttributeKey(SemanticAttributes.NET_PROTOCOL_VERSION), "1.1"),
+                equalTo(getAttributeKey(SemanticAttributes.NET_PEER_NAME), "localhost"),
+                equalTo(getAttributeKey(SemanticAttributes.NET_PEER_PORT), PortUtils.UNUSABLE_PORT),
+                equalTo(getAttributeKey(SemanticAttributes.HTTP_URL), uri),
+                equalTo(getAttributeKey(SemanticAttributes.HTTP_METHOD), "GET")));
+    if (SemconvStability.emitStableHttpSemconv()) {
+      attributes.add(equalTo(HttpAttributes.ERROR_TYPE, "java.net.ConnectException"));
+    }
+
     testing.waitAndAssertTraces(
         trace ->
             trace.hasSpansSatisfyingExactly(
@@ -352,15 +370,6 @@ public void traceRequestWithConnectionFailure(String scheme) {
                         .hasParent(trace.getSpan(0))
                         .hasStatus(StatusData.error())
                         .hasException(thrown)
-                        .hasAttributesSatisfyingExactly(
-                            equalTo(getAttributeKey(SemanticAttributes.NET_PROTOCOL_NAME), "http"),
-                            equalTo(
-                                getAttributeKey(SemanticAttributes.NET_PROTOCOL_VERSION), "1.1"),
-                            equalTo(getAttributeKey(SemanticAttributes.NET_PEER_NAME), "localhost"),
-                            equalTo(
-                                getAttributeKey(SemanticAttributes.NET_PEER_PORT),
-                                PortUtils.UNUSABLE_PORT),
-                            equalTo(getAttributeKey(SemanticAttributes.HTTP_URL), uri),
-                            equalTo(getAttributeKey(SemanticAttributes.HTTP_METHOD), "GET"))));
+                        .hasAttributesSatisfyingExactly(attributes)));
   }
 }

instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettyClientInstrumenterFactory.java

@@ -20,8 +20,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanNameExtractorBuilder;
 import io.opentelemetry.instrumentation.api.instrumenter.http.HttpSpanStatusExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.network.ServerAttributesExtractor;
 import io.opentelemetry.instrumentation.netty.common.internal.NettyConnectionRequest;
 import io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel;
 import java.util.List;
@@ -87,6 +85,7 @@ public Instrumenter<HttpRequestAndChannel, HttpResponse> createHttpInstrumenter(
     return builder.buildClientInstrumenter(HttpRequestHeadersSetter.INSTANCE);
   }
 
+  @SuppressWarnings("deprecation") // have to use the deprecated Net*AttributesExtractor for now
   public NettyConnectionInstrumenter createConnectionInstrumenter() {
     if (connectionTelemetryState == NettyConnectionInstrumentationFlag.DISABLED) {
       return NoopConnectionInstrumenter.INSTANCE;
@@ -106,9 +105,9 @@ public NettyConnectionInstrumenter createConnectionInstrumenter() {
       // when the connection telemetry is fully enabled, CONNECT spans are created for every
       // request; and semantically they're not HTTP spans, they must not use the HTTP client
       // extractor
-      builder
-          .addAttributesExtractor(NetworkAttributesExtractor.create(getter))
-          .addAttributesExtractor(ServerAttributesExtractor.create(getter));
+      builder.addAttributesExtractor(
+          io.opentelemetry.instrumentation.api.instrumenter.net.NetClientAttributesExtractor.create(
+              getter));
     } else {
       // in case the connection telemetry is emitted only on errors, the CONNECT span is a stand-in
       // for the HTTP client span