Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Cross.toml @Datadog/apm-common-components-core
datadog-ffe @Datadog/feature-flagging-and-experimentation-sdk
datadog-ffe-ffi @Datadog/feature-flagging-and-experimentation-sdk
datadog-ipc*/ @Datadog/libdatadog-php
datadog-live-debugger*/ @Datadog/libdatadog-php @Datadog/libdatadog-apm
libdd-live-debugger*/ @Datadog/libdatadog-php @Datadog/libdatadog-apm
datadog-profiling-replayer @Datadog/libdatadog-profiling
datadog-remote-config @Datadog/libdatadog-php @Datadog/libdatadog-apm @Datadog/remote-config
datadog-sidecar @Datadog/libdatadog-php @Datadog/libdatadog-apm
Expand Down
80 changes: 40 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ members = [
"datadog-ipc-macros",
"libdd-library-config",
"libdd-library-config-ffi",
"datadog-live-debugger",
"datadog-live-debugger-ffi",
"libdd-live-debugger",
"libdd-live-debugger-ffi",
"libdd-profiling",
"libdd-profiling-ffi",
"libdd-profiling-protobuf",
Expand Down
6 changes: 3 additions & 3 deletions LICENSE-3rdparty.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root_name: builder, build_common, tools, libdd-alloc, libdd-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, libdd-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ffe-ffi, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-library-config-ffi, datadog-live-debugger, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-protobuf, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, datadog-live-debugger-ffi, libdd-profiling, libdd-profiling-protobuf, libdd-profiling-ffi, libdd-data-pipeline-ffi, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, libdd-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
root_name: builder, build_common, tools, libdd-alloc, libdd-crashtracker, libdd-common, libdd-telemetry, libdd-ddsketch, libdd-crashtracker-ffi, libdd-common-ffi, datadog-ffe, datadog-ffe-ffi, datadog-ipc, datadog-ipc-macros, libdd-tinybytes, tarpc, tarpc-plugins, spawn_worker, cc_utils, libdd-library-config, libdd-library-config-ffi, libdd-live-debugger, libdd-data-pipeline, libdd-dogstatsd-client, libdd-trace-protobuf, libdd-trace-stats, libdd-trace-utils, libdd-trace-normalization, libdd-log, libdd-live-debugger-ffi, libdd-profiling, libdd-profiling-protobuf, libdd-profiling-ffi, libdd-data-pipeline-ffi, libdd-ddsketch-ffi, libdd-log-ffi, libdd-telemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-remote-config, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, libdd-trace-obfuscation, datadog-tracer-flare, sidecar_mockgen, test_spawn_from_lib
third_party_libraries:
- package_name: addr2line
package_version: 0.24.2
Expand Down Expand Up @@ -27494,9 +27494,9 @@ third_party_libraries:
- package_name: stringmetrics
package_version: 2.2.2
repository: https://github.com/pluots/stringmetrics
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
licenses:
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
- license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
text: |
Copyright 2022 Trevor Gross

Expand Down
4 changes: 2 additions & 2 deletions datadog-remote-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ client = [
"time",
"tracing"
]
live-debugger = ["datadog-live-debugger"]
live-debugger = ["libdd-live-debugger"]
test = ["hyper/server", "hyper-util"]

[dependencies]
anyhow = { version = "1.0" }
libdd-common = { path = "../libdd-common"}
libdd-trace-protobuf = { path = "../libdd-trace-protobuf", optional = true }
datadog-live-debugger = { path = "../datadog-live-debugger", optional = true }
libdd-live-debugger = { path = "../libdd-live-debugger", optional = true }
hyper = { workspace = true, optional = true }
http-body-util = {version = "0.1", optional = true }
http = { version = "1.0", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions datadog-remote-config/src/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::{
RemoteConfigPath, RemoteConfigProduct, RemoteConfigSource,
};
#[cfg(feature = "live-debugger")]
use datadog_live_debugger::LiveDebuggingData;
use libdd_live_debugger::LiveDebuggingData;

#[derive(Debug)]
pub enum RemoteConfigData {
Expand Down Expand Up @@ -37,7 +37,7 @@ impl RemoteConfigData {
}
#[cfg(feature = "live-debugger")]
RemoteConfigProduct::LiveDebugger => {
let parsed = datadog_live_debugger::parse_json(&String::from_utf8_lossy(data))?;
let parsed = libdd_live_debugger::parse_json(&String::from_utf8_lossy(data))?;
RemoteConfigData::LiveDebugger(parsed)
}
_ => RemoteConfigData::Ignored(product),
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ libdd-common = { path = "../libdd-common" }
libdd-common-ffi = { path = "../libdd-common-ffi", default-features = false }
libdd-telemetry-ffi = { path = "../libdd-telemetry-ffi", default-features = false }
datadog-remote-config = { path = "../datadog-remote-config" }
datadog-live-debugger = { path = "../datadog-live-debugger" }
libdd-live-debugger = { path = "../libdd-live-debugger" }
libdd-dogstatsd-client = { path = "../libdd-dogstatsd-client" }
libdd-tinybytes = { path = "../libdd-tinybytes", features = ["bytes_string"] }
paste = "1"
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar-ffi/cbindgen.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ must_use = "DDOG_CHECK_RETURN"

[parse]
parse_deps = true
include = ["libdd-common", "libdd-telemetry", "datadog-sidecar", "libdd-telemetry-ffi", "libdd-common-ffi", "datadog-ipc", "datadog-live-debugger", "datadog-remote-config"]
include = ["libdd-common", "libdd-telemetry", "datadog-sidecar", "libdd-telemetry-ffi", "libdd-common-ffi", "datadog-ipc", "libdd-live-debugger", "datadog-remote-config"]
2 changes: 1 addition & 1 deletion datadog-sidecar-ffi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use crate::span::TracesBytes;
use datadog_ipc::platform::{
FileBackedHandle, MappedMem, NamedShmHandle, PlatformHandle, ShmHandle,
};
use datadog_live_debugger::debugger_defs::DebuggerPayload;
use datadog_remote_config::fetch::ConfigInvariants;
use datadog_remote_config::{RemoteConfigCapabilities, RemoteConfigProduct, Target};
use datadog_sidecar::agent_remote_config::{
Expand All @@ -39,6 +38,7 @@ use libdd_common_ffi::{self as ffi, MaybeError};
#[cfg(windows)]
use libdd_crashtracker_ffi::Metadata;
use libdd_dogstatsd_client::DogStatsDActionOwned;
use libdd_live_debugger::debugger_defs::DebuggerPayload;
use libdd_telemetry::{
data::{self, Dependency, Integration},
worker::{LifecycleAction, LogIdentifier, TelemetryActions},
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ libdd-telemetry = { path = "../libdd-telemetry", features = ["tracing"] }
libdd-data-pipeline = { path = "../libdd-data-pipeline" }
libdd-trace-utils = { path = "../libdd-trace-utils" }
datadog-remote-config = { path = "../datadog-remote-config" , features = ["live-debugger"]}
datadog-live-debugger = { path = "../datadog-live-debugger" }
libdd-live-debugger = { path = "../libdd-live-debugger" }
libdd-crashtracker = { path = "../libdd-crashtracker" }
libdd-dogstatsd-client = { path = "../libdd-dogstatsd-client" }
libdd-tinybytes = { path = "../libdd-tinybytes" }
Expand Down
4 changes: 2 additions & 2 deletions datadog-sidecar/src/service/blocking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ use super::{
};
use datadog_ipc::platform::{Channel, FileBackedHandle, ShmHandle};
use datadog_ipc::transport::blocking::BlockingTransport;
use datadog_live_debugger::debugger_defs::DebuggerPayload;
use datadog_live_debugger::sender::DebuggerType;
use libdd_common::tag::Tag;
use libdd_common::MutexExt;
use libdd_dogstatsd_client::DogStatsDActionOwned;
use libdd_live_debugger::debugger_defs::DebuggerPayload;
use libdd_live_debugger::sender::DebuggerType;
use serde::Serialize;
use std::sync::{Mutex, MutexGuard};
use std::{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Copyright 2021-Present Datadog, Inc. https://www.datadoghq.com/
// SPDX-License-Identifier: Apache-2.0
use datadog_live_debugger::debugger_defs::{
DebuggerData, DebuggerPayload, Diagnostics, ProbeStatus,
};
use libdd_common::MutexExt;
use libdd_live_debugger::debugger_defs::{DebuggerData, DebuggerPayload, Diagnostics, ProbeStatus};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
Expand Down Expand Up @@ -146,7 +144,7 @@ pub struct DebuggerDiagnosticsBookkeeperStats {
#[cfg(test)]
mod tests {
use super::*;
use datadog_live_debugger::debugger_defs::{
use libdd_live_debugger::debugger_defs::{
DebuggerData, DebuggerPayload, Diagnostics, ProbeStatus,
};
use std::borrow::Cow;
Expand Down
4 changes: 2 additions & 2 deletions datadog-sidecar/src/service/runtime_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use crate::service::session_info::SessionInfo;
use crate::service::{
remote_configs::RemoteConfigsGuard, DynamicInstrumentationConfigState, InstanceId, QueueId,
};
use datadog_live_debugger::sender::{generate_tags, PayloadSender};
use libdd_common::{tag::Tag, MutexExt};
use libdd_live_debugger::sender::{generate_tags, PayloadSender};
use simd_json::prelude::ArrayTrait;
use std::collections::HashMap;
use std::fmt::Display;
Expand Down Expand Up @@ -100,7 +100,7 @@ impl ActiveApplication {
/// # Returns
///
/// * `Arc<String>` - A percent encoded string to be passed to
/// datadog_live_debugger::sender::send.
/// libdd_live_debugger::sender::send.
/// * `bool` - Whether new tags were set and a new sender needs to be started.
pub fn get_debugger_tags(
&mut self,
Expand Down
12 changes: 6 additions & 6 deletions datadog-sidecar/src/service/session_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ use futures::future;

use crate::log::{MultiEnvFilterGuard, MultiWriterGuard};
use crate::{spawn_map_err, tracer};
use datadog_live_debugger::sender::{DebuggerType, PayloadSender};
use datadog_remote_config::fetch::ConfigOptions;
use libdd_common::MutexExt;
use libdd_live_debugger::sender::{DebuggerType, PayloadSender};
use tracing::log::warn;
use tracing::{debug, error, info, trace};

Expand All @@ -29,7 +29,7 @@ use crate::service::{InstanceId, QueueId, RuntimeInfo};
pub(crate) struct SessionInfo {
runtimes: Arc<Mutex<HashMap<String, RuntimeInfo>>>,
pub(crate) session_config: Arc<Mutex<Option<libdd_telemetry::config::Config>>>,
debugger_config: Arc<Mutex<datadog_live_debugger::sender::Config>>,
debugger_config: Arc<Mutex<libdd_live_debugger::sender::Config>>,
tracer_config: Arc<Mutex<tracer::Config>>,
dogstatsd: Arc<Mutex<Option<libdd_dogstatsd_client::Client>>>,
remote_config_options: Arc<Mutex<Option<ConfigOptions>>>,
Expand Down Expand Up @@ -191,13 +191,13 @@ impl SessionInfo {
f(&mut self.get_dogstatsd());
}

pub fn get_debugger_config(&self) -> MutexGuard<'_, datadog_live_debugger::sender::Config> {
pub fn get_debugger_config(&self) -> MutexGuard<'_, libdd_live_debugger::sender::Config> {
self.debugger_config.lock_or_panic()
}

pub fn modify_debugger_config<F>(&self, mut f: F)
where
F: FnMut(&mut datadog_live_debugger::sender::Config),
F: FnMut(&mut libdd_live_debugger::sender::Config),
{
f(&mut self.get_debugger_config());
}
Expand All @@ -218,7 +218,7 @@ impl SessionInfo {
payload: R,
) {
async fn do_send(
config: Arc<Mutex<datadog_live_debugger::sender::Config>>,
config: Arc<Mutex<libdd_live_debugger::sender::Config>>,
debugger_type: DebuggerType,
new_tags: bool,
tags: Arc<String>,
Expand Down Expand Up @@ -264,7 +264,7 @@ impl SessionInfo {
}

async fn send<R: AsRef<[u8]> + Sync + Send>(
config: Arc<Mutex<datadog_live_debugger::sender::Config>>,
config: Arc<Mutex<libdd_live_debugger::sender::Config>>,
debugger_type: DebuggerType,
new_tags: bool,
tags: Arc<String>,
Expand Down
2 changes: 1 addition & 1 deletion datadog-sidecar/src/service/sidecar_interface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ use crate::service::{
use anyhow::Result;
use datadog_ipc::platform::ShmHandle;
use datadog_ipc::tarpc;
use datadog_live_debugger::sender::DebuggerType;
use libdd_common::tag::Tag;
use libdd_dogstatsd_client::DogStatsDActionOwned;
use libdd_live_debugger::sender::DebuggerType;
use serde::{Deserialize, Serialize};
use std::time::Duration;

Expand Down
8 changes: 3 additions & 5 deletions datadog-sidecar/src/service/sidecar_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ use crate::service::tracing::trace_flusher::TraceFlusherStats;
use crate::tokio_util::run_or_spawn_shared;
use datadog_ipc::platform::FileBackedHandle;
use datadog_ipc::tarpc::server::{Channel, InFlightRequest};
use datadog_live_debugger::sender::{
agent_info_supports_dedicated_snapshots_endpoint, DebuggerType,
};
use datadog_remote_config::fetch::{ConfigInvariants, ConfigOptions, MultiTargetStats};
use libdd_common::tag::Tag;
use libdd_dogstatsd_client::{new, DogStatsDActionOwned};
use libdd_live_debugger::sender::{agent_info_supports_dedicated_snapshots_endpoint, DebuggerType};
use libdd_telemetry::config::Config;
use libdd_tinybytes as tinybytes;
use libdd_trace_utils::tracer_header_tags::TracerHeaderTags;
Expand Down Expand Up @@ -585,11 +583,11 @@ impl SidecarInterface for SidecarServer {
});
session.modify_debugger_config(|cfg| {
let logs_endpoint = get_product_endpoint(
datadog_live_debugger::sender::PROD_LOGS_INTAKE_SUBDOMAIN,
libdd_live_debugger::sender::PROD_LOGS_INTAKE_SUBDOMAIN,
&config.endpoint,
);
let diagnostics_endpoint = get_product_endpoint(
datadog_live_debugger::sender::PROD_DIAGNOSTICS_INTAKE_SUBDOMAIN,
libdd_live_debugger::sender::PROD_DIAGNOSTICS_INTAKE_SUBDOMAIN,
&config.endpoint,
);
cfg.set_endpoint(logs_endpoint, diagnostics_endpoint).ok();
Expand Down
Loading
Loading