diff --git a/src/Components/Components/src/ComponentsActivitySource.cs b/src/Components/Components/src/ComponentsActivitySource.cs
index 1ce87e918417..add795e7ec24 100644
--- a/src/Components/Components/src/ComponentsActivitySource.cs
+++ b/src/Components/Components/src/ComponentsActivitySource.cs
@@ -78,7 +78,7 @@ public static ComponentsActivityHandle StartHandleEventActivity(string? componen
                 }
                 if (methodName != null)
                 {
-                    activity.SetTag("aspnetcore.components.method", methodName);
+                    activity.SetTag("code.function.name", methodName);
                 }
                 if (attributeName != null)
                 {
diff --git a/src/Components/Components/src/ComponentsMetrics.cs b/src/Components/Components/src/ComponentsMetrics.cs
index 089696e301ce..d75cb9ea4feb 100644
--- a/src/Components/Components/src/ComponentsMetrics.cs
+++ b/src/Components/Components/src/ComponentsMetrics.cs
@@ -83,7 +83,7 @@ public async Task CaptureEventDuration(Task task, long startTimestamp, string? c
         var tags = new TagList
         {
             { "aspnetcore.components.type", componentType ?? "unknown" },
-            { "aspnetcore.components.method", methodName ?? "unknown" },
+            { "code.function.name", methodName ?? "unknown" },
             { "aspnetcore.components.attribute.name", attributeName ?? "unknown" }
         };
 
@@ -104,7 +104,7 @@ public void FailEventSync(Exception ex, long startTimestamp, string? componentTy
         var tags = new TagList
         {
             { "aspnetcore.components.type", componentType ?? "unknown" },
-            { "aspnetcore.components.method", methodName ?? "unknown" },
+            { "code.function.name", methodName ?? "unknown" },
             { "aspnetcore.components.attribute.name", attributeName ?? "unknown" },
             { "error.type", ex.GetType().FullName ?? "unknown" }
         };
diff --git a/src/Components/Components/test/ComponentsActivitySourceTest.cs b/src/Components/Components/test/ComponentsActivitySourceTest.cs
index 04983ef0cac9..cccb3fb79170 100644
--- a/src/Components/Components/test/ComponentsActivitySourceTest.cs
+++ b/src/Components/Components/test/ComponentsActivitySourceTest.cs
@@ -96,7 +96,7 @@ public void StartEventActivity_CreatesAndStartsActivity()
         Assert.Equal(ActivityKind.Internal, activity.Kind);
         Assert.True(activity.IsAllDataRequested);
         Assert.Equal(componentType, activity.GetTagItem("aspnetcore.components.type"));
-        Assert.Equal(methodName, activity.GetTagItem("aspnetcore.components.method"));
+        Assert.Equal(methodName, activity.GetTagItem("code.function.name"));
         Assert.Equal(attributeName, activity.GetTagItem("aspnetcore.components.attribute.name"));
         Assert.False(activity.IsStopped);
 
diff --git a/src/Components/Components/test/ComponentsMetricsTest.cs b/src/Components/Components/test/ComponentsMetricsTest.cs
index 8293874cab14..388f83bd95a8 100644
--- a/src/Components/Components/test/ComponentsMetricsTest.cs
+++ b/src/Components/Components/test/ComponentsMetricsTest.cs
@@ -87,7 +87,7 @@ await componentsMetrics.CaptureEventDuration(Task.CompletedTask, startTimestamp,
         Assert.Single(measurements);
         Assert.True(measurements[0].Value > 0);
         Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
-        Assert.Equal("OnClick", Assert.Contains("aspnetcore.components.method", measurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", measurements[0].Tags));
         Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", measurements[0].Tags));
         Assert.DoesNotContain("error.type", measurements[0].Tags);
     }
@@ -112,7 +112,7 @@ await componentsMetrics.CaptureEventDuration(Task.FromException(new InvalidOpera
         Assert.Single(measurements);
         Assert.True(measurements[0].Value > 0);
         Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
-        Assert.Equal("OnClick", Assert.Contains("aspnetcore.components.method", measurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", measurements[0].Tags));
         Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", measurements[0].Tags));
         Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
     }
@@ -137,7 +137,7 @@ public void FailEventSync_RecordsErrorMetric()
         Assert.Single(measurements);
         Assert.True(measurements[0].Value > 0);
         Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", measurements[0].Tags));
-        Assert.Equal("OnClick", Assert.Contains("aspnetcore.components.method", measurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", measurements[0].Tags));
         Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", measurements[0].Tags));
         Assert.Equal("System.InvalidOperationException", Assert.Contains("error.type", measurements[0].Tags));
     }
@@ -372,7 +372,7 @@ await componentsMetrics.CaptureEventDuration(Task.CompletedTask, startTimestamp2
         // Check event duration
         Assert.True(eventMeasurements[0].Value > 0);
         Assert.Equal("TestComponent", Assert.Contains("aspnetcore.components.type", eventMeasurements[0].Tags));
-        Assert.Equal("OnClick", Assert.Contains("aspnetcore.components.method", eventMeasurements[0].Tags));
+        Assert.Equal("OnClick", Assert.Contains("code.function.name", eventMeasurements[0].Tags));
         Assert.Equal("onclick", Assert.Contains("aspnetcore.components.attribute.name", eventMeasurements[0].Tags));
 
         // Check parameters duration