More work on opentelemetry event reporting

Moastly a re-org to avoid new contexts over React component unmounts/
remounts.

src/otel/OTelGroupCallMembership.ts

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import opentelemetry, { Context, Span } from "@opentelemetry/api";
-import { GroupCall, MatrixEvent } from "matrix-js-sdk";
+import { GroupCall, MatrixClient, MatrixEvent } from "matrix-js-sdk";
 import { VoipEvent } from "matrix-js-sdk/src/webrtc/call";
 
 import { tracer } from "./otel";
@@ -27,7 +27,7 @@ function setNestedAttributesFromToDeviceEvent(span: Span, event: VoipEvent) {
   setSpanEventAttributesRecursive(
     span,
     event as unknown as Record<string, unknown>, // XXX Types
-    "matrix.",
+    "matrix.event.",
     0
   );
 }
@@ -64,28 +64,27 @@ export class OTelGroupCallMembership {
   private context: Context;
   private callMembershipSpan: Span;
 
-  constructor(groupCall: GroupCall) {
-    const callIdContext = opentelemetry.context
-      .active()
-      .setValue(Symbol("confId"), groupCall.groupCallId);
+  constructor(groupCall: GroupCall, client: MatrixClient) {
+    // Create a new call based on the callIdContext. This context also has a span assigned to it.
+    // Other spans can use this context to extract the parent span.
+    // (When passing this context to startSpan the started span will use the span set in the context (in this case the callSpan) as the parent)
 
+    const myMember = groupCall.room.getMember(client.getUserId());
+    this.context = opentelemetry.trace
+      .setSpan(opentelemetry.context.active(), this.callMembershipSpan)
+      .setValue(Symbol("confId"), groupCall.groupCallId)
+      .setValue(Symbol("matrix.userId"), client.getUserId())
+      .setValue(Symbol("matrix.displayName"), myMember.name);
+  }
+
+  public onJoinCall() {
     // Create the main span that tracks the time we intend to be in the call
     this.callMembershipSpan = tracer.startSpan(
       "otel_groupCallMembershipSpan",
       undefined,
-      callIdContext
+      this.context
     );
 
-    // Create a new call based on the callIdContext. This context also has a span assigned to it.
-    // Other spans can use this context to extract the parent span.
-    // (When passing this context to startSpan the started span will use the span set in the context (in this case the callSpan) as the parent)
-    this.context = opentelemetry.trace.setSpan(
-      opentelemetry.context.active(),
-      this.callMembershipSpan
-    );
-  }
-
-  public onJoinCall() {
     // Here we start a very short span. This is a hack to trigger the posthog exporter.
     // Only ended spans are processed by the exporter.
     // We want the exporter to know that a call has started
@@ -107,7 +106,7 @@ export class OTelGroupCallMembership {
     startCallSpan.end();
 
     // and end the main span to indicate we've left
-    this.callMembershipSpan.end();
+    if (this.callMembershipSpan) this.callMembershipSpan.end();
   }
 
   public onSendStateEvent(stateEvent: MatrixEvent) {}

src/otel/otel.ts

@@ -1,4 +1,19 @@
-/* document-load.ts|js file - the code is the same for both the languages */
+/*
+Copyright 2023 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import {
   ConsoleSpanExporter,
   SimpleSpanProcessor,