Lenient span hierarchy

moosetechnology · Oct 28, 2024 · d0866be · d0866be
1 parent e0712fc
commit d0866be
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/Famix-OpenTelemetry-Importer/OTelQuery.class.st b/src/Famix-OpenTelemetry-Importer/OTelQuery.class.st
@@ -31,7 +31,8 @@ OTelQuery >> removeSpan: span [
 	span trace: nil.
 	span context: nil.
 	parent := span parent.
-	span children do: [ :child | child parent: parent ].
+	span children do: [ :child |
+		child ifNotNil: [ child parent: parent ] ].
 	span parent: nil.
 	span mooseModel remove: span
 ]

diff --git a/src/Famix-OpenTelemetry-Importer/OTelTopNQuery.class.st b/src/Famix-OpenTelemetry-Importer/OTelTopNQuery.class.st
@@ -0,0 +1,9 @@
+Class {
+	#name : 'OTelTopNQuery',
+	#superclass : 'OTelQuery',
+	#instVars : [
+		'count'
+	],
+	#category : 'Famix-OpenTelemetry-Importer',
+	#package : 'Famix-OpenTelemetry-Importer'
+}
diff --git a/src/Famix-OpenTelemetry-Importer/OTelZipkinLoader.class.st b/src/Famix-OpenTelemetry-Importer/OTelZipkinLoader.class.st
@@ -52,9 +52,8 @@ OTelZipkinLoader >> loadSpan: rawSpan [
 		        tags: (rawSpan at: 'tags');
 		        timestamp: (rawSpan at: 'timestamp');
 		        duration: (rawSpan at: 'duration').
-	rawSpan
-		at: 'parentId'
-		ifPresent: [ :pid | span parent: (entityDict at: pid) ].
+	rawSpan at: 'parentId' ifPresent: [ :pid |
+		entityDict at: pid ifPresent: [ :parent | span parent: parent ] ].
 	^ entityDict at: span id put: span
 ]