Use python -m pip instead of pip

platformio/__main__.py

@@ -117,7 +117,7 @@ def main(argv=None):
 An unexpected error occurred. Further steps:
 
 * Verify that you have the latest version of PlatformIO using
-  `pip install -U platformio` command
+  `python -m pip install -U platformio` command
 
 * Try to find answer in FAQ Troubleshooting section
   https://docs.platformio.org/page/faq/index.html

platformio/maintenance.py

@@ -229,7 +229,7 @@ def check_platformio_upgrade():
     else:
         click.secho("platformio upgrade", fg="cyan", nl=False)
         click.secho("` or `", fg="yellow", nl=False)
-        click.secho("pip install -U platformio", fg="cyan", nl=False)
+        click.secho("python -m pip install -U platformio", fg="cyan", nl=False)
         click.secho("` command.", fg="yellow")
     click.secho("Changes: ", fg="yellow", nl=False)
     click.secho("https://docs.platformio.org/en/latest/history.html", fg="cyan")

platformio/telemetry.py

@@ -67,6 +67,7 @@ class MeasurementProtocol:
     def to_payload(self):
         return {
             "client_id": self.client_id,
+            "user_id": f"cid:{self.client_id}",
             "non_personalized_ads": True,
             "user_properties": self._user_properties,
             "events": self._events,