Map system.filesystem.mount_point from otel-lib to ES (#313)

elastic · Jul 5, 2024 · 5179047 · 5179047
1 parent 74da991
commit 5179047
Show file tree

Hide file tree

Showing 12 changed files with 408 additions and 34 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/elastic/apm-data
 go 1.21.1
 
 require (
-	github.com/elastic/opentelemetry-lib v0.6.1
+	github.com/elastic/opentelemetry-lib v0.7.0
 	github.com/google/go-cmp v0.6.0
 	github.com/jaegertracing/jaeger v1.58.1
 	github.com/json-iterator/go v1.1.12

diff --git a/go.sum b/go.sum
@@ -11,8 +11,8 @@ github.com/elastic/go-sysinfo v1.7.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6
 github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU=
 github.com/elastic/go-windows v1.0.1 h1:AlYZOldA+UJ0/2nBuqWdo90GFCgG9xuyw9SYzGUtJm0=
 github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss=
-github.com/elastic/opentelemetry-lib v0.6.1 h1:Ayx82UH+oXF2222wmKTcRcq0todI6btpd8KF1tz1ZQ8=
-github.com/elastic/opentelemetry-lib v0.6.1/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg=
+github.com/elastic/opentelemetry-lib v0.7.0 h1:sarbwqZJ9sx+B1zUl6qmf93/j7ggDAidc5CYKsIsQQk=
+github.com/elastic/opentelemetry-lib v0.7.0/go.mod h1:/kKvHbJLVo/NcKMPHI8/RZKL64fushmnRUzn+arQpjg=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

diff --git a/input/elasticapm/internal/modeldecoder/v2/metadata_test.go b/input/elasticapm/internal/modeldecoder/v2/metadata_test.go
@@ -175,7 +175,9 @@ func isUnmappedMetadataField(key string) bool {
 		"system.process",
 		"system.process.state",
 		"system.process.cmdline",
-		"system.process.cpu.start_time":
+		"system.process.cpu.start_time",
+		"system.filesystem",
+		"system.filesystem.mount_point":
 		return true
 	}
 	return false

diff --git a/input/otlp/metrics.go b/input/otlp/metrics.go
@@ -227,6 +227,14 @@ func (c *Consumer) handleScopeMetrics(
 						event.System.Process = modelpb.SystemProcessFromVTPool()
 					}
 					event.System.Process.State = v.Str()
+				case "system.filesystem.mount_point":
+					if event.System == nil {
+						event.System = modelpb.SystemFromVTPool()
+					}
+					if event.System.Filesystem == nil {
+						event.System.Filesystem = modelpb.SystemFilesystemFromVTPool()
+					}
+					event.System.Filesystem.MountPoint = truncate(v.Str())
 				case "event.dataset":
 					if event.Event == nil {
 						event.Event = modelpb.EventFromVTPool()

diff --git a/input/otlp/metrics_test.go b/input/otlp/metrics_test.go
@@ -923,6 +923,9 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
 							},
 						},
 					},
+					Event: &modelpb.Event{
+						Dataset: "system.load",
+					},
 					Labels: map[string]*modelpb.LabelValue{
 						"otel_remapped": &modelpb.LabelValue{Value: "true"},
 					},
@@ -1058,6 +1061,9 @@ func TestConsumeMetricsWithOTelRemapper(t *testing.T) {
 					Labels: map[string]*modelpb.LabelValue{
 						"otel_remapped": &modelpb.LabelValue{Value: "true"},
 					},
+					Event: &modelpb.Event{
+						Dataset: "system.process",
+					},
 				},
 			},
 		},

diff --git a/model/modeljson/internal/marshal_fastjson.go b/model/modeljson/internal/marshal_fastjson.go
diff --git a/model/modeljson/internal/system.go b/model/modeljson/internal/system.go
@@ -18,7 +18,8 @@
 package modeljson
 
 type System struct {
-	Process SystemProcess `json:"process,omitempty"`
+	Process    SystemProcess    `json:"process,omitempty"`
+	Filesystem SystemFilesystem `json:"filesystem,omitempty"`
 }
 
 type SystemProcess struct {
@@ -38,3 +39,11 @@ type SystemProcessCPU struct {
 func (p *SystemProcessCPU) isZero() bool {
 	return p == nil || p.StartTime == ""
 }
+
+type SystemFilesystem struct {
+	MountPoint string `json:"mount_point,omitempty"`
+}
+
+func (f *SystemFilesystem) isZero() bool {
+	return f == nil || f.MountPoint == ""
+}
diff --git a/model/modeljson/system.pb.json.go b/model/modeljson/system.pb.json.go
@@ -35,4 +35,9 @@ func SystemModelJSON(s *modelpb.System, out *modeljson.System) {
 			}
 		}
 	}
+	if s.Filesystem != nil {
+		out.Filesystem = modeljson.SystemFilesystem{
+			MountPoint: s.Filesystem.MountPoint,
+		}
+	}
 }
diff --git a/model/modeljson/system.pb.json_test.go b/model/modeljson/system.pb.json_test.go
@@ -46,6 +46,9 @@ func TestSystemToModelJSON(t *testing.T) {
 						StartTime: ts.Format(time.RFC3339),
 					},
 				},
+				Filesystem: &modelpb.SystemFilesystem{
+					MountPoint: "fsmountpoint",
+				},
 			},
 			expected: &modeljson.System{
 				Process: modeljson.SystemProcess{
@@ -55,6 +58,9 @@ func TestSystemToModelJSON(t *testing.T) {
 						StartTime: ts.Format(time.RFC3339),
 					},
 				},
+				Filesystem: modeljson.SystemFilesystem{
+					MountPoint: "fsmountpoint",
+				},
 			},
 		},
 	}

diff --git a/model/modelpb/system.pb.go b/model/modelpb/system.pb.go