feat(protocol): Add OpenTelemetry Context

CHANGELOG.md

@@ -5,6 +5,7 @@
 **Features**:
 
 - Dynamic sampling is now based on the volume received by Relay by default and does not include the original volume dropped by client-side sampling in SDKs. This is required for the final dynamic sampling feature in the latest Sentry plans. ([#1591](https://github.com/getsentry/relay/pull/1591))
+- Add OpenTelemetry Context ([#1617](https://github.com/getsentry/relay/pull/1617))
 
 **Internal**:
 

relay-general/src/protocol/contexts/mod.rs

@@ -18,6 +18,8 @@ mod runtime;
 pub use runtime::*;
 mod trace;
 pub use trace::*;
+mod otel;
+pub use otel::*;
 
 use crate::types::{Annotated, FromValue, Object, Value};
 
@@ -51,6 +53,8 @@ pub enum Context {
     Reprocessing(Box<ReprocessingContext>),
     /// Response information.
     Response(Box<ResponseContext>),
+    /// OpenTelemetry information
+    Otel(Box<OtelContext>),
     /// Additional arbitrary fields for forwards compatibility.
     #[metastructure(fallback_variant)]
     Other(#[metastructure(pii = "true")] Object<Value>),
@@ -72,6 +76,7 @@ impl Context {
             Context::Trace(_) => Some(TraceContext::default_key()),
             Context::Monitor(_) => Some(MonitorContext::default_key()),
             Context::Response(_) => Some(ResponseContext::default_key()),
+            Context::Otel(_) => Some(OtelContext::default_key()),
             Context::Other(_) => None,
         }
     }

relay-general/src/protocol/contexts/otel.rs

@@ -0,0 +1,31 @@
+use crate::types::{Annotated, Object, Value};
+
+/// OpenTelemetry Context
+///
+/// If an event has this context, it was generated from a OpenTelemetry signal (trace, metric, log).
+#[derive(Clone, Debug, Default, PartialEq, Empty, FromValue, IntoValue, ProcessValue)]
+#[cfg_attr(feature = "jsonschema", derive(JsonSchema))]
+pub struct OtelContext {
+    /// Attributes of the OpenTelemetry span that maps to a Sentry event.
+    ///
+    /// <https://github.com/open-telemetry/opentelemetry-proto/blob/724e427879e3d2bae2edc0218fff06e37b9eb46e/opentelemetry/proto/trace/v1/trace.proto#L174-L186>
+    #[metastructure(pii = "maybe", bag_size = "large")]
+    attributes: Annotated<Object<Value>>,
+
+    /// Information about an OpenTelemetry resource.
+    ///
+    /// <https://github.com/open-telemetry/opentelemetry-proto/blob/724e427879e3d2bae2edc0218fff06e37b9eb46e/opentelemetry/proto/resource/v1/resource.proto>
+    #[metastructure(pii = "maybe", bag_size = "large")]
+    resource: Annotated<Object<Value>>,
+
+    /// Additional arbitrary fields for forwards compatibility.
+    #[metastructure(additional_properties, retain = "true", pii = "maybe")]
+    pub other: Object<Value>,
+}
+
+impl OtelContext {
+    /// The key under which a runtime context is generally stored (in `Contexts`).
+    pub fn default_key() -> &'static str {
+        "otel"
+    }
+}

relay-general/tests/snapshots/test_fixtures__event_schema.snap

@@ -1,6 +1,5 @@
 ---
 source: relay-general/tests/test_fixtures.rs
-assertion_line: 109
 expression: "relay_general::protocol::event_json_schema()"
 ---
 {
@@ -825,6 +824,9 @@ expression: "relay_general::protocol::event_json_schema()"
         {
           "$ref": "#/definitions/ResponseContext"
         },
+        {
+          "$ref": "#/definitions/OtelContext"
+        },
         {
           "type": "object",
           "additionalProperties": true
@@ -2368,6 +2370,35 @@ expression: "relay_general::protocol::event_json_schema()"
         }
       ]
     },
+    "OtelContext": {
+      "description": " OpenTelemetry Context\n\n If an event has this context, it was generated from a OpenTelemetry signal (trace, metric, log).",
+      "anyOf": [
+        {
+          "type": "object",
+          "properties": {
+            "attributes": {
+              "description": " Attributes of the OpenTelemetry span that maps to a Sentry event.\n\n <https://github.com/open-telemetry/opentelemetry-proto/blob/724e427879e3d2bae2edc0218fff06e37b9eb46e/opentelemetry/proto/trace/v1/trace.proto#L174-L186>",
+              "default": null,
+              "type": [
+                "object",
+                "null"
+              ],
+              "additionalProperties": true
+            },
+            "resource": {
+              "description": " Information about an OpenTelemetry resource.\n\n <https://github.com/open-telemetry/opentelemetry-proto/blob/724e427879e3d2bae2edc0218fff06e37b9eb46e/opentelemetry/proto/resource/v1/resource.proto>",
+              "default": null,
+              "type": [
+                "object",
+                "null"
+              ],
+              "additionalProperties": true
+            }
+          },
+          "additionalProperties": false
+        }
+      ]
+    },
     "PosixSignal": {
       "description": " POSIX signal with optional extended data.\n\n On Apple systems, signals also carry a code in addition to the signal number describing the\n signal in more detail. On Linux, this code does not exist.",
       "anyOf": [