Modified to use camel case for names. Also added severity in Log

kkondaka · kkondaka · commit 8aad4502534d · 2025-03-07T22:09:34.000Z
Signed-off-by: Krishna Kondaka &lt;krishkdk@amazon.com&gt;
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonOtelLog.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonOtelLog.java
@@ -35,6 +35,9 @@ public class JacksonOtelLog extends JacksonEvent implements OpenTelemetryLog {
     protected static final String BODY_KEY = "body";
     protected static final String SPAN_ID_KEY = "spanId";
     protected static final String TRACE_ID_KEY = "traceId";
+    protected static final String SEVERITY_KEY = "severity";
+    protected static final String NUMBER_KEY = "number";
+    protected static final String TEXT_KEY = "text";
     protected static final String SEVERITY_NUMBER_KEY = "severityNumber";
     protected static final String SEVERITY_TEXT_KEY = "severityText";
     protected static final String DROPPED_ATTRIBUTES_COUNT_KEY = "droppedAttributesCount";
@@ -86,6 +89,11 @@ public String getTraceId() {
         return this.get(TRACE_ID_KEY, String.class);
     }
 
+    @Override
+    public Map<String, Object> getSeverity() {
+        return Map.of(SEVERITY_KEY, Map.of(TEXT_KEY, getSeverityText(), NUMBER_KEY, getSeverityNumber()));
+    }
+
     @Override
     public Integer getSeverityNumber() {
         return this.get(SEVERITY_NUMBER_KEY, Integer.class);
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonStandardOTelLog.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/JacksonStandardOTelLog.java
@@ -21,20 +21,23 @@
  */
 public class JacksonStandardOTelLog extends JacksonEvent implements OpenTelemetryLog {
 
-    protected static final String OBSERVED_TIME_KEY = "observed_time";
+    protected static final String OBSERVED_TIME_KEY = "observedTimeStamp";
     protected static final String SCOPE_KEY = "scope";
     protected static final String RESOURCE_KEY = "resource";
     protected static final String TIME_KEY = "time";
-    protected static final String SERVICE_NAME_KEY = "service_name";
+    protected static final String SERVICE_NAME_KEY = "serviceName";
     protected static final String ATTRIBUTES_KEY = "attributes";
-    protected static final String SCHEMA_URL_KEY = "schema_url";
+    protected static final String SCHEMA_URL_KEY = "schemaUrl";
     protected static final String FLAGS_KEY = "flags";
     protected static final String BODY_KEY = "body";
-    protected static final String SPAN_ID_KEY = "span_id";
-    protected static final String TRACE_ID_KEY = "trace_id";
-    protected static final String SEVERITY_NUMBER_KEY = "severity_number";
-    protected static final String SEVERITY_TEXT_KEY = "severity_text";
-    protected static final String DROPPED_ATTRIBUTES_COUNT_KEY = "dropped_attributes_count";
+    protected static final String SPAN_ID_KEY = "spanId";
+    protected static final String TRACE_ID_KEY = "traceId";
+    protected static final String SEVERITY_KEY = "severity";
+    protected static final String NUMBER_KEY = "number";
+    protected static final String TEXT_KEY = "text";
+    protected static final String SEVERITY_NUMBER_KEY = "severityNumber";
+    protected static final String SEVERITY_TEXT_KEY = "severityText";
+    protected static final String DROPPED_ATTRIBUTES_COUNT_KEY = "droppedAttributesCount";
 
 
     protected JacksonStandardOTelLog(final JacksonStandardOTelLog.Builder builder) {
@@ -73,6 +76,11 @@ public Integer getFlags() {
         return this.get(FLAGS_KEY, Integer.class);
     }
 
+    @Override
+    public Map<String, Object> getSeverity() {
+        return Map.of(SEVERITY_KEY, Map.of(TEXT_KEY, getSeverityText(), NUMBER_KEY, getSeverityNumber()));
+    }
+
     @Override
     public String getSpanId() {
         return this.get(SPAN_ID_KEY, String.class);
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/OpenTelemetryLog.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/log/OpenTelemetryLog.java
@@ -96,6 +96,12 @@ public interface OpenTelemetryLog extends Log {
      */
     String getSeverityText();
 
+    /**
+     * Gets the severity text and number of this log event.
+     * @return the severity number encoded as Integer
+     * @since 2.11
+     */
+    Map<String, Object> getSeverity();
 
     /**
      * Gets the dropped attributes count of this log event.
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardExponentialHistogram.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardExponentialHistogram.java
@@ -23,19 +23,18 @@
 public class JacksonStandardExponentialHistogram extends JacksonStandardMetric implements ExponentialHistogram {
 
     private static final String SCALE_KEY = "scale";
-    private static final String ZERO_COUNT_KEY = "zero_count";
-    public static final String POSITIVE_BUCKETS_KEY = "positive_buckets";
-    public static final String NEGATIVE_BUCKETS_KEY = "negative_buckets";
+    private static final String ZERO_COUNT_KEY = "zeroCount";
+    public static final String POSITIVE_BUCKETS_KEY = "positiveBuckets";
+    public static final String NEGATIVE_BUCKETS_KEY = "negativeBuckets";
     private static final String NEGATIVE_KEY = "negative";
     private static final String POSITIVE_KEY = "positive";
-    private static final String NEGATIVE_OFFSET_KEY = "negative_offset";
-    private static final String POSITIVE_OFFSET_KEY = "positive_offset";
+    private static final String NEGATIVE_OFFSET_KEY = "negativeOffset";
+    private static final String POSITIVE_OFFSET_KEY = "positiveOffset";
 
     private static final List<String> REQUIRED_KEYS = new ArrayList<>();
     private static final List<String> REQUIRED_NON_EMPTY_KEYS = Arrays.asList(NAME_KEY, KIND_KEY, TIME_KEY);
     private static final List<String> REQUIRED_NON_NULL_KEYS = Collections.singletonList(SUM_KEY);
 
-
     protected JacksonStandardExponentialHistogram(JacksonStandardExponentialHistogram.Builder builder) {
         super(builder);
 
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardHistogram.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardHistogram.java
@@ -24,11 +24,11 @@ public class JacksonStandardHistogram extends JacksonStandardMetric implements H
 
     private static final String MAX_KEY = "max";
     private static final String MIN_KEY = "min";
-    private static final String BUCKET_COUNTS_KEY = "bucket_counts";
-    private static final String EXPLICIT_BOUNDS_COUNT_KEY = "explicit_bounds_count";
+    private static final String BUCKET_COUNTS_KEY = "bucketCounts";
+    private static final String EXPLICIT_BOUNDS_COUNT_KEY = "explicitBoundsCount";
     public static final String BUCKETS_KEY = "buckets";
-    private static final String BUCKET_COUNTS_LIST_KEY = "bucket_counts_list";
-    private static final String EXPLICIT_BOUNDS_KEY = "explicit_bounds";
+    private static final String BUCKET_COUNTS_LIST_KEY = "bucketCountsList";
+    private static final String EXPLICIT_BOUNDS_KEY = "explicitBounds";
 
     private static final List<String> REQUIRED_KEYS = new ArrayList<>();
     private static final List<String> REQUIRED_NON_EMPTY_KEYS = Arrays.asList(NAME_KEY, KIND_KEY, TIME_KEY);
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardMetric.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardMetric.java
@@ -24,17 +24,17 @@ public abstract class JacksonStandardMetric extends JacksonEvent implements Metr
     protected static final String SCOPE_KEY = "scope";
     protected static final String RESOURCE_KEY = "resource";
     protected static final String DESCRIPTION_KEY = "description";
-    protected static final String START_TIME_KEY = "start_time";
+    protected static final String START_TIME_KEY = "startTime";
     protected static final String TIME_KEY = "time";
-    protected static final String SERVICE_NAME_KEY = "service_name";
+    protected static final String SERVICE_NAME_KEY = "serviceName";
     protected static final String KIND_KEY = "kind";
     protected static final String UNIT_KEY = "unit";
     protected static final String SUM_KEY = "sum";
     protected static final String VALUE_KEY = "value";
-    protected static final String AGGREGATION_TEMPORALITY_KEY = "aggregation_temporality";
+    protected static final String AGGREGATION_TEMPORALITY_KEY = "aggregationTemporality";
     protected static final String COUNT_KEY = "count";
     public static final String ATTRIBUTES_KEY = "attributes";
-    protected static final String SCHEMA_URL_KEY = "schema_url";
+    protected static final String SCHEMA_URL_KEY = "schemaUrl";
     protected static final String EXEMPLARS_KEY = "exemplars";
     protected static final String FLAGS_KEY = "flags";
 
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardSum.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardSum.java
@@ -21,7 +21,7 @@
  */
 public class JacksonStandardSum extends JacksonStandardMetric implements Sum {
 
-    private static final String IS_MONOTONIC_KEY = "is_monotonic";
+    private static final String IS_MONOTONIC_KEY = "isMonotonic";
 
     private static final List<String> REQUIRED_KEYS = new ArrayList<>();
     private static final List<String> REQUIRED_NON_EMPTY_KEYS = Arrays.asList(NAME_KEY, KIND_KEY, TIME_KEY);
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardSummary.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/metric/JacksonStandardSummary.java
@@ -22,7 +22,7 @@
 public class JacksonStandardSummary extends JacksonStandardMetric implements Summary {
 
     private static final String QUANTILES_KEY = "quantiles";
-    private static final String QUANTILE_VALUES_COUNT_KEY = "quantile_values_count";
+    private static final String QUANTILE_VALUES_COUNT_KEY = "quantileValuesCount";
 
     private static final List<String> REQUIRED_KEYS = Collections.singletonList(ATTRIBUTES_KEY);
     private static final List<String> REQUIRED_NON_EMPTY_KEYS = Arrays.asList(NAME_KEY, KIND_KEY, TIME_KEY);
diff --git a/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/JacksonStandardSpan.java b/data-prepper-api/src/main/java/org/opensearch/dataprepper/model/trace/JacksonStandardSpan.java
@@ -31,24 +31,24 @@ public class JacksonStandardSpan extends JacksonEvent implements Span {
     private static final String STATUS_KEY = "status";
     private static final String SCOPE_KEY = "scope";
     private static final String RESOURCE_KEY = "resource";
-    private static final String TRACE_ID_KEY = "trace_id";
-    private static final String SPAN_ID_KEY = "span_id";
-    private static final String TRACE_STATE_KEY = "trace_state";
-    private static final String PARENT_SPAN_ID_KEY = "parent_span_id";
+    private static final String TRACE_ID_KEY = "traceId";
+    private static final String SPAN_ID_KEY = "spanId";
+    private static final String TRACE_STATE_KEY = "traceState";
+    private static final String PARENT_SPAN_ID_KEY = "parentSpanId";
     private static final String NAME_KEY = "name";
     private static final String KIND_KEY = "kind";
-    private static final String START_TIME_KEY = "start_time";
-    private static final String END_TIME_KEY = "end_time";
+    private static final String START_TIME_KEY = "startTime";
+    private static final String END_TIME_KEY = "endTime";
     private static final String ATTRIBUTES_KEY = "attributes";
-    private static final String DROPPED_ATTRIBUTES_COUNT_KEY = "dropped_attributes_count";
+    private static final String DROPPED_ATTRIBUTES_COUNT_KEY = "droppedAttributesCount";
     private static final String EVENTS_KEY = "events";
-    private static final String DROPPED_EVENTS_COUNT_KEY = "dropped_events_count";
+    private static final String DROPPED_EVENTS_COUNT_KEY = "droppedEventsCount";
     private static final String LINKS_KEY = "links";
-    private static final String DROPPED_LINKS_COUNT_KEY = "dropped_links_count";
-    private static final String SERVICE_NAME_KEY = "service_name";
-    private static final String TRACE_GROUP_KEY = "trace_group";
-    private static final String DURATION_IN_NANOS_KEY = "duration_in_nanos";
-    private static final String TRACE_GROUP_FIELDS_KEY = "trace_group_fields";
+    private static final String DROPPED_LINKS_COUNT_KEY = "droppedLinksCount";
+    private static final String SERVICE_NAME_KEY = "serviceName";
+    private static final String TRACE_GROUP_KEY = "traceGroup";
+    private static final String DURATION_IN_NANOS_KEY = "durationInNanos";
+    private static final String TRACE_GROUP_FIELDS_KEY = "traceGroupFields";
 
     private static final List<String> REQUIRED_KEYS = Arrays.asList(TRACE_GROUP_KEY);
     private static final List<String>
diff --git a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonOtelLogTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonOtelLogTest.java
@@ -135,6 +135,12 @@ public void testGetServerityNumber() {
         assertThat(observedTime, is(equalTo(TEST_SEVERITY_NUMBER)));
     }
 
+    @Test
+    public void testGetSeverity() {
+        final Map<String, Object> severity = log.getSeverity();
+        assertThat(severity.get("severity"), is(equalTo(Map.of("number", TEST_SEVERITY_NUMBER, "text", TEST_SEVERITY_TEXT))));
+    }
+
     @Test
     public void testGetDroppedAttributesCount() {
         final Integer droppedAttributesCount = log.getDroppedAttributesCount();
diff --git a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonStandardOTelLogTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/log/JacksonStandardOTelLogTest.java
@@ -128,8 +128,14 @@ public void testGetServerityText() {
 
     @Test
     public void testGetServerityNumber() {
-        final Integer observedTime = log.getSeverityNumber();
-        assertThat(observedTime, is(equalTo(TEST_SEVERITY_NUMBER)));
+        final Integer severityNumber = log.getSeverityNumber();
+        assertThat(severityNumber, is(equalTo(TEST_SEVERITY_NUMBER)));
+    }
+
+    @Test
+    public void testGetSeverity() {
+        final Map<String, Object> severity = log.getSeverity();
+        assertThat(severity.get("severity"), is(equalTo(Map.of("number", TEST_SEVERITY_NUMBER, "text", TEST_SEVERITY_TEXT))));
     }
 
     @Test
diff --git a/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/JacksonStandardSpanTest.java b/data-prepper-api/src/test/java/org/opensearch/dataprepper/model/trace/JacksonStandardSpanTest.java
@@ -395,26 +395,26 @@ class JacksonStandardSpanBuilder {
         @Test
         void testWithJsonData_with_valid_json_data() {
             final String data = "{\n" +
-                    "  \"trace_id\": \"414243\",\n" +
-                    "  \"dropped_links_count\": 0,\n" +
+                    "  \"traceId\": \"414243\",\n" +
+                    "  \"droppedLinksCount\": 0,\n" +
                     "  \"kind\": \"SPAN_KIND_INTERNAL\",\n" +
-                    "  \"dropped_events_count\": 0,\n" +
-                    "  \"trace_group_fields\": {\n" +
-                    "    \"end_time\": \"1970-01-01T00:00:00Z\",\n" +
-                    "    \"duration_in_nanos\": 0,\n" +
-                    "    \"status_code\": 0\n" +
+                    "  \"droppedEventsCount\": 0,\n" +
+                    "  \"traceGroupFields\": {\n" +
+                    "    \"endTime\": \"1970-01-01T00:00:00Z\",\n" +
+                    "    \"durationInNanos\": 0,\n" +
+                    "    \"statusCode\": 0\n" +
                     "  },\n" +
-                    "  \"trace_group\": \"FRUITS\",\n" +
-                    "  \"service_name\": \"ServiceA\",\n" +
-                    "  \"parent_span_id\": \"\",\n" +
-                    "  \"span_id\": \"313030\",\n" +
-                    "  \"trace_state\": \"\",\n" +
+                    "  \"traceGroup\": \"FRUITS\",\n" +
+                    "  \"serviceName\": \"ServiceA\",\n" +
+                    "  \"parentSpanId\": \"\",\n" +
+                    "  \"spanId\": \"313030\",\n" +
+                    "  \"traceState\": \"\",\n" +
                     "  \"name\": \"FRUITS\",\n" +
-                    "  \"start_time\": \"1970-01-01T00:00:00Z\",\n" +
+                    "  \"startTime\": \"1970-01-01T00:00:00Z\",\n" +
                     "  \"links\": [],\n" +
-                    "  \"end_time\": \"1970-01-01T00:00:00Z\",\n" +
-                    "  \"dropped_attributes_count\": 0,\n" +
-                    "  \"duration_in_nanos\": 0,\n" +
+                    "  \"endTime\": \"1970-01-01T00:00:00Z\",\n" +
+                    "  \"droppedAttributesCount\": 0,\n" +
+                    "  \"durationInNanos\": 0,\n" +
                     "  \" events\": [],\n" +
                     "  \"status.code\": 0\n" +
                     "}";
@@ -433,19 +433,19 @@ void testWithJsonData_with_valid_json_data() {
         @Test
         void testBuilder_withEventMetadata_with_event_metadata_with_valid_metadata() {
             final String data = "{\n" +
-                    "  \"trace_id\": \"414243\",\n" +
+                    "  \"traceId\": \"414243\",\n" +
                     "  \"kind\": \"SPAN_KIND_INTERNAL\",\n" +
-                    "  \"trace_group_fields\": {\n" +
-                    "    \"end_time\": \"1970-01-01T00:00:00Z\",\n" +
-                    "    \"duration_in_nanos\": 0,\n" +
-                    "    \"status_code\": 0\n" +
+                    "  \"traceGroupFields\": {\n" +
+                    "    \"endTime\": \"1970-01-01T00:00:00Z\",\n" +
+                    "    \"durationInNanos\": 0,\n" +
+                    "    \"statusCode\": 0\n" +
                     "  },\n" +
-                    "  \"trace_group\": \"FRUITS\",\n" +
-                    "  \"span_id\": \"313030\",\n" +
+                    "  \"traceGroup\": \"FRUITS\",\n" +
+                    "  \"spanId\": \"313030\",\n" +
                     "  \"name\": \"FRUITS\",\n" +
-                    "  \"start_time\": \"1970-01-01T00:00:00Z\",\n" +
-                    "  \"end_time\": \"1970-01-01T00:00:00Z\",\n" +
-                    "  \"duration_in_nanos\": 0" +
+                    "  \"startTime\": \"1970-01-01T00:00:00Z\",\n" +
+                    "  \"endTime\": \"1970-01-01T00:00:00Z\",\n" +
+                    "  \"durationInNanos\": 0" +
                     "}";
 
             EventMetadata eventMetadata = mock(EventMetadata.class);
@@ -465,33 +465,33 @@ void testBuilder_withEventMetadata_with_event_metadata_with_valid_metadata() {
 
         @Test
         void testBuilder_withJsonData_with_invalid_json_data_should_throw() {
-            String invalidJsonData = "{\"trace_id\": \"FRUITS}";
+            String invalidJsonData = "{\"traceId\": \"FRUITS}";
             final JacksonStandardSpan.Builder builder = JacksonStandardSpan.builder();
 
             assertThrows(RuntimeException.class, () -> builder.withJsonData(invalidJsonData));
         }
 
         @Test
         void testBuilder_withData_with_event_valid_data() {
-	    final Map<String, Object> data = new HashMap<String, Object>();
-	    final String traceId = "414243";
-	    final String kind = "SPAN_KIND_INTERNAL";
-	    final String traceGroup = "FRUITSGroup";
-	    final String traceGroupFields = "{\"end_time\":\"1970-01-01T00:00:00Z\",\"duration_in_nanos\": 0,\"status_code\": 0}";
-	    final String spanId = "313030";
-	    final String name = "FRUITS";
-	    final String startTime = "1970-01-01T00:00:00Z";
-	    final String endTime = "1970-01-02T00:00:00Z";
-	    final String durationInNanos = "100";
-	    data.put("trace_id", traceId);
-	    data.put("kind", kind);
-	    data.put("trace_group", traceGroup);
-	    data.put("trace_group_fields", traceGroupFields);
-	    data.put("span_id", spanId);
-	    data.put("name", name);
-	    data.put("start_time", startTime);
-	    data.put("end_time", endTime);
-	    data.put("duration_in_nanos", durationInNanos);
+            final Map<String, Object> data = new HashMap<String, Object>();
+            final String traceId = "414243";
+            final String kind = "SPAN_KIND_INTERNAL";
+            final String traceGroup = "FRUITSGroup";
+            final String traceGroupFields = "{\"endTime\":\"1970-01-01T00:00:00Z\",\"durationInNanos\": 0,\"statusCode\": 0}";
+            final String spanId = "313030";
+            final String name = "FRUITS";
+            final String startTime = "1970-01-01T00:00:00Z";
+            final String endTime = "1970-01-02T00:00:00Z";
+            final String durationInNanos = "100";
+            data.put("traceId", traceId);
+            data.put("kind", kind);
+            data.put("traceGroup", traceGroup);
+            data.put("traceGroupFields", traceGroupFields);
+            data.put("spanId", spanId);
+            data.put("name", name);
+            data.put("startTime", startTime);
+            data.put("endTime", endTime);
+            data.put("durationInNanos", durationInNanos);
 
             EventMetadata eventMetadata = mock(EventMetadata.class);
             final Instant now = Instant.now();
@@ -507,14 +507,14 @@ void testBuilder_withData_with_event_valid_data() {
             assertThat(jacksonSpan, is(notNullValue()));
             assertThat(jacksonSpan.getMetadata(), is(notNullValue()));
             assertThat(jacksonSpan.getMetadata().getTimeReceived(), equalTo(now));
-            assertThat(jacksonSpan.toMap().get("trace_id"), equalTo(traceId));
+            assertThat(jacksonSpan.toMap().get("traceId"), equalTo(traceId));
             assertThat(jacksonSpan.toMap().get("kind"), equalTo(kind));
-            assertThat(jacksonSpan.toMap().get("trace_group"), equalTo(traceGroup));
-            assertThat(jacksonSpan.toMap().get("span_id"), equalTo(spanId));
+            assertThat(jacksonSpan.toMap().get("traceGroup"), equalTo(traceGroup));
+            assertThat(jacksonSpan.toMap().get("spanId"), equalTo(spanId));
             assertThat(jacksonSpan.toMap().get("name"), equalTo(name));
-            assertThat(jacksonSpan.toMap().get("start_time"), equalTo(startTime));
-            assertThat(jacksonSpan.toMap().get("end_time"), equalTo(endTime));
-            assertThat(jacksonSpan.toMap().get("duration_in_nanos"), equalTo(durationInNanos));
+            assertThat(jacksonSpan.toMap().get("startTime"), equalTo(startTime));
+            assertThat(jacksonSpan.toMap().get("endTime"), equalTo(endTime));
+            assertThat(jacksonSpan.toMap().get("durationInNanos"), equalTo(durationInNanos));
         }
     }
 
