fix: integration with Apache Beam 2.32, 2.33 reported in getsentry#1231 (getsentry#1233)

galuszkak · Kamil Gałuszka · web-flow · commit 81b2c70a26c2 · 2021-11-04T08:27:51.000-04:00
Co-authored-by: Kamil Gałuszka &lt;galuszkak@FVFGC0XHQ05P.local&gt;
diff --git a/sentry_sdk/integrations/beam.py b/sentry_sdk/integrations/beam.py
@@ -80,7 +80,6 @@ def sentry_init_pardo(self, fn, *args, **kwargs):
 
 def _wrap_inspect_call(cls, func_name):
     # type: (Any, Any) -> Any
-    from apache_beam.typehints.decorators import getfullargspec  # type: ignore
 
     if not hasattr(cls, func_name):
         return None
@@ -105,6 +104,8 @@ def _inspect(self):
 
             return get_function_args_defaults(process_func)
         except ImportError:
+            from apache_beam.typehints.decorators import getfullargspec  # type: ignore
+
             return getfullargspec(process_func)
 
     setattr(_inspect, USED_FUNC, True)
diff --git a/tests/integrations/beam/test_beam.py b/tests/integrations/beam/test_beam.py
@@ -152,7 +152,9 @@ def test_monkey_patch_signature(f, args, kwargs):
 
 
 class _OutputProcessor(OutputProcessor):
-    def process_outputs(self, windowed_input_element, results):
+    def process_outputs(
+        self, windowed_input_element, results, watermark_estimator=None
+    ):
         print(windowed_input_element)
         try:
             for result in results:
diff --git a/tox.ini b/tox.ini
@@ -46,7 +46,7 @@ envlist =
     {pypy,py2.7,py3.5,py3.6,py3.7,py3.8}-celery-{4.3,4.4}
     {py3.6,py3.7,py3.8}-celery-5.0
 
-    py3.7-beam-{2.12,2.13}
+    py3.7-beam-{2.12,2.13,2.32,2.33}
 
     # The aws_lambda tests deploy to the real AWS and have their own matrix of Python versions.
     py3.7-aws_lambda
@@ -140,6 +140,8 @@ deps =
 
     beam-2.12: apache-beam>=2.12.0, <2.13.0
     beam-2.13: apache-beam>=2.13.0, <2.14.0
+    beam-2.32: apache-beam>=2.32.0, <2.33.0
+    beam-2.33: apache-beam>=2.33.0, <2.34.0
     beam-master: git+https://github.com/apache/beam#egg=apache-beam&subdirectory=sdks/python
 
     celery: redis
