update HttpSemanticConventions for Instrumentation.SqlClient

src/OpenTelemetry.Api/Internal/SemanticConventions.cs

@@ -115,8 +115,9 @@ internal static class SemanticConventions
         public const string AttributeHttpRequestMethod = "http.request.method"; // replaces: "http.method" (AttributeHttpMethod)
         public const string AttributeHttpResponseStatusCode = "http.response.status_code"; // replaces: "http.status_code" (AttributeHttpStatusCode)
         public const string AttributeNetworkProtocolVersion = "network.protocol.version"; // replaces: "http.flavor" (AttributeHttpFlavor)
-        public const string AttributeServerAddress = "server.address"; // replaces: "net.host.name" (AttributeNetHostName)
+        public const string AttributeServerAddress = "server.address"; // replaces: "net.host.name" (AttributeNetHostName) and "net.peer.name" (AttributeNetPeerName)
         public const string AttributeServerPort = "server.port"; // replaces: "net.host.port" (AttributeNetHostPort) and "net.peer.port" (AttributeNetPeerPort)
+        public const string AttributeServerSocketAddress = "server.socket.address"; // replaces: "net.peer.ip" (AttributeNetPeerIp)
         public const string AttributeUrlFull = "url.full"; // replaces: "http.url" (AttributeHttpUrl)
         public const string AttributeUrlPath = "url.path"; // replaces: "http.target" (AttributeHttpTarget)
         public const string AttributeUrlScheme = "url.scheme"; // replaces: "http.scheme" (AttributeHttpScheme)

src/OpenTelemetry.Instrumentation.SqlClient/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+* Updated [Semantic Conventions](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md).
+  This library can emit either old, new, or both attributes. Users can control
+  which attributes are emitted by setting the environment variable
+  `OTEL_SEMCONV_STABILITY_OPT_IN`.
+  ([#4644](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4644))
+
 ## 1.5.0-beta.1
 
 Released 2023-Jun-05

src/OpenTelemetry.Instrumentation.SqlClient/SqlClientInstrumentationOptions.cs

@@ -32,8 +32,6 @@ namespace OpenTelemetry.Instrumentation.SqlClient
     /// </remarks>
     public class SqlClientInstrumentationOptions
     {
-        internal readonly HttpSemanticConvention HttpSemanticConvention;
-
         /*
          * Match...
          *  protocol[ ]:[ ]serverName
@@ -67,6 +65,9 @@ public class SqlClientInstrumentationOptions
 
         private static readonly ConcurrentDictionary<string, SqlConnectionDetails> ConnectionDetailCache = new(StringComparer.OrdinalIgnoreCase);
 
+        private readonly bool emitOldAttributes;
+        private readonly bool emitNewAttributes;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SqlClientInstrumentationOptions"/> class.
         /// </summary>
@@ -79,7 +80,9 @@ internal SqlClientInstrumentationOptions(IConfiguration configuration)
         {
             Debug.Assert(configuration != null, "configuration was null");
 
-            this.HttpSemanticConvention = GetSemanticConventionOptIn(configuration);
+            var httpSemanticConvention = GetSemanticConventionOptIn(configuration);
+            this.emitOldAttributes = httpSemanticConvention.HasFlag(HttpSemanticConvention.Old);
+            this.emitNewAttributes = httpSemanticConvention.HasFlag(HttpSemanticConvention.New);
         }
 
         /// <summary>
@@ -302,23 +305,44 @@ internal void AddConnectionLevelDetailsToActivity(string dataSource, Activity sq
                     ConnectionDetailCache.TryAdd(dataSource, connectionDetails);
                 }
 
-                if (!string.IsNullOrEmpty(connectionDetails.ServerHostName))
-                {
-                    sqlActivity.SetTag(SemanticConventions.AttributeNetPeerName, connectionDetails.ServerHostName);
-                }
-                else
+                if (!string.IsNullOrEmpty(connectionDetails.InstanceName))
                 {
-                    sqlActivity.SetTag(SemanticConventions.AttributeNetPeerIp, connectionDetails.ServerIpAddress);
+                    sqlActivity.SetTag(SemanticConventions.AttributeDbMsSqlInstanceName, connectionDetails.InstanceName);
                 }
 
-                if (!string.IsNullOrEmpty(connectionDetails.InstanceName))
+                if (this.emitOldAttributes)
                 {
-                    sqlActivity.SetTag(SemanticConventions.AttributeDbMsSqlInstanceName, connectionDetails.InstanceName);
+                    if (!string.IsNullOrEmpty(connectionDetails.ServerHostName))
+                    {
+                        sqlActivity.SetTag(SemanticConventions.AttributeNetPeerName, connectionDetails.ServerHostName);
+                    }
+                    else
+                    {
+                        sqlActivity.SetTag(SemanticConventions.AttributeNetPeerIp, connectionDetails.ServerIpAddress);
+                    }
+
+                    if (!string.IsNullOrEmpty(connectionDetails.Port))
+                    {
+                        sqlActivity.SetTag(SemanticConventions.AttributeNetPeerPort, connectionDetails.Port);
+                    }
                 }
 
-                if (!string.IsNullOrEmpty(connectionDetails.Port))
+                // see the spec https://github.com/open-telemetry/opentelemetry-specification/blob/v1.21.0/specification/trace/semantic_conventions/http.md
+                if (this.emitNewAttributes)
                 {
-                    sqlActivity.SetTag(SemanticConventions.AttributeNetPeerPort, connectionDetails.Port);
+                    if (!string.IsNullOrEmpty(connectionDetails.ServerHostName))
+                    {
+                        sqlActivity.SetTag(SemanticConventions.AttributeServerAddress, connectionDetails.ServerHostName);
+                    }
+                    else
+                    {
+                        sqlActivity.SetTag(SemanticConventions.AttributeServerSocketAddress, connectionDetails.ServerIpAddress);
+                    }
+
+                    if (!string.IsNullOrEmpty(connectionDetails.Port))
+                    {
+                        sqlActivity.SetTag(SemanticConventions.AttributeServerPort, connectionDetails.Port);
+                    }
                 }
             }
         }