[rust] generate a dev version and install prod version from crates.io (#6764)

Author: iunanua

tests/test_the_test/test_compute_libraries_and_scenarios.py

@@ -27,6 +27,7 @@
     "python",
     "python_lambda",
     "ruby",
+    "rust",
 ]
 default_libs_with_dev = [
     "cpp",

utils/build/docker/rust/install_ddtrace.sh

@@ -5,7 +5,6 @@ set -eu
 cd /usr/app
 
 REPO_URL=https://github.com/DataDog/dd-trace-rs
-PROD_TAG=datadog-opentelemetry-v0.3.1
 
 if [ -e /binaries/rust-load-from-git ]; then
     rev_or_branch=$(</binaries/rust-load-from-git)
@@ -16,10 +15,36 @@ fi
 
 if [ -e /binaries/dd-trace-rs ]; then
     echo "install from /binaries/datadog-opentelemetry with metrics-http and metrics-grpc features"
-    cargo add --path /binaries/dd-trace-rs/datadog-opentelemetry --features metrics-http,metrics-grpc
+
+    cd /binaries/dd-trace-rs
+
+    # get the version from the cargo.lock
+    current_version=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "datadog-opentelemetry") | .version')
+
+    # bump patch (right segment); — expects MAJOR.MINOR.PATCH
+    IFS=. read -r major minor patch <<<"$current_version"
+    if [[ -z "${minor:-}" || -z "${patch:-}" ]]; then
+        echo "expected semver MAJOR.MINOR.PATCH, got: $current_version" >&2
+        exit 1
+    fi
+    new_version="${major}.${minor}.$((patch + 1))"
+
+    if [ -e /binaries/dd-trace-rs/.git ]; then
+        dev_version="${new_version}-dev+$(git -C /binaries/dd-trace-rs rev-parse --short HEAD)"
+    else
+        dev_version="${new_version}-dev"
+    fi
+
+    echo "generating dev version $dev_version from $current_version"
+    cargo release version -p datadog-opentelemetry "$dev_version" -x --no-confirm
+
+    cd /usr/app
+    cargo add datadog-opentelemetry --path /binaries/dd-trace-rs/datadog-opentelemetry --features metrics-http,metrics-grpc,logs-http,logs-grpc
 else
-    # TODO: add lastest release from crates.io
-    echo "install from --git $REPO_URL --tag $PROD_TAG with metrics-http and metrics-grpc features"
-    cargo add --git "$REPO_URL" --tag "$PROD_TAG" datadog-opentelemetry --features metrics-http,metrics-grpc
+    echo "install from crates.io with metrics-http and metrics-grpc features"
+
+    # remove previous depedency on datadog-opentelemetry and add the new one from crates.io
+    cargo remove datadog-opentelemetry || true
+    cargo add datadog-opentelemetry --features metrics-http,metrics-grpc,logs-http,logs-grpc
 fi
 

utils/build/docker/rust/parametric/Cargo.lock

@@ -7,6 +7,9 @@ license       = "Apache-2.0"
 readme        = "README.md"
 publish       = false
 
+resolver      = "3"
+rust-version  = "1.85.1" # should match Dockerfile rustc version
+
 [[bin]]
 name = "ddtrace-rs-client"
 path = "src/main.rs"
@@ -35,4 +38,4 @@ opentelemetry-stdout    = { version = "0.31.0", features = ["trace", "logs"] }
 opentelemetry-semantic-conventions = { version = "0.31.0" }
 
 
-datadog-opentelemetry  = { path = "../../../../../binaries/dd-trace-rs/datadog-opentelemetry", features = ["logs-grpc", "logs-http"] }
+datadog-opentelemetry  = { path = "../../../../../binaries/dd-trace-rs/datadog-opentelemetry", features = ["metrics-grpc", "metrics-http", "logs-grpc", "logs-http"] }

utils/build/docker/rust/parametric/Cargo.toml

@@ -5,7 +5,9 @@ COPY utils/build/docker/rust/parametric/../install_ddtrace.sh ./binaries/ /binar
 COPY utils/build/docker/rust/parametric/Cargo.toml /usr/app/
 COPY utils/build/docker/rust/parametric/src /usr/app/
 
-RUN apt-get update && apt-get install -y --no-install-recommends openssh-client git
+RUN apt-get update && apt-get install -y --no-install-recommends openssh-client git jq build-essential perl libssl-dev
+
+RUN cargo install cargo-release@0.25.18 --locked
 
 RUN /binaries/install_ddtrace.sh
 

utils/build/docker/rust/parametric/Dockerfile

@@ -151,7 +151,6 @@ def get_outputs(self) -> dict[str, Any]:
                 "version": "prod",
             }
             for library in sorted(self.selected)
-            if library not in ("rust",)
         ] + [
             {
                 "library": library,