Upgrade protobuf to >=5.0,<6.0 (#219)

* upgrade protobuf to >=5,<6 * Run 5.28.3 instead of 5.28.2 * Changie --------- Co-authored-by: Eric Hauser <[email protected]>
dbt-labs · Nov 19, 2024 · c82699d · c82699d
1 parent 9bd1064
commit c82699d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/.changes/unreleased/Under the Hood-20241112-133750.yaml b/.changes/unreleased/Under the Hood-20241112-133750.yaml
@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Upgrade protobuf to <=5.0
+time: 2024-11-12T13:37:50.886196-05:00
+custom:
+  Author: gshank
+  Issue: "218"
diff --git a/dbt_common/events/base_types.py b/dbt_common/events/base_types.py
@@ -91,15 +91,18 @@ def __getattr__(self, key):
 
     def to_dict(self):
         return MessageToDict(
-            self.pb_msg, preserving_proto_field_name=True, including_default_value_fields=True
+            self.pb_msg,
+            preserving_proto_field_name=True,
+            always_print_fields_with_no_presence=True,
         )
 
     def to_json(self) -> str:
         return MessageToJson(
             self.pb_msg,
             preserving_proto_field_name=True,
-            including_default_value_fields=True,
+            always_print_fields_with_no_presence=True,
             indent=None,
+            sort_keys=True,
         )
 
     def level_tag(self) -> EventLevel:

diff --git a/dbt_common/events/functions.py b/dbt_common/events/functions.py
@@ -97,7 +97,7 @@ def msg_to_dict(msg: EventMsg) -> dict:
         msg_dict = MessageToDict(
             msg,
             preserving_proto_field_name=True,
-            including_default_value_fields=True,  # type: ignore
+            always_print_fields_with_no_presence=True,
         )
     except Exception as exc:
         event_type = type(msg).__name__

diff --git a/dbt_common/events/types_pb2.py b/dbt_common/events/types_pb2.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,7 +35,7 @@ dependencies = [
   "Jinja2>=3.1.3,<4",
   "mashumaro[msgpack]>=3.9,<4.0",
   "pathspec>=0.9,<0.13",
-  "protobuf>=4.0.0,<5.0.0",
+  "protobuf>=5.0,<6.0",
   "python-dateutil>=2.0,<3.0",
   "requests<3.0.0",  # needs to match dbt-core
   "typing-extensions>=4.4,<5.0",
@@ -51,7 +51,7 @@ lint = [
     "pytest>=7.3,<8.0",  # needed for linting tests
     "types-Jinja2>=2.11,<3.0",
     "types-jsonschema>=4.17,<5.0",
-    "types-protobuf>=4.24,<5.0",
+    "types-protobuf>=5.0,<6.0",
     "types-python-dateutil>=2.8,<3.0",
     "types-PyYAML>=6.0,<7.0",
     "types-requests"