Migrate opentelemetry payload code into subdirectory

This commit migrates our otel payload code into a common directory
to allow for a future logs implementation that shares common code with
metrics.

REF SMPTNG-659

Signed-off-by: Brian L. Troutwine <brian.troutwine@datadoghq.com>

Author: blt

lading_payload/benches/opentelemetry_metric.rs

@@ -3,7 +3,7 @@ use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_m
 use lading_payload::common::config::ConfRange;
 use lading_payload::{
     OpentelemetryMetrics, Serialize,
-    opentelemetry_metric::{Config, Contexts, MetricWeights},
+    opentelemetry::metric::{Config, Contexts, MetricWeights},
 };
 use rand::{SeedableRng, rngs::SmallRng};
 use std::time::Duration;

lading_payload/src/lib.rs

@@ -46,9 +46,9 @@ pub use datadog_logs::DatadogLog;
 pub use dogstatsd::DogStatsD;
 pub use fluent::Fluent;
 pub use json::Json;
-pub use opentelemetry_log::OpentelemetryLogs;
-pub use opentelemetry_metric::OpentelemetryMetrics;
-pub use opentelemetry_trace::OpentelemetryTraces;
+pub use opentelemetry::log::OpentelemetryLogs;
+pub use opentelemetry::metric::OpentelemetryMetrics;
+pub use opentelemetry::trace::OpentelemetryTraces;
 pub use splunk_hec::SplunkHec;
 pub use statik::Static;
 pub use syslog::Syslog5424;
@@ -61,9 +61,7 @@ pub mod datadog_logs;
 pub mod dogstatsd;
 pub mod fluent;
 pub mod json;
-pub mod opentelemetry_log;
-pub mod opentelemetry_metric;
-pub mod opentelemetry_trace;
+pub mod opentelemetry;
 pub mod procfs;
 pub mod splunk_hec;
 pub mod statik;
@@ -93,13 +91,13 @@ pub enum Error {
     Weights(#[from] weighted::Error),
     /// See [`unit::Error`]
     #[error(transparent)]
-    Unit(#[from] opentelemetry_metric::unit::Error),
+    Unit(#[from] opentelemetry::metric::unit::Error),
     /// See [`prost::EncodeError`]
     #[error(transparent)]
     ProstEncode(#[from] prost::EncodeError),
     /// See [`opentelemetry_metric::templates::PoolError`]
     #[error("Unable to choose from pool: {0}")]
-    Pool(#[from] opentelemetry_metric::templates::PoolError),
+    Pool(#[from] opentelemetry::metric::templates::PoolError),
 }
 
 /// To serialize into bytes
@@ -175,7 +173,7 @@ pub enum Config {
     /// Generates OpenTelemetry logs
     OpentelemetryLogs,
     /// Generates OpenTelemetry metrics
-    OpentelemetryMetrics(crate::opentelemetry_metric::Config),
+    OpentelemetryMetrics(crate::opentelemetry::metric::Config),
     /// Generates `DogStatsD`
     #[serde(rename = "dogstatsd")]
     DogStatsD(crate::dogstatsd::Config),

lading_payload/src/opentelemetry_log.rs lading_payload/src/opentelemetry/log.rslading_payload/src/opentelemetry_log.rs renamed to lading_payload/src/opentelemetry/log.rs

@@ -16,7 +16,7 @@ use prost::Message;
 use rand::Rng;
 use std::io::Write;
 
-use super::Generator;
+use crate::Generator;
 
 /// Wrapper to generate arbitrary OpenTelemetry [`ExportLogsServiceRequests`](opentelemetry_proto::tonic::collector::logs::v1::ExportLogsServiceRequest)
 struct ExportLogsServiceRequest(Vec<LogRecord>);

…ding_payload/src/opentelemetry_metric.rs …ding_payload/src/opentelemetry/metric.rslading_payload/src/opentelemetry_metric.rs renamed to lading_payload/src/opentelemetry/metric.rs lading_payload/src/opentelemetry_metric.rs renamed to lading_payload/src/opentelemetry/metric.rs

@@ -477,7 +477,7 @@ mod test {
     use crate::{
         Serialize, SizedGenerator,
         common::config::ConfRange,
-        opentelemetry_metric::v1::{ResourceMetrics, metric},
+        opentelemetry::metric::v1::{ResourceMetrics, metric},
     };
     use opentelemetry_proto::tonic::common::v1::any_value;
     use opentelemetry_proto::tonic::metrics::v1::{

…payload/src/opentelemetry_metric/tags.rs …payload/src/opentelemetry/metric/tags.rslading_payload/src/opentelemetry_metric/tags.rs renamed to lading_payload/src/opentelemetry/metric/tags.rs lading_payload/src/opentelemetry_metric/tags.rs renamed to lading_payload/src/opentelemetry/metric/tags.rs

@@ -0,0 +1,11 @@
+//! OpenTelemetry payload generation
+//!
+//! This module contains payload generators for OpenTelemetry formats.
+
+pub mod log;
+pub mod metric;
+pub mod trace;
+
+pub use log::OpentelemetryLogs;
+pub use metric::OpentelemetryMetrics;
+pub use trace::OpentelemetryTraces;

…ad/src/opentelemetry_metric/templates.rs …ad/src/opentelemetry/metric/templates.rslading_payload/src/opentelemetry_metric/templates.rs renamed to lading_payload/src/opentelemetry/metric/templates.rs lading_payload/src/opentelemetry_metric/templates.rs renamed to lading_payload/src/opentelemetry/metric/templates.rs

@@ -12,7 +12,7 @@ use prost::Message;
 use rand::{Rng, distr::StandardUniform, prelude::Distribution};
 use std::io::Write;
 
-use super::Generator;
+use crate::Generator;
 
 /// Wrapper to generate arbitrary OpenTelemetry [`ExportTraceServiceRequest`](opentelemetry_proto::tonic::collector::trace::v1::ExportTraceServiceRequest)
 struct ExportTraceServiceRequest(Vec<Span>);