fix/spans mapper for open telemetry

Author: piotr-szewczyk

.idea/workspace.xml

@@ -5,6 +5,7 @@
 import io.opentelemetry.sdk.metrics.data.*;
 import io.opentelemetry.sdk.trace.data.SpanData;
 
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -30,15 +31,8 @@ public static List<TraceoMetric> mapOpenTelemetryMetricToTraceo(Collection<Metri
 
         for (MetricData metricData : metrics) {
             List<TraceoMetric> points = getPoints(metricData);
-
-            List<TraceoMetric> traceoMetrics = points.stream().map(traceoMetric -> new TraceoMetric(
-                    metricData.getName(),
-                    traceoMetric.getType(),
-                    traceoMetric.getUnixTimestamp(),
-                    traceoMetric.getValue()
-            )).collect(Collectors.toList());
-
-            result.addAll(traceoMetrics);
+            points.forEach((e) -> e.setName(metricData.getName()));
+            result.addAll(points);
         }
 
         return result;

traceo-sdk-opentelemetry/src/main/java/com/traceo/sdk/OpenTelemetryMapper.java

@@ -2,6 +2,7 @@
 
 import io.opentelemetry.sdk.trace.data.SpanData;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -25,9 +26,9 @@ public class TraceoSpan {
 
     private String serviceName;
 
-    private long startEpochNanos;
+    private BigDecimal startEpochNanos;
 
-    private long endEpochNanos;
+    private BigDecimal endEpochNanos;
 
     private Map<String, String> attributes = new HashMap<>();
 
@@ -38,15 +39,26 @@ public TraceoSpan() {}
     public TraceoSpan(SpanData otelSpan) {
         this.spanId = otelSpan.getSpanId();
         this.traceId = otelSpan.getTraceId();
-        this.parentSpanId = otelSpan.getParentSpanId();
+
+        if (!otelSpan.getParentSpanId().equals("0000000000000000")) {
+            this.parentSpanId = otelSpan.getParentSpanId();
+        }
+
         this.name = otelSpan.getName();
         this.kind = otelSpan.getKind().name();
-        this.startEpochNanos = otelSpan.getStartEpochNanos();
-        this.endEpochNanos = otelSpan.getEndEpochNanos();
+        this.startEpochNanos = parseLongToBigDecimal(otelSpan.getStartEpochNanos());
+        this.endEpochNanos = parseLongToBigDecimal(otelSpan.getEndEpochNanos());
         this.status = otelSpan.getStatus().getStatusCode().name();
         this.statusMessage = otelSpan.getStatus().getDescription();
     }
 
+    private BigDecimal parseLongToBigDecimal(long epochNanos) {
+        BigDecimal originalValue = new BigDecimal(epochNanos);
+        BigDecimal divisor = new BigDecimal("1e9");
+
+        return originalValue.divide(divisor);
+    }
+
     public String getName() {
         return name;
     }
@@ -111,19 +123,19 @@ public void setServiceName(String serviceName) {
         this.serviceName = serviceName;
     }
 
-    public long getStartEpochNanos() {
+    public BigDecimal getStartEpochNanos() {
         return startEpochNanos;
     }
 
-    public void setStartEpochNanos(long startEpochNanos) {
+    public void setStartEpochNanos(BigDecimal startEpochNanos) {
         this.startEpochNanos = startEpochNanos;
     }
 
-    public long getEndEpochNanos() {
+    public BigDecimal getEndEpochNanos() {
         return endEpochNanos;
     }
 
-    public void setEndEpochNanos(long endEpochNanos) {
+    public void setEndEpochNanos(BigDecimal endEpochNanos) {
         this.endEpochNanos = endEpochNanos;
     }
 

traceo-sdk-opentelemetry/src/main/java/com/traceo/sdk/TraceoSpan.java

@@ -36,7 +36,7 @@ public class TraceoMetricsExporterTest extends TestCase {
     @Before
     public  void setUp() {
         ClientOptions clientOptions = NoOpClientBuilder.standard()
-                .withApiKey("xxx")
+                .withApiKey("tr_5d1c3709-119f-4fb9-b930-3e5b3a88cac7")
                 .withHost("https://webhook.site/488164a0-5467-4621-9212-2974cc3eebc7")
                 .build();
 
@@ -78,10 +78,10 @@ public void testOtelMetrics() {
         measurement.record(123);
         counter.add(1);
         counter.add(1);
-        counter.add(1);
+        counter.add(13);
 
         try {
-            Thread.sleep(2000); // Adjust the duration based on your exporter's flushing interval
+            Thread.sleep(2000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -92,46 +92,37 @@ public void testOtelSpans() throws InterruptedException {
         Span parentSpan = tracer.spanBuilder("parent-span").startSpan();
 
         try {
-            // Simulate some work in the parent span
             parentSpan
                     .addEvent("Parent span event 1")
                     .setAttribute("atrybut eventu", "hahahah");
 
-            // Start a child span within the parent span
             Span childSpan1 = tracer
                     .spanBuilder("child-span-1")
                     .addLink(parentSpan.getSpanContext())
                     .setAttribute("jakiś atrybut", "co to za atrybut?")
                     .startSpan();
 
             try {
-                // Simulate some work in the child span
                 childSpan1.addEvent("Child span 1 event 1", Attributes.of(AttributeKey.stringKey("AttributeKey"), "stringKey"));
             } finally {
-                // End the child span
                 childSpan1.end();
             }
 
-            // Start another child span within the parent span
             Span childSpan2 = tracer
                     .spanBuilder("child-span-2")
                     .addLink(parentSpan.getSpanContext())
                     .startSpan();
 
             try {
-                // Simulate some work in the child span
                 childSpan2.addEvent("Child span 2 event 1");
             } finally {
-                // End the child span
                 childSpan2.end();
             }
         } finally {
-            // End the parent span
             parentSpan.end();
-
-            Thread.sleep(5000); // Adjust the duration based on your exporter's flushing interval
-
         }
+
+        Thread.sleep(5000);
     }
 
     @After