Lets print the port too

Author: mdh1418

src/native/eventpipe/ds-ipc-pal-namedpipe.c

@@ -653,6 +653,16 @@ ds_ipc_to_string (
 	return (result > 0 && result < (int32_t)buffer_len) ? result : 0;
 }
 
+int32_t
+ds_ipc_get_uds_path (
+	DiagnosticsIpc *ipc,
+	ep_char8_t *buffer,
+	uint32_t buffer_len)
+{
+	// Not supported
+	return 0;
+}
+
 /*
  * DiagnosticsIpcStream.
  */

src/native/eventpipe/ds-ipc-pal-socket.c

@@ -1369,6 +1369,34 @@ ds_ipc_to_string (
 	return (result > 0 && result < (int32_t)buffer_len) ? result : 0;
 }
 
+int32_t
+ds_ipc_get_uds_path (
+	DiagnosticsIpc *ipc,
+	ep_char8_t *buffer,
+	uint32_t buffer_len)
+{
+#if defined(DS_IPC_PAL_AF_UNIX)
+	EP_ASSERT (ipc != NULL);
+	EP_ASSERT (buffer != NULL);
+	EP_ASSERT (buffer_len <= DS_IPC_MAX_TO_STRING_LEN);
+
+	const struct sockaddr_un *server_address = (const struct sockaddr_un *)ipc->server_address;
+	if (!server_address) {
+		if (buffer_len > 0)
+			buffer[0] = '\0';
+		return 0;
+	}
+
+	int32_t result = snprintf (buffer, buffer_len, "%s", server_address->sun_path);
+	return (result > 0 && result < (int32_t)buffer_len) ? result : 0;
+#else
+	// No Unix Domain Socket path for non-AF_UNIX transports.
+	if (buffer && buffer_len > 0)
+		buffer[0] = '\0';
+	return 0;
+#endif
+}
+
 /*
  * DiagnosticsIpcStream.
  */

src/native/eventpipe/ds-ipc-pal-websocket.c

@@ -335,6 +335,16 @@ ds_ipc_to_string (
 	return 0;
 }
 
+int32_t
+ds_ipc_get_uds_path (
+	DiagnosticsIpc *ipc,
+	ep_char8_t *buffer,
+	uint32_t buffer_len)
+{
+	// NOT SUPPORTED
+	return 0;
+}
+
 /*
  * DiagnosticsIpcStream.
  */

src/native/eventpipe/ds-ipc-pal.h

@@ -92,6 +92,15 @@ ds_ipc_to_string (
 	DiagnosticsIpc *ipc,
 	ep_char8_t *buffer,
 	uint32_t buffer_len);
+
+// Retrieves the Unix Domain Socket path for a DiagnosticsIpc when applicable.
+// On non-socket PAL implementations or when no UDS path is available, this
+// returns 0 and writes an empty string to buffer.
+int32_t
+ds_ipc_get_uds_path (
+	DiagnosticsIpc *ipc,
+	ep_char8_t *buffer,
+	uint32_t buffer_len);
 /*
  * DiagnosticsIpcStream.
  */

src/native/eventpipe/ds-ipc.c

@@ -178,6 +178,12 @@ ipc_stream_factory_build_and_add_port (
 		ipc = ds_ipc_alloc (builder->path, DS_IPC_CONNECTION_MODE_LISTEN, callback);
 		ep_raise_error_if_nok (ipc != NULL);
 		ep_raise_error_if_nok (ds_ipc_listen (ipc, callback));
+		ep_char8_t uds_path [DS_IPC_MAX_TO_STRING_LEN];
+		if (ds_ipc_get_uds_path (ipc, uds_path, (uint32_t)ARRAY_SIZE (uds_path)) > 0) {
+			DS_LOG_DEBUG_1 ("ipc_stream_factory_build_and_add_port - LISTEN port created for uds path '%s'", uds_path);
+		} else {
+			DS_LOG_DEBUG_1 ("ipc_stream_factory_build_and_add_port - LISTEN port created for path '%s'", builder->path ? builder->path : "(default)");
+		}
 		ep_raise_error_if_nok (dn_vector_ptr_push_back (_ds_port_array, (DiagnosticsPort *)ds_listen_port_alloc (ipc, builder)));
 #else
 		DS_LOG_INFO_0 ("ipc_stream_factory_build_and_add_port - LISTEN ports disabled");
@@ -187,6 +193,7 @@ ipc_stream_factory_build_and_add_port (
 #ifndef DS_IPC_DISABLE_CONNECT_PORTS
 		ipc = ds_ipc_alloc (builder->path, DS_IPC_CONNECTION_MODE_CONNECT, callback);
 		ep_raise_error_if_nok (ipc != NULL);
+		DS_LOG_DEBUG_1 ("ipc_stream_factory_build_and_add_port - CONNECT port created for path '%s'", builder->path ? builder->path : "(null)");
 		ep_raise_error_if_nok (dn_vector_ptr_push_back (_ds_port_array, (DiagnosticsPort *)ds_connect_port_alloc (ipc, builder)));
 #else
 		DS_LOG_INFO_0 ("ipc_stream_factory_build_and_add_port - CONNECT ports disabled");

src/tests/tracing/eventpipe/userevents/userevents.cs

@@ -103,7 +103,7 @@ public static int TestEntryPoint()
 
             traceeStartInfo.Environment["DOTNET_LogEnable"] = "1";
             traceeStartInfo.Environment["DOTNET_LogFacility"] = "0x00001000";
-            traceeStartInfo.Environment["DOTNET_LogLevel"] = "4";
+            traceeStartInfo.Environment["DOTNET_LogLevel"] = "10";
             traceeStartInfo.Environment["DOTNET_LogToFile"] = "1";
             traceeStartInfo.Environment["DOTNET_LogFile"] = logFilePath;
             traceeStartInfo.Environment["DOTNET_LogWithPid"] = "1";