Account for standard ports when collecting tags (#328)

* Account for standard ports when collecting tags
EventStore · Jan 8, 2025 · f267b97 · f267b97
1 parent d8978bc
commit f267b97
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 23 deletions.
diff --git a/src/EventStore.Client.Streams/EventStoreClient.Append.cs b/src/EventStore.Client.Streams/EventStoreClient.Append.cs
@@ -113,13 +113,7 @@ ValueTask<IWriteResult> AppendToStreamInternal(
 			UserCredentials? userCredentials,
 			CancellationToken cancellationToken
 		) {
-			var tags = new ActivityTagsCollection()
-				.WithRequiredTag(TelemetryTags.EventStore.Stream, header.Options.StreamIdentifier.StreamName.ToStringUtf8())
-				.WithGrpcChannelServerTags(channelInfo)
-				.WithClientSettingsServerTags(Settings)
-				.WithOptionalTag(TelemetryTags.Database.User, userCredentials?.Username ?? Settings.DefaultCredentials?.Username);
-
-			return EventStoreClientDiagnostics.ActivitySource.TraceClientOperation(Operation, TracingConstants.Operations.Append, tags);
+			return EventStoreClientDiagnostics.ActivitySource.TraceClientOperation(Operation, TracingConstants.Operations.Append, AppendTags);
 
 			async ValueTask<IWriteResult> Operation() {
 				using var call = new StreamsClient(channelInfo.CallInvoker)
@@ -157,6 +151,12 @@ await call.RequestStream
 
 				return HandleWrongExpectedRevision(response, header, operationOptions);
 			}
+
+			ActivityTagsCollection AppendTags() => new ActivityTagsCollection()
+				.WithRequiredTag(TelemetryTags.EventStore.Stream, header.Options.StreamIdentifier.StreamName.ToStringUtf8())
+				.WithGrpcChannelServerTags(Settings, channelInfo)
+				.WithClientSettingsServerTags(Settings)
+				.WithOptionalTag(TelemetryTags.Database.User, userCredentials?.Username ?? Settings.DefaultCredentials?.Username);
 		}
 
 		IWriteResult HandleSuccessAppend(AppendResp response, AppendReq header) {
@@ -282,16 +282,10 @@ ValueTask<IWriteResult> AppendInternal(
 				IEnumerable<EventData> events,
 				CancellationToken cancellationToken
 			) {
-				var tags = new ActivityTagsCollection()
-					.WithRequiredTag(TelemetryTags.EventStore.Stream, options.StreamIdentifier.StreamName.ToStringUtf8())
-					.WithGrpcChannelServerTags(_channelInfo)
-					.WithClientSettingsServerTags(_settings)
-					.WithOptionalTag(TelemetryTags.Database.User, _settings.DefaultCredentials?.Username);
-
 				return EventStoreClientDiagnostics.ActivitySource.TraceClientOperation(
 					Operation,
 					TracingConstants.Operations.Append,
-					tags
+					AppendTags
 				);
 
 				async ValueTask<IWriteResult> Operation() {
@@ -310,6 +304,12 @@ async ValueTask<IWriteResult> Operation() {
 
 					return await complete.Task.ConfigureAwait(false);
 				}
+
+				ActivityTagsCollection AppendTags() => new ActivityTagsCollection()
+					.WithRequiredTag(TelemetryTags.EventStore.Stream, options.StreamIdentifier.StreamName.ToStringUtf8())
+					.WithGrpcChannelServerTags(_settings, _channelInfo)
+					.WithClientSettingsServerTags(_settings)
+					.WithOptionalTag(TelemetryTags.Database.User, _settings.DefaultCredentials?.Username);
 			}
 
 			async Task Duplex(ValueTask<ChannelInfo> channelInfoTask) {

diff --git a/src/EventStore.Client/Common/Diagnostics/ActivitySourceExtensions.cs b/src/EventStore.Client/Common/Diagnostics/ActivitySourceExtensions.cs
@@ -12,8 +12,13 @@ public static async ValueTask<T> TraceClientOperation<T>(
 		this ActivitySource source,
 		Func<ValueTask<T>> tracedOperation,
 		string operationName,
-		ActivityTagsCollection? tags = null
+		Func<ActivityTagsCollection?>? tagsFactory = null
 	) {
+		if (source.HasNoActiveListeners())
+			return await tracedOperation().ConfigureAwait(false);
+
+		var tags = tagsFactory?.Invoke();
+
 		using var activity = StartActivity(source, operationName, ActivityKind.Client, tags, Activity.Current?.Context);
 
 		try {
@@ -47,7 +52,7 @@ public static void TraceSubscriptionEvent(
 			.WithRequiredTag(TelemetryTags.EventStore.EventId, resolvedEvent.OriginalEvent.EventId.ToString())
 			.WithRequiredTag(TelemetryTags.EventStore.EventType, resolvedEvent.OriginalEvent.EventType)
 			// Ensure consistent server.address attribute when connecting to cluster via dns discovery
-			.WithGrpcChannelServerTags(channelInfo)
+			.WithGrpcChannelServerTags(settings, channelInfo)
 			.WithClientSettingsServerTags(settings)
 			.WithOptionalTag(
 				TelemetryTags.Database.User,

diff --git a/src/EventStore.Client/Common/Diagnostics/ActivityTagsCollectionExtensions.cs b/src/EventStore.Client/Common/Diagnostics/ActivityTagsCollectionExtensions.cs
@@ -7,16 +7,21 @@ namespace EventStore.Client.Diagnostics;
 
 static class ActivityTagsCollectionExtensions {
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static ActivityTagsCollection WithGrpcChannelServerTags(this ActivityTagsCollection tags, ChannelInfo? channelInfo) {
+	public static ActivityTagsCollection WithGrpcChannelServerTags(this ActivityTagsCollection tags, EventStoreClientSettings settings, ChannelInfo? channelInfo) {
         if (channelInfo is null)
             return tags;
-
-        var authorityParts = channelInfo.Channel.Target.Split(':');
 
-        return tags
-            .WithRequiredTag(TelemetryTags.Server.Address, authorityParts[0])
-            .WithRequiredTag(TelemetryTags.Server.Port, int.Parse(authorityParts[1]));
-    }
+		var authorityParts = channelInfo.Channel.Target.Split([':'], StringSplitOptions.RemoveEmptyEntries);
+
+		string host = authorityParts[0];
+		int port = authorityParts.Length == 1
+			? settings.ConnectivitySettings.Insecure ? 80 : 443
+			: int.Parse(authorityParts[1]);
+
+		return tags
+			.WithRequiredTag(TelemetryTags.Server.Address, host)
+			.WithRequiredTag(TelemetryTags.Server.Port, port);
+	}
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static ActivityTagsCollection WithClientSettingsServerTags(this ActivityTagsCollection source, EventStoreClientSettings settings) {