un-deprecated TYPE_DOUBLE

Author: Rachel Chen

requirements.txt

@@ -29,7 +29,11 @@ python-rapidjson==1.8
 redis==4.5.4
 sentry-arroyo==2.19.4
 sentry-kafka-schemas==0.1.129
+<<<<<<< HEAD
 sentry-protos==0.1.49
+=======
+sentry-protos==0.1.51
+>>>>>>> 25b52cb78 (un-deprecated TYPE_DOUBLE)
 sentry-redis-tools==0.3.0
 sentry-relay==0.9.4
 sentry-sdk==2.18.0

snuba/web/rpc/common/common.py

@@ -82,12 +82,12 @@ def transform(exp: Expression) -> Expression:
     "sentry.segment_id": AttributeKey.Type.TYPE_STRING,  # this is converted by a processor on the storage
     "sentry.segment_name": AttributeKey.Type.TYPE_STRING,
     "sentry.is_segment": AttributeKey.Type.TYPE_BOOLEAN,
-    "sentry.duration_ms": AttributeKey.Type.TYPE_DOUBLE,
-    "sentry.exclusive_time_ms": AttributeKey.Type.TYPE_DOUBLE,
+    "sentry.duration_ms": AttributeKey.Type.TYPE_FLOAT,
+    "sentry.exclusive_time_ms": AttributeKey.Type.TYPE_FLOAT,
     "sentry.retention_days": AttributeKey.Type.TYPE_INT,
     "sentry.name": AttributeKey.Type.TYPE_STRING,
-    "sentry.sampling_weight": AttributeKey.Type.TYPE_DOUBLE,
-    "sentry.sampling_factor": AttributeKey.Type.TYPE_DOUBLE,
+    "sentry.sampling_weight": AttributeKey.Type.TYPE_FLOAT,
+    "sentry.sampling_factor": AttributeKey.Type.TYPE_FLOAT,
     "sentry.timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
     "sentry.start_timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
     "sentry.end_timestamp": AttributeKey.Type.TYPE_UNSPECIFIED,
@@ -102,6 +102,7 @@ def transform(exp: Expression) -> Expression:
 
 def attribute_key_to_expression(attr_key: AttributeKey) -> Expression:
     print("typeeeeee", attr_key)
+
     def _build_label_mapping_key(attr_key: AttributeKey) -> str:
         return attr_key.name + "_" + AttributeKey.Type.Name(attr_key.type)
 
@@ -125,10 +126,14 @@ def _build_label_mapping_key(attr_key: AttributeKey) -> str:
             )
         if attr_key.type == AttributeKey.Type.TYPE_INT:
             return f.CAST(column(attr_key.name[len("sentry.") :]), "Int64", alias=alias)
-        if attr_key.type == AttributeKey.Type.TYPE_DOUBLE:
-            print("timestamp_columnsssss", f.CAST(
-                column(attr_key.name[len("sentry.") :]), "Float64", alias=alias
-            ))
+        if (
+            attr_key.type == AttributeKey.Type.TYPE_FLOAT
+            or attr_key.type == AttributeKey.Type.TYPE_DOUBLE
+        ):
+            print(
+                "timestamp_columnsssss",
+                f.CAST(column(attr_key.name[len("sentry.") :]), "Float64", alias=alias),
+            )
             return f.CAST(
                 column(attr_key.name[len("sentry.") :]), "Float64", alias=alias
             )
@@ -137,7 +142,11 @@ def _build_label_mapping_key(attr_key: AttributeKey) -> str:
         )
 
     if attr_key.name in NORMALIZED_COLUMNS:
-        if NORMALIZED_COLUMNS[attr_key.name] == attr_key.type:
+        # the second if statement is saying if Sentry sends Snuba TYPE_FLOATS when Snuba already supports TYPE_DOUBLE. This is needed for backward compatibility
+        if NORMALIZED_COLUMNS[attr_key.name] == attr_key.type or (
+            attr_key.type == AttributeKey.Type.TYPE_DOUBLE
+            and NORMALIZED_COLUMNS[attr_key.name] == AttributeKey.Type.TYPE_FLOAT
+        ):
             return column(attr_key.name[len("sentry.") :], alias=attr_key.name)
         raise BadSnubaRPCRequestException(
             f"Attribute {attr_key.name} must be requested as {NORMALIZED_COLUMNS[attr_key.name]}, got {attr_key.type}"
@@ -148,10 +157,16 @@ def _build_label_mapping_key(attr_key: AttributeKey) -> str:
         return SubscriptableReference(
             alias=alias, column=column("attr_str"), key=literal(attr_key.name)
         )
-    if attr_key.type == AttributeKey.Type.TYPE_DOUBLE:
-        print("subscriptableeeee", SubscriptableReference(
-            alias=alias, column=column("attr_num"), key=literal(attr_key.name)
-        ))
+    if (
+        attr_key.type == AttributeKey.Type.TYPE_FLOAT
+        or attr_key.type == AttributeKey.Type.TYPE_DOUBLE
+    ):
+        print(
+            "subscriptableeeee",
+            SubscriptableReference(
+                alias=alias, column=column("attr_num"), key=literal(attr_key.name)
+            ),
+        )
         return SubscriptableReference(
             alias=alias, column=column("attr_num"), key=literal(attr_key.name)
         )

snuba/web/rpc/v1/resolvers/R_eap_spans/resolver_trace_item_table.py

@@ -196,7 +196,7 @@ def _convert_results(
             elif column.key.type == AttributeKey.TYPE_FLOAT:
                 converters[column.label] = lambda x: AttributeValue(val_float=float(x))
             elif column.key.type == AttributeKey.TYPE_DOUBLE:
-                converters[column.label] = lambda x: AttributeValue(val_double=double(x))
+                converters[column.label] = lambda x: AttributeValue(val_double=float(x))
         elif column.HasField("aggregation"):
             converters[column.label] = lambda x: AttributeValue(val_float=float(x))
         else: