livekit-client 1.15.5 → 1.15.7

package/src/room/participant/LocalParticipant.ts

@@ -1,4 +1,3 @@
-import log from '../../logger';
 import type { InternalRoomOptions } from '../../options';
 import {
   DataPacket,
@@ -32,15 +31,25 @@ import type {
   TrackPublishOptions,
   VideoCaptureOptions,
 } from '../track/options';
-import { VideoPresets, isBackupCodec } from '../track/options';
+import { ScreenSharePresets, VideoPresets, isBackupCodec } from '../track/options';
 import {
   constraintsForOptions,
+  getLogContextFromTrack,
   mergeDefaultOptions,
   mimeTypeToVideoCodecString,
   screenCaptureToDisplayMediaStreamOptions,
 } from '../track/utils';
 import type { DataPublishOptions } from '../types';
-import { Future, isFireFox, isSVCCodec, isSafari, isWeb, supportsAV1, supportsVP9 } from '../utils';
+import {
+  Future,
+  isFireFox,
+  isSVCCodec,
+  isSafari,
+  isSafari17,
+  isWeb,
+  supportsAV1,
+  supportsVP9,
+} from '../utils';
 import Participant from './Participant';
 import type { ParticipantTrackPermission } from './ParticipantTrackPermission';
 import { trackPermissionToProto } from './ParticipantTrackPermission';
@@ -86,7 +95,10 @@ export default class LocalParticipant extends Participant {
 
   /** @internal */
   constructor(sid: string, identity: string, engine: RTCEngine, options: InternalRoomOptions) {
-    super(sid, identity);
+    super(sid, identity, undefined, undefined, {
+      loggerName: options.loggerName,
+      loggerContextCb: () => this.engine.logContext,
+    });
     this.audioTracks = new Map();
     this.videoTracks = new Map();
     this.tracks = new Map();
@@ -164,7 +176,7 @@ export default class LocalParticipant extends Participant {
 
   private handleDisconnected = () => {
     if (this.reconnectFuture) {
-      this.reconnectFuture.promise.catch((e) => log.warn(e));
+      this.reconnectFuture.promise.catch((e) => this.log.warn(e.message, this.logContext));
       this.reconnectFuture?.reject?.('Got disconnected during reconnection attempt');
       this.reconnectFuture = undefined;
     }
@@ -277,7 +289,7 @@ export default class LocalParticipant extends Participant {
     options?: VideoCaptureOptions | AudioCaptureOptions | ScreenShareCaptureOptions,
     publishOptions?: TrackPublishOptions,
   ) {
-    log.debug('setTrackEnabled', { source, enabled });
+    this.log.debug('setTrackEnabled', { ...this.logContext, source, enabled });
     let track = this.getTrack(source);
     if (enabled) {
       if (track) {
@@ -285,7 +297,7 @@ export default class LocalParticipant extends Participant {
       } else {
         let localTracks: Array<LocalTrack> | undefined;
         if (this.pendingPublishing.has(source)) {
-          log.info('skipping duplicate published source', { source });
+          this.log.info('skipping duplicate published source', { ...this.logContext, source });
           // no-op it's already been requested
           return;
         }
@@ -313,7 +325,10 @@ export default class LocalParticipant extends Participant {
           }
           const publishPromises: Array<Promise<LocalTrackPublication>> = [];
           for (const localTrack of localTracks) {
-            log.info('publishing track', { localTrack });
+            this.log.info('publishing track', {
+              ...this.logContext,
+              ...getLogContextFromTrack(localTrack),
+            });
             publishPromises.push(this.publishTrack(localTrack, publishOptions));
           }
           const publishedTracks = await Promise.all(publishPromises);
@@ -423,7 +438,10 @@ export default class LocalParticipant extends Participant {
       if (typeof conOrBool !== 'boolean') {
         trackConstraints = conOrBool;
       }
-      const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints);
+      const track = mediaTrackToLocalTrack(mediaStreamTrack, trackConstraints, {
+        loggerName: this.roomOptions.loggerName,
+        loggerContextCb: () => this.logContext,
+      });
       if (track.kind === Track.Kind.Video) {
         track.source = Track.Source.Camera;
       } else if (track.kind === Track.Kind.Audio) {
@@ -448,6 +466,13 @@ export default class LocalParticipant extends Participant {
       throw new DeviceUnsupportedError('getDisplayMedia not supported');
     }
 
+    if (options.resolution === undefined && !isSafari17()) {
+      // we need to constrain the dimensions, otherwise it could lead to low bitrate
+      // due to encoding a huge video. Encoding such large surfaces is really expensive
+      // unfortunately Safari 17 has a but and cannot be constrained by default
+      options.resolution = ScreenSharePresets.h1080fps30.resolution;
+    }
+
     const constraints = screenCaptureToDisplayMediaStreamOptions(options);
     const stream: MediaStream = await navigator.mediaDevices.getDisplayMedia(constraints);
 
@@ -455,8 +480,15 @@ export default class LocalParticipant extends Participant {
     if (tracks.length === 0) {
       throw new TrackInvalidError('no video track found');
     }
-    const screenVideo = new LocalVideoTrack(tracks[0], undefined, false);
+    const screenVideo = new LocalVideoTrack(tracks[0], undefined, false, {
+      loggerName: this.roomOptions.loggerName,
+      loggerContextCb: () => this.logContext,
+    });
     screenVideo.source = Track.Source.ScreenShare;
+    if (options.contentHint) {
+      screenVideo.mediaStreamTrack.contentHint = options.contentHint;
+    }
+
     const localTracks: Array<LocalTrack> = [screenVideo];
     if (stream.getAudioTracks().length > 0) {
       this.emit(ParticipantEvent.AudioStreamAcquired);
@@ -465,6 +497,7 @@ export default class LocalParticipant extends Participant {
         undefined,
         false,
         this.audioContext,
+        { loggerName: this.roomOptions.loggerName, loggerContextCb: () => this.logContext },
       );
       screenAudio.source = Track.Source.ScreenShareAudio;
       localTracks.push(screenAudio);
@@ -513,14 +546,25 @@ export default class LocalParticipant extends Participant {
     if (track instanceof MediaStreamTrack) {
       switch (track.kind) {
         case 'audio':
-          track = new LocalAudioTrack(track, defaultConstraints, true, this.audioContext);
+          track = new LocalAudioTrack(track, defaultConstraints, true, this.audioContext, {
+            loggerName: this.roomOptions.loggerName,
+            loggerContextCb: () => this.logContext,
+          });
           break;
         case 'video':
-          track = new LocalVideoTrack(track, defaultConstraints, true);
+          track = new LocalVideoTrack(track, defaultConstraints, true, {
+            loggerName: this.roomOptions.loggerName,
+            loggerContextCb: () => this.logContext,
+          });
           break;
         default:
           throw new TrackInvalidError(`unsupported MediaStreamTrack kind ${track.kind}`);
       }
+    } else {
+      track.updateLoggerOptions({
+        loggerName: this.roomOptions.loggerName,
+        loggerContextCb: () => this.logContext,
+      });
     }
 
     if (track instanceof LocalAudioTrack) {
@@ -539,7 +583,10 @@ export default class LocalParticipant extends Participant {
     });
 
     if (existingPublication) {
-      log.warn('track has already been published, skipping');
+      this.log.warn('track has already been published, skipping', {
+        ...this.logContext,
+        ...getLogContextFromTrack(existingPublication),
+      });
       return existingPublication;
     }
 
@@ -556,12 +603,16 @@ export default class LocalParticipant extends Participant {
         options = {};
       }
       if (options.dtx === undefined) {
-        log.info(
+        this.log.info(
           `Opus DTX will be disabled for stereo tracks by default. Enable them explicitly to make it work.`,
+          {
+            ...this.logContext,
+            ...getLogContextFromTrack(track),
+          },
         );
       }
       if (options.red === undefined) {
-        log.info(
+        this.log.info(
           `Opus RED will be disabled for stereo tracks by default. Enable them explicitly to make it work.`,
         );
       }
@@ -575,7 +626,12 @@ export default class LocalParticipant extends Participant {
 
     // disable simulcast if e2ee is set on safari
     if (isSafari() && this.roomOptions.e2ee) {
-      log.info(`End-to-end encryption is set up, simulcast publishing will be disabled on Safari`);
+      this.log.info(
+        `End-to-end encryption is set up, simulcast publishing will be disabled on Safari`,
+        {
+          ...this.logContext,
+        },
+      );
       opts.simulcast = false;
     }
 
@@ -599,7 +655,10 @@ export default class LocalParticipant extends Participant {
       (publishedTrack) => track instanceof LocalTrack && publishedTrack.source === track.source,
     );
     if (existingTrackOfSource && track.source !== Track.Source.Unknown) {
-      log.info(`publishing a second track with the same source: ${track.source}`);
+      this.log.info(`publishing a second track with the same source: ${track.source}`, {
+        ...this.logContext,
+        ...getLogContextFromTrack(track),
+      });
     }
     if (opts.stopMicTrackOnMute && track instanceof LocalAudioTrack) {
       track.stopOnMute = true;
@@ -664,7 +723,11 @@ export default class LocalParticipant extends Participant {
           height: defaultRes.height,
         };
         // log failure
-        log.error('could not determine track dimensions, using defaults', dims);
+        this.log.error('could not determine track dimensions, using defaults', {
+          ...this.logContext,
+          ...getLogContextFromTrack(track),
+          dims,
+        });
       }
       // width and height should be defined for video
       req.width = dims.width;
@@ -748,7 +811,11 @@ export default class LocalParticipant extends Participant {
     if (primaryCodecMime && track.kind === Track.Kind.Video) {
       const updatedCodec = mimeTypeToVideoCodecString(primaryCodecMime);
       if (updatedCodec !== videoCodec) {
-        log.debug('falling back to server selected codec', { codec: updatedCodec });
+        this.log.debug('falling back to server selected codec', {
+          ...this.logContext,
+          ...getLogContextFromTrack(track),
+          codec: updatedCodec,
+        });
         /* @ts-ignore */
         opts.videoCodec = updatedCodec;
 
@@ -762,7 +829,10 @@ export default class LocalParticipant extends Participant {
       }
     }
 
-    const publication = new LocalTrackPublication(track.kind, ti, track);
+    const publication = new LocalTrackPublication(track.kind, ti, track, {
+      loggerName: this.roomOptions.loggerName,
+      loggerContextCb: () => this.logContext,
+    });
     // save options for when it needs to be republished again
     publication.options = opts;
     track.sid = ti.sid;
@@ -770,7 +840,11 @@ export default class LocalParticipant extends Participant {
     if (!this.engine.pcManager) {
       throw new UnexpectedConnectionState('pcManager is not ready');
     }
-    log.debug(`publishing ${track.kind} with encodings`, { encodings, trackInfo: ti });
+    this.log.debug(`publishing ${track.kind} with encodings`, {
+      ...this.logContext,
+      encodings,
+      trackInfo: ti,
+    });
 
     track.sender = await this.engine.createSender(track, opts, encodings);
 
@@ -863,8 +937,12 @@ export default class LocalParticipant extends Participant {
 
     const encodings = computeTrackBackupEncodings(track, videoCodec, opts);
     if (!encodings) {
-      log.info(
+      this.log.info(
         `backup codec has been disabled, ignoring request to add additional codec for track`,
+        {
+          ...this.logContext,
+          ...getLogContextFromTrack(track),
+        },
       );
       return;
     }
@@ -897,7 +975,11 @@ export default class LocalParticipant extends Participant {
     await this.engine.createSimulcastSender(track, simulcastTrack, opts, encodings);
 
     await this.engine.negotiate();
-    log.debug(`published ${videoCodec} for track ${track.sid}`, { encodings, trackInfo: ti });
+    this.log.debug(`published ${videoCodec} for track ${track.sid}`, {
+      ...this.logContext,
+      encodings,
+      trackInfo: ti,
+    });
   }
 
   async unpublishTrack(
@@ -907,12 +989,17 @@ export default class LocalParticipant extends Participant {
     // look through all published tracks to find the right ones
     const publication = this.getPublicationForTrack(track);
 
-    log.debug('unpublishing track', { track, method: 'unpublishTrack' });
+    const pubLogContext = publication ? getLogContextFromTrack(publication) : undefined;
+
+    this.log.debug('unpublishing track', {
+      ...this.logContext,
+      ...pubLogContext,
+    });
 
     if (!publication || !publication.track) {
-      log.warn('track was not unpublished because no publication was found', {
-        track,
-        method: 'unpublishTrack',
+      this.log.warn('track was not unpublished because no publication was found', {
+        ...this.logContext,
+        ...pubLogContext,
       });
       return undefined;
     }
@@ -965,7 +1052,11 @@ export default class LocalParticipant extends Participant {
           track.simulcastCodecs.clear();
         }
       } catch (e) {
-        log.warn('failed to unpublish track', { error: e, method: 'unpublishTrack' });
+        this.log.warn('failed to unpublish track', {
+          ...this.logContext,
+          ...pubLogContext,
+          error: e,
+        });
       }
     }
 
@@ -1023,7 +1114,8 @@ export default class LocalParticipant extends Participant {
         ) {
           // generally we need to restart the track before publishing, often a full reconnect
           // is necessary because computer had gone to sleep.
-          log.debug('restarting existing track', {
+          this.log.debug('restarting existing track', {
+            ...this.logContext,
             track: pub.trackSid,
           });
           await track.restartTrack();
@@ -1152,9 +1244,10 @@ export default class LocalParticipant extends Participant {
       if (pub) {
         const mutedOnServer = pub.isMuted || (pub.track?.isUpstreamPaused ?? false);
         if (mutedOnServer !== ti.muted) {
-          log.debug('updating server mute state after reconcile', {
-            sid: ti.sid,
-            muted: mutedOnServer,
+          this.log.debug('updating server mute state after reconcile', {
+            ...this.logContext,
+            ...getLogContextFromTrack(pub),
+            mutedOnServer,
           });
           this.engine.client.sendMuteTrack(ti.sid, mutedOnServer);
         }
@@ -1164,7 +1257,8 @@ export default class LocalParticipant extends Participant {
   }
 
   private updateTrackSubscriptionPermissions = () => {
-    log.debug('updating track subscription permissions', {
+    this.log.debug('updating track subscription permissions', {
+      ...this.logContext,
       allParticipantsAllowed: this.allParticipantsAllowedToSubscribe,
       participantTrackPermissions: this.participantTrackPermissions,
     });
@@ -1187,7 +1281,10 @@ export default class LocalParticipant extends Participant {
     }
 
     if (!track.sid) {
-      log.error('could not update mute status for unpublished track', track);
+      this.log.error('could not update mute status for unpublished track', {
+        ...this.logContext,
+        ...getLogContextFromTrack(track),
+      });
       return;
     }
 
@@ -1195,12 +1292,18 @@ export default class LocalParticipant extends Participant {
   };
 
   private onTrackUpstreamPaused = (track: LocalTrack) => {
-    log.debug('upstream paused');
+    this.log.debug('upstream paused', {
+      ...this.logContext,
+      ...getLogContextFromTrack(track),
+    });
     this.onTrackMuted(track, true);
   };
 
   private onTrackUpstreamResumed = (track: LocalTrack) => {
-    log.debug('upstream resumed');
+    this.log.debug('upstream resumed', {
+      ...this.logContext,
+      ...getLogContextFromTrack(track),
+    });
     this.onTrackMuted(track, track.isMuted);
   };
 
@@ -1210,9 +1313,9 @@ export default class LocalParticipant extends Participant {
     }
     const pub = this.videoTracks.get(update.trackSid);
     if (!pub) {
-      log.warn('received subscribed quality update for unknown track', {
-        method: 'handleSubscribedQualityUpdate',
-        sid: update.trackSid,
+      this.log.warn('received subscribed quality update for unknown track', {
+        ...this.logContext,
+        trackSid: update.trackSid,
       });
       return;
     }
@@ -1223,7 +1326,10 @@ export default class LocalParticipant extends Participant {
       const newCodecs = await pub.videoTrack.setPublishingCodecs(update.subscribedCodecs);
       for await (const codec of newCodecs) {
         if (isBackupCodec(codec)) {
-          log.debug(`publish ${codec} for ${pub.videoTrack.sid}`);
+          this.log.debug(`publish ${codec} for ${pub.videoTrack.sid}`, {
+            ...this.logContext,
+            ...getLogContextFromTrack(pub),
+          });
           await this.publishAdditionalCodecForTrack(pub.videoTrack, codec, pub.options);
         }
       }
@@ -1235,8 +1341,8 @@ export default class LocalParticipant extends Participant {
   private handleLocalTrackUnpublished = (unpublished: TrackUnpublishedResponse) => {
     const track = this.tracks.get(unpublished.trackSid);
     if (!track) {
-      log.warn('received unpublished event for unknown track', {
-        method: 'handleLocalTrackUnpublished',
+      this.log.warn('received unpublished event for unknown track', {
+        ...this.logContext,
         trackSid: unpublished.trackSid,
       });
       return;
@@ -1249,8 +1355,9 @@ export default class LocalParticipant extends Participant {
       track.source === Track.Source.ScreenShare ||
       track.source === Track.Source.ScreenShareAudio
     ) {
-      log.debug('unpublishing local track due to TrackEnded', {
-        track: track.sid,
+      this.log.debug('unpublishing local track due to TrackEnded', {
+        ...this.logContext,
+        ...getLogContextFromTrack(track),
       });
       this.unpublishTrack(track);
     } else if (track.isUserProvided) {
@@ -1265,7 +1372,10 @@ export default class LocalParticipant extends Participant {
               name: track.source === Track.Source.Camera ? 'camera' : 'microphone',
             });
             if (currentPermissions && currentPermissions.state === 'denied') {
-              log.warn(`user has revoked access to ${track.source}`);
+              this.log.warn(`user has revoked access to ${track.source}`, {
+                ...this.logContext,
+                ...getLogContextFromTrack(track),
+              });
 
               // detect granted change after permissions were denied to try and resume then
               currentPermissions.onchange = () => {
@@ -1283,11 +1393,17 @@ export default class LocalParticipant extends Participant {
           }
         }
         if (!track.isMuted) {
-          log.debug('track ended, attempting to use a different device');
+          this.log.debug('track ended, attempting to use a different device', {
+            ...this.logContext,
+            ...getLogContextFromTrack(track),
+          });
           await track.restartTrack();
         }
       } catch (e) {
-        log.warn(`could not restart track, muting instead`);
+        this.log.warn(`could not restart track, muting instead`, {
+          ...this.logContext,
+          ...getLogContextFromTrack(track),
+        });
         await track.mute();
       }
     }

package/src/room/participant/Participant.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import type TypedEmitter from 'typed-emitter';
-import log from '../../logger';
+import log, { LoggerNames, StructuredLogger, getLogger } from '../../logger';
 import {
   DataPacket_Kind,
   ParticipantInfo,
@@ -16,6 +16,7 @@ import type RemoteTrack from '../track/RemoteTrack';
 import type RemoteTrackPublication from '../track/RemoteTrackPublication';
 import { Track } from '../track/Track';
 import type { TrackPublication } from '../track/TrackPublication';
+import type { LoggerOptions } from '../types';
 
 export enum ConnectionQuality {
   Excellent = 'excellent',
@@ -80,6 +81,18 @@ export default class Participant extends (EventEmitter as new () => TypedEmitter
 
   protected audioContext?: AudioContext;
 
+  protected log: StructuredLogger = log;
+
+  protected loggerOptions?: LoggerOptions;
+
+  protected get logContext() {
+    return {
+      ...this.loggerOptions?.loggerContextCb?.(),
+      participantSid: this.sid,
+      participantId: this.identity,
+    };
+  }
+
   get isEncrypted() {
     return this.tracks.size > 0 && Array.from(this.tracks.values()).every((tr) => tr.isEncrypted);
   }
@@ -89,8 +102,18 @@ export default class Participant extends (EventEmitter as new () => TypedEmitter
   }
 
   /** @internal */
-  constructor(sid: string, identity: string, name?: string, metadata?: string) {
+  constructor(
+    sid: string,
+    identity: string,
+    name?: string,
+    metadata?: string,
+    loggerOptions?: LoggerOptions,
+  ) {
     super();
+
+    this.log = getLogger(loggerOptions?.loggerName ?? LoggerNames.Participant);
+    this.loggerOptions = loggerOptions;
+
     this.setMaxListeners(100);
     this.sid = sid;
     this.identity = identity;
@@ -187,7 +210,7 @@ export default class Participant extends (EventEmitter as new () => TypedEmitter
     }
     // set this last so setMetadata can detect changes
     this.participantInfo = info;
-    log.trace('update participant info', { info });
+    this.log.trace('update participant info', { ...this.logContext, info });
     return true;
   }
 

package/src/room/participant/RemoteParticipant.ts

@@ -1,5 +1,4 @@
 import type { SignalClient } from '../../api/SignalClient';
-import log from '../../logger';
 import type { ParticipantInfo, SubscriptionError } from '../../proto/livekit_models_pb';
 import type { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc_pb';
 import { ParticipantEvent, TrackEvent } from '../events';
@@ -11,6 +10,8 @@ import { Track } from '../track/Track';
 import type { TrackPublication } from '../track/TrackPublication';
 import type { AudioOutputOptions } from '../track/options';
 import type { AdaptiveStreamSettings } from '../track/types';
+import { getLogContextFromTrack } from '../track/utils';
+import type { LoggerOptions } from '../types';
 import Participant from './Participant';
 import type { ParticipantEventCallbacks } from './Participant';
 
@@ -39,8 +40,9 @@ export default class RemoteParticipant extends Participant {
     identity?: string,
     name?: string,
     metadata?: string,
+    loggerOptions?: LoggerOptions,
   ) {
-    super(sid, identity || '', name, metadata);
+    super(sid, identity || '', name, metadata, loggerOptions);
     this.signalClient = signalClient;
     this.tracks = new Map();
     this.audioTracks = new Map();
@@ -53,7 +55,10 @@ export default class RemoteParticipant extends Participant {
 
     // register action events
     publication.on(TrackEvent.UpdateSettings, (settings: UpdateTrackSettings) => {
-      log.debug('send update settings', settings);
+      this.log.debug('send update settings', {
+        ...this.logContext,
+        ...getLogContextFromTrack(publication),
+      });
       this.signalClient.sendUpdateTrackSettings(settings);
     });
     publication.on(TrackEvent.UpdateSubscription, (sub: UpdateSubscription) => {
@@ -159,7 +164,10 @@ export default class RemoteParticipant extends Participant {
     // yet arrived. Wait a bit longer for it to arrive, or fire an error
     if (!publication) {
       if (triesLeft === 0) {
-        log.error('could not find published track', { participant: this.sid, trackSid: sid });
+        this.log.error('could not find published track', {
+          ...this.logContext,
+          trackSid: sid,
+        });
         this.emit(ParticipantEvent.TrackSubscriptionFailed, sid);
         return;
       }
@@ -179,9 +187,9 @@ export default class RemoteParticipant extends Participant {
     }
 
     if (mediaTrack.readyState === 'ended') {
-      log.error(
+      this.log.error(
         'unable to subscribe because MediaStreamTrack is ended. Do not call MediaStreamTrack.stop()',
-        { participant: this.sid, trackSid: sid },
+        { ...this.logContext, ...getLogContextFromTrack(publication) },
       );
       this.emit(ParticipantEvent.TrackSubscriptionFailed, sid);
       return;
@@ -246,6 +254,7 @@ export default class RemoteParticipant extends Participant {
           kind,
           ti,
           this.signalClient.connectOptions?.autoSubscribe,
+          { loggerContextCb: () => this.logContext, loggerName: this.loggerOptions?.loggerName },
         );
         publication.updateInfo(ti);
         newTracks.set(ti.sid, publication);
@@ -253,13 +262,12 @@ export default class RemoteParticipant extends Participant {
           (publishedTrack) => publishedTrack.source === publication?.source,
         );
         if (existingTrackOfSource && publication.source !== Track.Source.Unknown) {
-          log.debug(
+          this.log.debug(
             `received a second track publication for ${this.identity} with the same source: ${publication.source}`,
             {
-              oldTrack: existingTrackOfSource,
-              newTrack: publication,
-              participant: this,
-              participantInfo: info,
+              ...this.logContext,
+              oldTrack: getLogContextFromTrack(existingTrackOfSource),
+              newTrack: getLogContextFromTrack(publication),
             },
           );
         }
@@ -273,9 +281,9 @@ export default class RemoteParticipant extends Participant {
     // detect removed tracks
     this.tracks.forEach((publication) => {
       if (!validTracks.has(publication.trackSid)) {
-        log.trace('detected removed track on remote participant, unpublishing', {
-          publication,
-          participantSid: this.sid,
+        this.log.trace('detected removed track on remote participant, unpublishing', {
+          ...this.logContext,
+          ...getLogContextFromTrack(publication),
         });
         this.unpublishTrack(publication.trackSid, true);
       }
@@ -341,7 +349,7 @@ export default class RemoteParticipant extends Participant {
     event: E,
     ...args: Parameters<ParticipantEventCallbacks[E]>
   ): boolean {
-    log.trace('participant event', { participant: this.sid, event, args });
+    this.log.trace('participant event', { ...this.logContext, event, args });
     return super.emit(event, ...args);
   }
 }

package/src/room/participant/publishUtils.test.ts

@@ -183,7 +183,7 @@ describe('screenShareSimulcastDefaults', () => {
     );
     expect(defaultSimulcastLayers[0].width).toBe(640);
     expect(defaultSimulcastLayers[0].height).toBe(360);
-    expect(defaultSimulcastLayers[0].encoding.maxFramerate).toBe(3);
-    expect(defaultSimulcastLayers[0].encoding.maxBitrate).toBe(150_000);
+    expect(defaultSimulcastLayers[0].encoding.maxFramerate).toBe(15);
+    expect(defaultSimulcastLayers[0].encoding.maxBitrate).toBe(375000);
   });
 });