Skip to content

Commit

Permalink
Merge branch 'main' into alexjf/remove-soname
Browse files Browse the repository at this point in the history
  • Loading branch information
morrisonlevi authored May 16, 2024
2 parents 78f06a9 + 74c89eb commit aef7a37
Show file tree
Hide file tree
Showing 28 changed files with 1,224 additions and 43 deletions.
4 changes: 4 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ component_management:
name: crashtracker # this is a display name, and can be changed freely
paths:
- crashtracker
- component_id: datadog-alloc # this is an identifier that should not be changed
name: datadog-alloc # this is a display name, and can be changed freely
paths:
- alloc
- component_id: data-pipeline # this is an identifier that should not be changed
name: data-pipeline # this is a display name, and can be changed freely
paths:
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
* @Datadog/libdatadog-core
alloc/ @Datadog/libdatadog-profiling
build-profiling-ffi.sh @Datadog/libdatadog-profiling
crashtracker/ @Datadog/libdatadog-profiling
profiling*/ @Datadog/libdatadog-profiling
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ jobs:
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: lcov.info
fail_ci_if_error: true
fail_ci_if_error: true
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: 'Nightly verify trace-protobuf'
name: 'Weekly verify trace-protobuf'

on:
schedule:
- cron: '0 2 * * 1-5'
- cron: '0 2 * * 1'

env:
DATADOG_AGENT_TAG: "main"

jobs:
nightly-verify-proto-files:
weekly-verify-proto-files:
name: "Verify trace-protobuf .proto files are in sync with datadog-agent"
runs-on: ubuntu-latest
environment: nightlies
Expand Down
9 changes: 9 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

[workspace]
members = [
"alloc",
"crashtracker",
"profiling",
"profiling-ffi",
Expand Down
14 changes: 7 additions & 7 deletions LICENSE-3rdparty.yml

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions alloc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
# SPDX-License-Identifier: Apache-2.0

[package]
name = "datadog-alloc"
edition.workspace = true
version.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
allocator-api2 = { version = "0.2", default-features = false }

[target.'cfg(unix)'.dependencies.libc]
version = "0.2.153"

[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.52"
features = [
"Win32_Foundation",
"Win32_System_Memory",
"Win32_System_SystemInformation",
]

[dev-dependencies]
allocator-api2 = { version = "0.2", default-features = false, features = ["alloc"] }
Loading

0 comments on commit aef7a37

Please sign in to comment.