Fix gRPC / Protobuf incompatibilities (#558)

TimPansino · lrafeei · web-flow · commit 1ea34ed4d8cc · 2022-05-27T13:32:13.000-07:00
* Catch grpc import issues

* Fix deleted import

Co-authored-by: Lalleh Rafeei &lt;84813886+lrafeei@users.noreply.github.com&gt;
diff --git a/newrelic/core/agent_streaming.py b/newrelic/core/agent_streaming.py
@@ -19,8 +19,8 @@
     import grpc
 
     from newrelic.core.infinite_tracing_pb2 import RecordStatus, Span
-except ImportError:
-    grpc = None
+except Exception:
+    grpc, RecordStatus, Span = None, None, None
 
 _logger = logging.getLogger(__name__)
 
diff --git a/newrelic/core/config.py b/newrelic/core/config.py
@@ -44,7 +44,7 @@
     from newrelic.core.infinite_tracing_pb2 import (  # pylint: disable=W0611,C0412  # noqa: F401
         Span,
     )
-except ImportError:
+except Exception:
     grpc = None
 
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`from newrelic.core.infinite_tracing_pb2 import ( # pylint: disable=W0611,C0412 # noqa: F401`
`45`	`45`	`Span,`
`46`	`46`	`)`
`47`		`-except ImportError:`
	`47`	`+except Exception:`
`48`	`48`	`grpc = None`
`49`	`49`
`50`	`50`