Bug 1341566 Regenerate protobuf classes

Also adds documentation on how to regenerate the classes in the future.

Author: jklukas

README.md

@@ -22,6 +22,20 @@ bin/update_parser_scripts
 ```
 Note that this file was formerly called histogram_tools.py and was renamed in Bug 1419761.
 
+## Updating message_pb2.py
+
+`moztelemetry/heka/message_pb2.py` is generated from
+[mozilla-services/heka](https://github.com/mozilla-services/heka/blob/dev/message/message.proto).
+To regenerate it, you'll need to install a `protobuf` package for your system.
+To avoid installing go-specific extensions, remove the `gogo.proto` import
+and the `gogoproto` options and then run `protoc`:
+
+```
+git clone https://github.com/mozilla-services/heka
+mkdir pythonfiles/
+protoc -I heka/message --python_out pythonfiles/ heka/message/message.proto
+```
+
 ## Testing locally
 
 To test/debug this package locally, you can run exactly the job that

moztelemetry/heka/message_parser.py

@@ -13,6 +13,7 @@
 from io import BytesIO
 from google.protobuf.message import DecodeError
 
+# See instructions in the README for how to regenerate these classes.
 from .message_pb2 import Message, Header
 
 

moztelemetry/heka/message_pb2.py

@@ -18,7 +18,8 @@
     url='https://github.com/mozilla/python_moztelemetry',
     packages=find_packages(),
     package_dir={'moztelemetry': 'moztelemetry'},
-    install_requires=['boto', 'boto3', 'ujson', 'requests', 'protobuf', 'six',
+    install_requires=['boto', 'boto3', 'ujson', 'requests',
+                      'protobuf>=3.6.0', 'six',
                       'expiringdict', "functools32;python_version<'3'", 'py4j',
                       'pandas>=0.19.2', 'numpy>=1.8.2',
                       'PyYAML', 'python-snappy'],