Switch Error Reporting to Google Cloud Python

error_reporting/README.md

@@ -2,25 +2,6 @@
 
 This section contains samples for [Google Cloud Error Reporting](https://cloud.google.com/error-reporting).
 
-A startup script has been provided to demonstrated how to properly provision a GCE 
-instance with fluentd configured. Note the intallation of fluentd, the addition of the config file,
- and the restarting of the fluetnd service. You can start an instance  using
-it like this:
-
-    gcloud compute instances create example-instance --metadata-from-file startup-script=startup_script.sh
-
-or simply use it as reference when creating your own instance.
-
-After fluentd is configured, main.py could be used to simulate an error:
-
-    gcloud compute copy-files main.py example-instance:~/main.py
-
-Then, 
-
-    gcloud compute ssh example-instance
-    python ~/main.py
-
-And you will see the message in the Errors Console.
 
 <!-- auto-doc-link -->
 These samples are used on the following documentation page:

error_reporting/main.py

@@ -13,28 +13,16 @@
 # limitations under the License.
 
 # [START error_reporting]
-import traceback
-
-import fluent.event
-import fluent.sender
+from google.cloud import error_reporting
 
 
 def simulate_error():
-    fluent.sender.setup('myapp', host='localhost', port=24224)
-
-    def report(ex):
-        data = {}
-        data['message'] = '{0}'.format(ex)
-        data['serviceContext'] = {'service': 'myapp'}
-        # ... add more metadata
-        fluent.event.Event('errors', data)
-
-    # report exception data using:
+    client = error_reporting.Client()
     try:
         # simulate calling a method that's not defined
         raise NameError
     except Exception:
-        report(traceback.format_exc())
+        client.report_exception()
 # [END error_reporting]
 
 

error_reporting/main_test.py

@@ -17,7 +17,9 @@
 import main
 
 
-@mock.patch("fluent.event")
-def test_error_sends(event_mock):
+@mock.patch("main.error_reporting")
+def test_error_sends(error_reporting_mock):
+    client_mock = mock.Mock()
+    error_reporting_mock.Client.return_value = client_mock
     main.simulate_error()
-    event_mock.Event.assert_called_once_with(mock.ANY, mock.ANY)
+    client_mock.report_exception.assert_called_once()

error_reporting/requirements.txt

@@ -1 +1 @@
-fluent-logger==0.4.4
+google-cloud-error-reporting==0.21.0