Skip to content

Commit 8a6101c

Browse files
authored
Merge pull request #2456 from element-hq/renovate/all-minor-patch
Update all non-major dependencies
2 parents 0c39398 + 4db7c2b commit 8a6101c

File tree

4 files changed

+1788
-1412
lines changed

4 files changed

+1788
-1412
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"@opentelemetry/api": "^1.4.0",
2727
"@opentelemetry/context-zone": "^1.9.1",
2828
"@opentelemetry/exporter-jaeger": "^1.9.1",
29-
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
30-
"@opentelemetry/instrumentation-document-load": "^0.38.0",
31-
"@opentelemetry/instrumentation-user-interaction": "^0.38.0",
29+
"@opentelemetry/exporter-trace-otlp-http": "^0.52.0",
30+
"@opentelemetry/instrumentation-document-load": "^0.39.0",
31+
"@opentelemetry/instrumentation-user-interaction": "^0.39.0",
3232
"@opentelemetry/sdk-trace-web": "^1.9.1",
3333
"@radix-ui/react-dialog": "^1.0.4",
3434
"@radix-ui/react-slider": "^1.1.2",

src/@types/global.d.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ declare global {
2828
OLM_OPTIONS: Record<string, string>;
2929
}
3030

31-
// TypeScript doesn't know about the experimental setSinkId method, so we
32-
// declare it ourselves
33-
interface MediaElement extends HTMLVideoElement {
34-
setSinkId: (id: string) => void;
35-
}
36-
3731
interface HTMLElement {
3832
// Safari only supports this prefixed, so tell the type system about it
3933
webkitRequestFullscreen: () => void;

src/otel/OTelGroupCallMembership.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import {
4040
SummaryStatsReport,
4141
CallFeedReport,
4242
} from "matrix-js-sdk/src/webrtc/stats/statsReport";
43-
import { setSpan } from "@opentelemetry/api/build/esm/trace/context-utils";
4443

4544
import { ElementCallOpenTelemetry } from "./otel";
4645
import { ObjectFlattener } from "./ObjectFlattener";
@@ -446,7 +445,7 @@ export class OTelGroupCallMembership {
446445
const type = OTelStatsReportType.SummaryReport;
447446
const data = ObjectFlattener.flattenSummaryStatsReportObject(statsReport);
448447
if (this.statsReportSpan.span === undefined && this.callMembershipSpan) {
449-
const ctx = setSpan(
448+
const ctx = opentelemetry.trace.setSpan(
450449
opentelemetry.context.active(),
451450
this.callMembershipSpan,
452451
);

0 commit comments

Comments
 (0)