Skip to content

Commit 2eece2d

Browse files
authored
Merge branch 'main' into glopes/sidecar-tel-retry
2 parents c933868 + cff7291 commit 2eece2d

62 files changed

Lines changed: 2325 additions & 1024 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: create-release
3+
description: Bump the Rust workspace version in root Cargo.toml, regenerate the lockfile, and open a draft PR on GitHub. Use this skill whenever the user says something like "create a release", "bump the version", "release vX.Y.Z", "prepare a release branch", or "bump workspace version". Trigger even if they just say "release X.Y.Z" or mention a semver version in a release context.
4+
---
5+
6+
# Create Release
7+
8+
Automate the mechanical parts of cutting a release. The full flow (branch from `main`, bump `[workspace.package].version` in `Cargo.toml`, regenerate `Cargo.lock`, push, open draft PR) is implemented in `scripts/create-release.sh`. This skill's job is to collect the version, then invoke the script.
9+
10+
## Steps
11+
12+
### 1. Get the target version
13+
14+
If the user didn't supply a version already, ask: "What version should I bump to?"
15+
16+
The version must be bare semver (e.g. `32.0.0`, `31.1.0`) — no `v` prefix. The script re-validates and will reject bad input.
17+
18+
### 2. Run the script
19+
20+
```bash
21+
scripts/create-release.sh <version>
22+
```
23+
24+
The script will:
25+
26+
1. Fail fast if the working tree is dirty.
27+
2. `git fetch origin main` and branch `release/v<version>` from `origin/main`.
28+
3. Update only the `version` field in `[workspace.package]` of `Cargo.toml`.
29+
4. Run `cargo update -w` to refresh workspace entries in `Cargo.lock`.
30+
5. Commit (`chore: bump workspace version to <version>`), push with `-u`, and open a draft PR titled `chore: release v<version>` against `main`.
31+
32+
Return the PR URL from the `gh pr create` output to the user.
33+
34+
### 3. On failure
35+
36+
If the script exits non-zero, surface its error to the user and stop — do not try to finish the steps manually without checking in first.

.codecov.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ component_management:
8888
paths:
8989
- libdd-trace-utils
9090
- component_id: tracer-flare # this is an identifier that should not be changed
91-
name: datadog-tracer-flare # this is a display name, and can be changed freely
91+
name: libdd-tracer-flare # this is a display name, and can be changed freely
9292
paths:
93-
- datadog-tracer-flare
93+
- libdd-tracer-flare
9494
- component_id: datadog-log
9595
name: libdd-log
9696
paths:

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Rules are evaluated in order. Later matches override earlier ones.
33
# More specific patterns at the bottom override general patterns above.
44

5+
.claude/ @DataDog/apm-common-components-core
56
.clang-format @DataDog/libdatadog
67
.codecov.yml @DataDog/apm-common-components-core
78
.cargo/* @DataDog/libdatadog-core
@@ -32,7 +33,6 @@ datadog-remote-config @DataDog/libdatadog-php @DataDog/libdatadog
3233
datadog-sidecar @DataDog/libdatadog-php @DataDog/libdatadog-apm
3334
datadog-sidecar-ffi @DataDog/libdatadog-php @DataDog/libdatadog-apm
3435
datadog-sidecar-macros @DataDog/libdatadog-php
35-
datadog-tracer-flare @DataDog/libdatadog-apm
3636
deny.toml @DataDog/libdatadog
3737
docker-bake.hcl @DataDog/apm-common-components-core
3838
docs @DataDog/libdatadog
@@ -57,6 +57,7 @@ libdd-trace-obfuscation @DataDog/serverless @DataDog/libdatadog-apm
5757
libdd-trace-protobuf @DataDog/serverless @DataDog/libdatadog-apm
5858
libdd-trace-stats @DataDog/apm-common-components-core
5959
libdd-trace-utils @DataDog/serverless @DataDog/libdatadog-apm
60+
libdd-tracer-flare @DataDog/libdatadog-apm
6061
LICENSE* @DataDog/libdatadog
6162
license-tool.toml @DataDog/libdatadog
6263
local-linux.Dockerfile @DataDog/libdatadog
@@ -66,6 +67,7 @@ repository.datadog.yml @DataDog/apm-common-components-core
6667
rustfmt.toml @DataDog/libdatadog-core
6768
scripts/check_cargo_metadata.sh @DataDog/libdatadog-core
6869
scripts/commits-since-release.sh @DataDog/libdatadog-core
70+
scripts/create-release.sh @DataDog/apm-common-components-core
6971
scripts/crates-to-package.sh @DataDog/libdatadog-core
7072
scripts/major-bumps-level.sh @DataDog/libdatadog-core
7173
scripts/publication-order.sh @DataDog/libdatadog-core

0 commit comments

Comments
 (0)