Skip to content

Commit

Permalink
Merge pull request #2456 from element-hq/renovate/all-minor-patch
Browse files Browse the repository at this point in the history
Update all non-major dependencies
  • Loading branch information
robintown authored Jun 24, 2024
2 parents 0c39398 + 4db7c2b commit 8a6101c
Show file tree
Hide file tree
Showing 4 changed files with 1,788 additions and 1,412 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"@opentelemetry/api": "^1.4.0",
"@opentelemetry/context-zone": "^1.9.1",
"@opentelemetry/exporter-jaeger": "^1.9.1",
"@opentelemetry/exporter-trace-otlp-http": "^0.48.0",
"@opentelemetry/instrumentation-document-load": "^0.38.0",
"@opentelemetry/instrumentation-user-interaction": "^0.38.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.52.0",
"@opentelemetry/instrumentation-document-load": "^0.39.0",
"@opentelemetry/instrumentation-user-interaction": "^0.39.0",
"@opentelemetry/sdk-trace-web": "^1.9.1",
"@radix-ui/react-dialog": "^1.0.4",
"@radix-ui/react-slider": "^1.1.2",
Expand Down
6 changes: 0 additions & 6 deletions src/@types/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ declare global {
OLM_OPTIONS: Record<string, string>;
}

// TypeScript doesn't know about the experimental setSinkId method, so we
// declare it ourselves
interface MediaElement extends HTMLVideoElement {
setSinkId: (id: string) => void;
}

interface HTMLElement {
// Safari only supports this prefixed, so tell the type system about it
webkitRequestFullscreen: () => void;
Expand Down
3 changes: 1 addition & 2 deletions src/otel/OTelGroupCallMembership.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import {
SummaryStatsReport,
CallFeedReport,
} from "matrix-js-sdk/src/webrtc/stats/statsReport";
import { setSpan } from "@opentelemetry/api/build/esm/trace/context-utils";

import { ElementCallOpenTelemetry } from "./otel";
import { ObjectFlattener } from "./ObjectFlattener";
Expand Down Expand Up @@ -446,7 +445,7 @@ export class OTelGroupCallMembership {
const type = OTelStatsReportType.SummaryReport;
const data = ObjectFlattener.flattenSummaryStatsReportObject(statsReport);
if (this.statsReportSpan.span === undefined && this.callMembershipSpan) {
const ctx = setSpan(
const ctx = opentelemetry.trace.setSpan(
opentelemetry.context.active(),
this.callMembershipSpan,
);
Expand Down
Loading

0 comments on commit 8a6101c

Please sign in to comment.