fix: add osplatform telemetry (aws#8279)

* fix: add osplatform telemetry

* update event test

* update integration test

Author: vicheey

samcli/lib/telemetry/metric.py

@@ -442,6 +442,7 @@ def _add_common_metric_attributes(self):
         self._data["ci"] = bool(self._cicd_detector.platform())
         self._data["pyversion"] = platform.python_version()
         self._data["samcliVersion"] = samcli_version
+        self._data["osPlatform"] = platform.system()
 
         user_agent = get_user_agent_string()
         if user_agent:

tests/integration/telemetry/test_experimental_metric.py

@@ -54,6 +54,7 @@ def test_must_send_experimental_metrics_if_experimental_command(self):
                             "ci": ANY,
                             "pyversion": ANY,
                             "samcliVersion": SAM_CLI_VERSION,
+                            "osPlatform": ANY,
                             "awsProfileProvided": ANY,
                             "debugFlagProvided": ANY,
                             "region": ANY,
@@ -112,6 +113,7 @@ def test_must_send_experimental_metrics_if_experimental_option(self):
                             "ci": ANY,
                             "pyversion": ANY,
                             "samcliVersion": SAM_CLI_VERSION,
+                            "osPlatform": ANY,
                             "awsProfileProvided": ANY,
                             "debugFlagProvided": ANY,
                             "region": ANY,
@@ -180,6 +182,7 @@ def test_must_send_cdk_project_type_metrics(self):
                             "ci": ANY,
                             "pyversion": ANY,
                             "samcliVersion": SAM_CLI_VERSION,
+                            "osPlatform": ANY,
                             "awsProfileProvided": ANY,
                             "debugFlagProvided": ANY,
                             "region": ANY,
@@ -236,6 +239,7 @@ def test_must_send_not_experimental_metrics_if_not_experimental(self):
                             "ci": ANY,
                             "pyversion": ANY,
                             "samcliVersion": SAM_CLI_VERSION,
+                            "osPlatform": ANY,
                             "awsProfileProvided": ANY,
                             "debugFlagProvided": ANY,
                             "region": ANY,

tests/unit/lib/telemetry/test_event.py

@@ -166,6 +166,7 @@ def test_events_get_sent(self, telemetry_mock):
             "ci": ANY,
             "pyversion": ANY,
             "samcliVersion": ANY,
+            "osPlatform": ANY,
             "commandName": ANY,
             "metricSpecificAttributes": {
                 "containerEngine": ANY,

tests/unit/lib/telemetry/test_metric.py

@@ -561,6 +561,7 @@ def test_must_add_common_attributes(
         installation_id = gc_mock.return_value.installation_id = "fake installation id"
         session_id = context_mock.get_current_context.return_value.session_id = "fake installation id"
         python_version = platform_mock.python_version.return_value = "8.8.0"
+        os_platform = platform_mock.system.return_value = "Linux"
         cicd_platform_mock.return_value = cicd_platform
         get_user_agent_mock.return_value = user_agent
 
@@ -575,6 +576,7 @@ def test_must_add_common_attributes(
             assert metric.get_data()["userAgent"] == user_agent
         assert metric.get_data()["pyversion"] == python_version
         assert metric.get_data()["samcliVersion"] == samcli.__version__
+        assert metric.get_data()["osPlatform"] == os_platform
 
 
 def _ignore_common_attributes(data):
@@ -585,6 +587,7 @@ def _ignore_common_attributes(data):
         "executionEnvironment",
         "pyversion",
         "samcliVersion",
+        "osPlatform",
     ]
     for a in common_attrs:
         if a not in data: