fix(EntityFrameworkCore): server.address field to follow otel conventions

src/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/EntityFrameworkInstrumentationTests.cs

@@ -0,0 +1,51 @@
+using System.Diagnostics;
+using OpenTelemetry.Trace;
+using Xunit;
+
+namespace OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests;
+
+public class EntityFrameworkInstrumentationTests
+{
+    [Fact]
+    public void ServerAddressWithoutProtocolPrefix()
+    {
+        var activity = new Activity("TestActivity");
+        activity.Start();
+
+        var connection = new
+        {
+            Host = "my.domain.example",
+            DataSource = "tcp:my.domain.example",
+            Port = "5432"
+        };
+
+        var hostFetcher = new PropertyFetcher<string>("Host");
+        var dataSourceFetcher = new PropertyFetcher<string>("DataSource");
+        var portFetcher = new PropertyFetcher<string>("Port");
+
+        var host = hostFetcher.Fetch(connection);
+        if (!string.IsNullOrEmpty(host))
+        {
+            activity.AddTag("server.address", host);
+        }
+        else
+        {
+            var dataSource = dataSourceFetcher.Fetch(connection);
+            if (!string.IsNullOrEmpty(dataSource))
+            {
+                activity.AddTag("server.address", dataSource);
+            }
+        }
+
+        var port = portFetcher.Fetch(connection);
+        if (!string.IsNullOrEmpty(port))
+        {
+            activity.AddTag("server.port", port);
+        }
+
+        activity.Stop();
+
+        Assert.Equal("my.domain.example", activity.Tags.FirstOrDefault(t => t.Key == "server.address").Value);
+        Assert.Equal("5432", activity.Tags.FirstOrDefault(t => t.Key == "server.port").Value);
+    }
+}

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Fixed the `server.address` field in EntityFrameworkCore spans to populate with the server domain name without the `tcp` prefix.
+  ([#IssueNumber](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/IssueNumber))
+
 ## 1.10.0-beta.1
 
 Released 2024-Dec-09

src/OpenTelemetry.Instrumentation.EntityFrameworkCore/Implementation/EntityFrameworkDiagnosticListener.cs

@@ -1,7 +1,4 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
 using System.Data;
 using System.Diagnostics;
 using System.Reflection;
 using OpenTelemetry.Internal;
@@ -40,6 +37,8 @@
     private readonly PropertyFetcher<CommandType> commandTypeFetcher = new("CommandType");
     private readonly PropertyFetcher<string> commandTextFetcher = new("CommandText");
     private readonly PropertyFetcher<Exception> exceptionFetcher = new("Exception");
+    private readonly PropertyFetcher<string> hostFetcher = new("Host");
+    private readonly PropertyFetcher<string> portFetcher = new("Port");
 
     private readonly EntityFrameworkInstrumentationOptions options;
 
@@ -140,10 +139,24 @@
                                 break;
                         }
 
-                        var dataSource = (string)this.dataSourceFetcher.Fetch(connection);
-                        if (!string.IsNullOrEmpty(dataSource))
+                        var host = (string)this.hostFetcher.Fetch(connection);
+                        if (!string.IsNullOrEmpty(host))
+                        {
+                            activity.AddTag(AttributeServerAddress, host);
+                        }
+                        else
+                        {
+                            var dataSource = (string)this.dataSourceFetcher.Fetch(connection);
+                            if (!string.IsNullOrEmpty(dataSource))
+                            {
+                                activity.AddTag(AttributeServerAddress, dataSource);
+                            }
+                        }
+
+                        var port = (string)this.portFetcher.Fetch(connection);
+                        if (!string.IsNullOrEmpty(port))
                         {
-                            activity.AddTag(AttributeServerAddress, dataSource);
+                            activity.AddTag(AttributeServerAddress, port);
                         }
 
                         if (this.options.EmitOldAttributes)