Add support for providing host.id via intakeV2. (#246)

* Add support for providing host.id via intakeV2. * Apply suggestions from code review Co-authored-by: Carson Ip <carsonip@users.noreply.github.com> * Regenerate files --------- Co-authored-by: Carson Ip <carsonip@users.noreply.github.com>
elastic · Apr 5, 2024 · 007b3c8 · 007b3c8
1 parent 06071a1
commit 007b3c8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/input/elasticapm/docs/spec/v2/metadata.json b/input/elasticapm/docs/spec/v2/metadata.json
@@ -441,6 +441,14 @@
           ],
           "maxLength": 1024
         },
+        "host_id": {
+          "description": "The OpenTelemetry semantic conventions compliant \"host.id\" attribute, if available.",
+          "type": [
+            "null",
+            "string"
+          ],
+          "maxLength": 1024
+        },
         "hostname": {
           "description": "Deprecated: Use ConfiguredHostname and DetectedHostname instead. DeprecatedHostname is the host name of the system the service is running on. It does not distinguish between configured and detected hostname and therefore is deprecated and only used if no other hostname information is available.",
           "type": [

diff --git a/input/elasticapm/internal/modeldecoder/v2/decoder.go b/input/elasticapm/internal/modeldecoder/v2/decoder.go
@@ -715,6 +715,12 @@ func mapToMetadataModel(from *metadata, out *modelpb.APMEvent) {
 		}
 		out.Host.Hostname = from.System.DetectedHostname.Val
 	}
+	if from.System.HostID.IsSet() {
+		if out.Host == nil {
+			out.Host = modelpb.HostFromVTPool()
+		}
+		out.Host.Id = from.System.HostID.Val
+	}
 	if !from.System.ConfiguredHostname.IsSet() && !from.System.DetectedHostname.IsSet() &&
 		from.System.DeprecatedHostname.IsSet() {
 		if out.Host == nil {

diff --git a/input/elasticapm/internal/modeldecoder/v2/metadata_test.go b/input/elasticapm/internal/modeldecoder/v2/metadata_test.go
@@ -319,9 +319,11 @@ func TestDecodeMapToMetadataModel(t *testing.T) {
 		input.System.ConfiguredHostname.Set("configured-host")
 		input.System.DetectedHostname.Set("detected-host")
 		input.System.DeprecatedHostname.Set("deprecated-host")
+		input.System.HostID.Set("host-id")
 		mapToMetadataModel(&input, &out)
 		assert.Equal(t, "configured-host", out.Host.Name)
 		assert.Equal(t, "detected-host", out.Host.Hostname)
+		assert.Equal(t, "host-id", out.Host.Id)
 		// no detected-host information
 		out = modelpb.APMEvent{}
 		input.System.DetectedHostname.Reset()

diff --git a/input/elasticapm/internal/modeldecoder/v2/model.go b/input/elasticapm/internal/modeldecoder/v2/model.go
@@ -594,6 +594,8 @@ type metadataSystem struct {
 	Kubernetes metadataSystemKubernetes `json:"kubernetes"`
 	// Platform name of the system platform the monitored service is running on.
 	Platform nullable.String `json:"platform" validate:"maxLength=1024"`
+	// The OpenTelemetry semantic conventions compliant "host.id" attribute, if available.
+	HostID nullable.String `json:"host_id" validate:"maxLength=1024"`
 }
 
 type metadataSystemContainer struct {

diff --git a/input/elasticapm/internal/modeldecoder/v2/model_generated.go b/input/elasticapm/internal/modeldecoder/v2/model_generated.go