Skip to content

Commit 89cfe84

Browse files
author
Ganesh Jangir
committed
chore: renames
crate name: datadog-log and datadog-log-ffi dir name: log and log-ffi prefix: ddog_log_
1 parent 8bc52e0 commit 89cfe84

File tree

15 files changed

+42
-42
lines changed

15 files changed

+42
-42
lines changed

Cargo.lock

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ members = [
3939
"dogstatsd-client",
4040
"library-config-ffi",
4141
"library-config",
42-
"ddlog-ffi",
43-
"ddlog",
42+
"log",
43+
"log-ffi",
4444
]
4545

4646
# https://doc.rust-lang.org/cargo/reference/resolver.html#feature-resolver-version-2

LICENSE-3rdparty.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
root_name: datadog-alloc, builder, build_common, tools, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-profiling, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-utils, datadog-trace-normalization, tinybytes, dogstatsd-client, datadog-library-config-ffi, datadog-library-config, ddlog-ffi, ddlog, ddtelemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, spawn_worker, cc_utils, datadog-live-debugger, datadog-live-debugger-ffi, datadog-remote-config, datadog-dynamic-configuration, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, sidecar_mockgen, datadog-trace-obfuscation, test_spawn_from_lib, datadog-serverless-trace-mini-agent, datadog-trace-mini-agent
1+
root_name: datadog-alloc, builder, build_common, tools, datadog-crashtracker, ddcommon, ddtelemetry, datadog-ddsketch, datadog-crashtracker-ffi, ddcommon-ffi, datadog-profiling, datadog-profiling-ffi, data-pipeline-ffi, data-pipeline, datadog-trace-protobuf, datadog-trace-utils, datadog-trace-normalization, tinybytes, dogstatsd-client, datadog-library-config-ffi, datadog-library-config, datadog-log-ffi, datadog-log, ddtelemetry-ffi, symbolizer-ffi, datadog-profiling-replayer, datadog-ipc, datadog-ipc-macros, tarpc, tarpc-plugins, spawn_worker, cc_utils, datadog-live-debugger, datadog-live-debugger-ffi, datadog-remote-config, datadog-dynamic-configuration, datadog-sidecar, datadog-sidecar-macros, datadog-sidecar-ffi, sidecar_mockgen, datadog-trace-obfuscation, test_spawn_from_lib, datadog-serverless-trace-mini-agent, datadog-trace-mini-agent
22
third_party_libraries:
33
- package_name: addr2line
44
package_version: 0.24.2

build-profiling-ffi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ FEATURES=(
152152
"datadog-profiling-ffi/ddtelemetry-ffi"
153153
"datadog-profiling-ffi/demangler"
154154
"datadog-library-config-ffi"
155-
"ddlog-ffi"
155+
"datadog-log-ffi"
156156
)
157157
if [[ "$symbolizer" -eq 1 ]]; then
158158
FEATURES+=("symbolizer")

docs/RFCs/0009-cross-language-logging-integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ type LogCallback = extern "C" fn(event: LogEvent);
9191
/// @returns: None if successful, Error if initialization fails
9292
/// Note: If an error is returned, it must be released using `ddog_Error_drop`.
9393
#[no_mangle]
94-
pub extern "C" fn ddog_logger_init(log_level: LogLevel, callback: LogCallback) -> Option<Box<Error>> {
94+
pub extern "C" fn ddog_log_logger_init(log_level: LogLevel, callback: LogCallback) -> Option<Box<Error>> {
9595
// Implementation details
9696
}
9797

@@ -101,7 +101,7 @@ pub extern "C" fn ddog_logger_init(log_level: LogLevel, callback: LogCallback) -
101101
/// @returns: None if successful, Error if setting log level fails
102102
/// Note: If an error is returned, it must be released using `ddog_Error_drop`.
103103
#[no_mangle]
104-
pub extern "C" fn ddog_logger_set_log_level(log_level: LogLevel) -> Option<Box<Error>> {
104+
pub extern "C" fn ddog_log_logger_set_log_level(log_level: LogLevel) -> Option<Box<Error>> {
105105
// Implementation details
106106
}
107107
```

ddlog-ffi/Cargo.toml renamed to log-ffi/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "ddlog-ffi"
2+
name = "datadog-log-ffi"
33
rust-version.workspace = true
44
edition.workspace = true
55
version.workspace = true
@@ -18,5 +18,5 @@ expanded_builder_macros = []
1818
build_common = { path = "../build-common" }
1919

2020
[dependencies]
21-
ddlog = { path = "../ddlog" }
21+
datadog-log = { path = "../log" }
2222
ddcommon-ffi = { path = "../ddcommon-ffi" }
File renamed without changes.

ddlog-ffi/cbindgen.toml renamed to log-ffi/cbindgen.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ must_use = "DDOG_CHECK_RETURN"
3434

3535
[parse]
3636
parse_deps = true
37-
include = ["ddcommon-ffi", "ddlog"]
37+
include = ["ddcommon-ffi", "datadog-log"]

ddlog-ffi/src/lib.rs renamed to log-ffi/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use ddcommon_ffi::Error;
5-
use ddlog::logger::{logger_init, logger_set_log_level, LogCallback, LogLevel};
5+
use datadog_log::logger::{logger_init, logger_set_log_level, LogCallback, LogLevel};
66

77
/// Updates the log level for the logger.
88
///
@@ -16,7 +16,7 @@ use ddlog::logger::{logger_init, logger_set_log_level, LogCallback, LogLevel};
1616
///
1717
/// Returns `None` on success, or a boxed `Error` if the update fails.
1818
#[no_mangle]
19-
pub extern "C" fn ddog_logger_set_log_level(log_level: LogLevel) -> Option<Box<Error>> {
19+
pub extern "C" fn ddog_log_logger_set_log_level(log_level: LogLevel) -> Option<Box<Error>> {
2020
logger_set_log_level(log_level).err().map(Box::new)
2121
}
2222

@@ -38,7 +38,7 @@ pub extern "C" fn ddog_logger_set_log_level(log_level: LogLevel) -> Option<Box<E
3838
///
3939
/// Returns `None` on success, or a boxed `Error` if initialization fails.
4040
#[no_mangle]
41-
pub extern "C" fn ddog_logger_init(
41+
pub extern "C" fn ddog_log_logger_init(
4242
log_level: LogLevel,
4343
callback: LogCallback,
4444
) -> Option<Box<Error>> {

ddlog/Cargo.toml renamed to log/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "ddlog"
2+
name = "datadog-log"
33
description = "A bridge from Rust to {language} logging"
44
rust-version.workspace = true
55
edition.workspace = true

0 commit comments

Comments
 (0)