Add optional SERVICE_NODE_NAME config

Author: basepi

elasticapm/base.py

@@ -313,6 +313,8 @@ def get_service_info(self):
                 "name": keyword_field(self.config.framework_name),
                 "version": keyword_field(self.config.framework_version),
             }
+        if self.config.service_node_name:
+            result["node"] = {"configured_name": keyword_field(self.config.service_node_name)}
         self._service_info = result
         return result
 

elasticapm/conf/__init__.py

@@ -249,6 +249,7 @@ def errors(self):
 
 class Config(_ConfigBase):
     service_name = _ConfigValue("SERVICE_NAME", validators=[RegexValidator("^[a-zA-Z0-9 _-]+$")], required=True)
+    service_node_name = _ConfigValue("SERVICE_NODE_NAME", default=None)
     environment = _ConfigValue("ENVIRONMENT", default=None)
     secret_token = _ConfigValue("SECRET_TOKEN")
     debug = _BoolConfigValue("DEBUG", default=False)

tests/client/client_tests.py

@@ -61,6 +61,18 @@ def test_service_info(elasticapm_client):
     assert service_info["agent"]["name"] == "python"
 
 
+@pytest.mark.parametrize(
+    "elasticapm_client", [{"environment": "production", "service_node_name": "my_node"}], indirect=True
+)
+def test_service_info_node_name(elasticapm_client):
+    service_info = elasticapm_client.get_service_info()
+    assert service_info["name"] == elasticapm_client.config.service_name
+    assert service_info["environment"] == elasticapm_client.config.environment == "production"
+    assert service_info["language"] == {"name": "python", "version": platform.python_version()}
+    assert service_info["agent"]["name"] == "python"
+    assert service_info["node"]["configured_name"] == "my_node"
+
+
 def test_process_info(elasticapm_client):
     with mock.patch.object(sys, "argv", ["a", "b", "c"]):
         process_info = elasticapm_client.get_process_info()