Skip to content

Commit

Permalink
upgrade(python): Use src/config instead of profiling
Browse files Browse the repository at this point in the history
  • Loading branch information
BaptisteFoy committed Jan 21, 2025
1 parent 74839d1 commit 39af866
Show file tree
Hide file tree
Showing 19 changed files with 393 additions and 376 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
extension: ["src/core"]
extension: ["src/core", "src/config"]
steps:
- uses: actions/checkout@v4
with:
Expand Down
11 changes: 5 additions & 6 deletions ddtrace/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
LOADED_MODULES = frozenset(sys.modules.keys())

# Configuration for the whole tracer from file. Do it before anything else happens.
from ddtrace.internal.datadog.profiling import library_config

library_config.set_envp(["%s=%s" % (k, v) for k, v in os.environ.items()])
library_config.set_args(sys.argv)
for key, value in library_config.get_config(debug_logs=False).items():
from ddtrace.internal.config import PyConfigurator
configurator = PyConfigurator(debug_logs=False)
configurator.set_envp(["%s=%s" % (k, v) for k, v in os.environ.items()])
configurator.set_args(sys.argv)
for key, value in configurator.get_configuration().items():
os.environ[key] = str(value).lower()


from ddtrace.internal.module import ModuleWatchdog


Expand Down
1 change: 1 addition & 0 deletions ddtrace/internal/config/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from ._config import PyConfigurator # noqa:F401
7 changes: 7 additions & 0 deletions ddtrace/internal/config/_config.pyi
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from typing import List

class PyConfigurator:
def __init__(self, debug_logs: bool): ...
def set_envp(self, envp: List[str]) -> None: ...
def set_args(self, args: List[str]) -> None: ...
def get_configuration(self) -> dict: ...
7 changes: 0 additions & 7 deletions ddtrace/internal/datadog/profiling/build_standalone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ target_dirs["ddup"]="ddup"
target_dirs["crashtracker"]="crashtracker"
target_dirs["stack_v2"]="stack_v2"
target_dirs["dd_wrapper"]="dd_wrapper"
target_dirs["library_config"]="library_config"

# Compiler options
declare -A compiler_args
Expand Down Expand Up @@ -220,8 +219,6 @@ print_help() {
echo " ddup_test (also builds dd_wrapper_test)"
echo " crashtracker (also builds dd_wrapper)"
echo " crashtracker_test (also builds dd_wrapper_test)"
echo " library_config (also builds dd_wrapper)"
echo " library_config_test (also builds dd_wrapper_test)"
}

print_cmake_args() {
Expand Down Expand Up @@ -346,7 +343,6 @@ add_target() {
targets+=("stack_v2")
targets+=("ddup")
targets+=("crashtracker")
targets+=("library_config")
;;
dd_wrapper)
# `dd_wrapper` is a dependency of other targets, but the overall structure is weird when it's given explicitly
Expand All @@ -362,9 +358,6 @@ add_target() {
crashtracker)
targets+=("crashtracker")
;;
library_config)
targets+=("library_config")
;;
*)
echo "Unknown target: $1"
exit 1
Expand Down
2 changes: 0 additions & 2 deletions ddtrace/internal/datadog/profiling/dd_wrapper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ add_library(
src/crashtracker.cpp
src/crashtracker_interface.cpp
src/ddup_interface.cpp
src/library_config.cpp
src/library_config_interface.cpp
src/profile.cpp
src/receiver_interface.cpp
src/sample.cpp
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

77 changes: 0 additions & 77 deletions ddtrace/internal/datadog/profiling/library_config/CMakeLists.txt

This file was deleted.

25 changes: 0 additions & 25 deletions ddtrace/internal/datadog/profiling/library_config/__init__.py

This file was deleted.

This file was deleted.

Loading

0 comments on commit 39af866

Please sign in to comment.