feat(core): Align Span interface with OTEL

packages/core/src/tracing/sentryNonRecordingSpan.ts

@@ -68,4 +68,37 @@ export class SentryNonRecordingSpan implements Span {
   ): this {
     return this;
   }
+
+  /**
+   * This should generally not be used,
+   * but we need it for being comliant with the OTEL Span interface.
+   *
+   * @hidden
+   * @internal
+   */
+  public addLink(_link: unknown): this {
+    return this;
+  }
+
+  /**
+   * This should generally not be used,
+   * but we need it for being comliant with the OTEL Span interface.
+   *
+   * @hidden
+   * @internal
+   */
+  public addLinks(_links: unknown[]): this {
+    return this;
+  }
+
+  /**
+   * This should generally not be used,
+   * but we need it for being comliant with the OTEL Span interface.
+   *
+   * @hidden
+   * @internal
+   */
+  public recordException(_exception: unknown, _time?: number | undefined): void {
+    // noop
+  }
 }

packages/core/src/tracing/sentrySpan.ts

@@ -107,6 +107,39 @@ export class SentrySpan implements Span {
     }
   }
 
+  /**
+   * This should generally not be used,
+   * but it is needed for being compliant with the OTEL Span interface.
+   *
+   * @hidden
+   * @internal
+   */
+  public addLink(_link: unknown): this {
+    return this;
+  }
+
+  /**
+   * This should generally not be used,
+   * but it is needed for being compliant with the OTEL Span interface.
+   *
+   * @hidden
+   * @internal
+   */
+  public addLinks(_links: unknown[]): this {
+    return this;
+  }
+
+  /**
+   * This should generally not be used,
+   * but it is needed for being compliant with the OTEL Span interface.
+   *
+   * @hidden
+   * @internal
+   */
+  public recordException(_exception: unknown, _time?: number | undefined): void {
+    // noop
+  }
+
   /** @inheritdoc */
   public spanContext(): SpanContextData {
     const { _spanId: spanId, _traceId: traceId, _sampled: sampled } = this;
@@ -118,18 +151,21 @@ export class SentrySpan implements Span {
   }
 
   /** @inheritdoc */
-  public setAttribute(key: string, value: SpanAttributeValue | undefined): void {
+  public setAttribute(key: string, value: SpanAttributeValue | undefined): this {
     if (value === undefined) {
       // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
       delete this._attributes[key];
     } else {
       this._attributes[key] = value;
     }
+
+    return this;
   }
 
   /** @inheritdoc */
-  public setAttributes(attributes: SpanAttributes): void {
+  public setAttributes(attributes: SpanAttributes): this {
     Object.keys(attributes).forEach(key => this.setAttribute(key, attributes[key]));
+    return this;
   }
 
   /**

packages/opentelemetry/src/trace.ts

@@ -289,9 +289,7 @@ export function continueTrace<T>(options: Parameters<typeof baseContinueTrace>[0
 function getActiveSpanWrapper<T>(parentSpan: Span | SentrySpan | undefined | null): (callback: () => T) => T {
   return parentSpan !== undefined
     ? (callback: () => T) => {
-        // We cast this, because the OTEL Span has a few more methods than our Span interface
-        // TODO: Add these missing methods to the Span interface
-        return withActiveSpan(parentSpan as Span, callback);
+        return withActiveSpan(parentSpan, callback);
       }
     : (callback: () => T) => callback();
 }

packages/types/src/span.ts

@@ -219,13 +219,13 @@ export interface Span {
    * Set a single attribute on the span.
    * Set it to `undefined` to remove the attribute.
    */
-  setAttribute(key: string, value: SpanAttributeValue | undefined): void;
+  setAttribute(key: string, value: SpanAttributeValue | undefined): this;
 
   /**
    * Set multiple attributes on the span.
    * Any attribute set to `undefined` will be removed.
    */
-  setAttributes(attributes: SpanAttributes): void;
+  setAttributes(attributes: SpanAttributes): this;
 
   /**
    * Sets the status attribute on the current span.
@@ -247,4 +247,19 @@ export interface Span {
    * Adds an event to the Span.
    */
   addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;
+
+  /**
+   * NOT USED IN SENTRY, only added for compliance with OTEL Span interface
+   */
+  addLink(link: unknown): this;
+
+  /**
+   * NOT USED IN SENTRY, only added for compliance with OTEL Span interface
+   */
+  addLinks(links: unknown): this;
+
+  /**
+   * NOT USED IN SENTRY, only added for compliance with OTEL Span interface
+   */
+  recordException(exception: unknown, time?: number): void;
 }