restructure: moved otel module from handlers to src

Author: nikhilsinhaparseable

src/handlers/http/ingest.rs

@@ -18,9 +18,6 @@
 
 use super::logstream::error::{CreateStreamError, StreamError};
 use super::modal::utils::ingest_utils::{flatten_and_push_logs, push_logs};
-use super::otel::logs::flatten_otel_logs;
-use super::otel::metrics::flatten_otel_metrics;
-use super::otel::traces::flatten_otel_traces;
 use super::users::dashboards::DashboardError;
 use super::users::filters::FiltersError;
 use crate::event::{
@@ -33,6 +30,9 @@ use crate::handlers::STREAM_NAME_HEADER_KEY;
 use crate::metadata::error::stream_info::MetadataError;
 use crate::metadata::STREAM_INFO;
 use crate::option::{Mode, CONFIG};
+use crate::otel::logs::flatten_otel_logs;
+use crate::otel::metrics::flatten_otel_metrics;
+use crate::otel::traces::flatten_otel_traces;
 use crate::storage::{ObjectStorageError, StreamType};
 use crate::utils::header_parsing::ParseHeaderError;
 use actix_web::{http::header::ContentType, HttpRequest, HttpResponse};

src/handlers/http/mod.rs

@@ -37,7 +37,6 @@ pub mod logstream;
 pub mod middleware;
 pub mod modal;
 pub mod oidc;
-pub mod otel;
 pub mod query;
 pub mod rbac;
 pub mod role;

src/handlers/http/modal/utils/ingest_utils.rs

@@ -32,17 +32,12 @@ use crate::{
         format::{self, EventFormat},
     },
     handlers::{
-        http::{
-            ingest::PostError,
-            kinesis,
-            otel::{
-                logs::flatten_otel_logs, metrics::flatten_otel_metrics, traces::flatten_otel_traces,
-            },
-        },
+        http::{ingest::PostError, kinesis},
         LOG_SOURCE_KEY, LOG_SOURCE_KINESIS, LOG_SOURCE_OTEL_LOGS, LOG_SOURCE_OTEL_METRICS,
         LOG_SOURCE_OTEL_TRACES, PREFIX_META, PREFIX_TAGS, SEPARATOR,
     },
     metadata::STREAM_INFO,
+    otel::{logs::flatten_otel_logs, metrics::flatten_otel_metrics, traces::flatten_otel_traces},
     storage::StreamType,
     utils::{header_parsing::collect_labelled_headers, json::convert_array_to_object},
 };

src/lib.rs

@@ -32,6 +32,7 @@ pub mod metrics;
 pub mod migration;
 mod oidc;
 pub mod option;
+pub mod otel;
 mod query;
 pub mod rbac;
 mod response;
@@ -42,7 +43,6 @@ pub mod sync;
 pub mod users;
 mod utils;
 mod validator;
-
 pub use handlers::http::modal::{
     ingest_server::IngestServer, query_server::QueryServer, server::Server, ParseableServer,
 };

src/otel.rs

@@ -0,0 +1,22 @@
+/*
+ * Parseable Server (C) 2022 - 2024 Parseable, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+pub mod logs;
+pub mod metrics;
+pub mod otel_utils;
+pub mod traces;

src/handlers/http/otel/logs.rs renamed to src/otel/logs.rs

@@ -24,8 +24,8 @@ use opentelemetry_proto::tonic::logs::v1::SeverityNumber;
 use serde_json::Value;
 use std::collections::BTreeMap;
 
-use super::collect_json_from_values;
-use super::insert_attributes;
+use super::otel_utils::collect_json_from_values;
+use super::otel_utils::insert_attributes;
 
 /// otel log event has severity number
 /// there is a mapping of severity number to severity text provided in proto

src/handlers/http/otel/metrics.rs renamed to src/otel/metrics.rs

@@ -26,7 +26,7 @@ use opentelemetry_proto::tonic::metrics::v1::{
 };
 use serde_json::Value;
 
-use super::{insert_attributes, insert_number_if_some};
+use super::otel_utils::{insert_attributes, insert_number_if_some};
 
 /// otel metrics event has json array for exemplar
 /// this function flatten the exemplar json array

src/handlers/http/otel.rs renamed to src/otel/otel_utils.rs

@@ -16,9 +16,6 @@
  *
  */
 
-pub mod logs;
-pub mod metrics;
-pub mod traces;
 use opentelemetry_proto::tonic::common::v1::{any_value::Value as OtelValue, AnyValue, KeyValue};
 use serde_json::Value;
 use std::collections::BTreeMap;

src/handlers/http/otel/traces.rs renamed to src/otel/traces.rs

@@ -27,7 +27,7 @@ use opentelemetry_proto::tonic::trace::v1::TracesData;
 use serde_json::Value;
 use std::collections::BTreeMap;
 
-use super::insert_attributes;
+use super::otel_utils::insert_attributes;
 
 /// this function flattens the `ScopeSpans` object
 /// and returns a `Vec` of `BTreeMap` of the flattened json