Compare commits
No commits in common. "main" and "opentelemetry-appender-tracing-0.30.0" have entirely different histories.
main
...
openteleme
25
.cspell.json
25
.cspell.json
|
|
@ -12,8 +12,7 @@
|
|||
"ignoreWords": [
|
||||
"otel",
|
||||
"rustdoc",
|
||||
"rustfilt",
|
||||
"webkpi"
|
||||
"rustfilt"
|
||||
],
|
||||
// these are words that are always considered incorrect.
|
||||
"flagWords": [
|
||||
|
|
@ -35,61 +34,47 @@
|
|||
"Bhasin",
|
||||
"Björn",
|
||||
"BLRP",
|
||||
"chrono",
|
||||
"Cijo",
|
||||
"clippy",
|
||||
"clonable",
|
||||
"codecov",
|
||||
"dashmap",
|
||||
"datapoint",
|
||||
"deque",
|
||||
"Dirkjan",
|
||||
"docsrs",
|
||||
"Dwarnings",
|
||||
"eprintln",
|
||||
"EPYC",
|
||||
"flamegraph",
|
||||
"Gerring",
|
||||
"grpcio",
|
||||
"Grübel",
|
||||
"hasher",
|
||||
"impls",
|
||||
"isahc",
|
||||
"Isobel",
|
||||
"jaegertracing",
|
||||
"Kühle",
|
||||
"Kumar",
|
||||
"Lalit",
|
||||
"LIBCLANG",
|
||||
"logrecord",
|
||||
"MILLIS",
|
||||
"mpsc",
|
||||
"msrv",
|
||||
"mykey",
|
||||
"myunit",
|
||||
"myvalue",
|
||||
"nocapture",
|
||||
"Ochtman",
|
||||
"opentelemetry",
|
||||
"openzipkin",
|
||||
"otcorrelations",
|
||||
"OTELCOL",
|
||||
"OTLP",
|
||||
"periodicreader",
|
||||
"Pillai",
|
||||
"pprof",
|
||||
"protos",
|
||||
"prost",
|
||||
"protoc",
|
||||
"quantile",
|
||||
"quantiles",
|
||||
"Redelmeier",
|
||||
"reqwest",
|
||||
"rstest",
|
||||
"runtimes",
|
||||
"rustc",
|
||||
"rustls",
|
||||
"schemars",
|
||||
"semconv",
|
||||
"serde",
|
||||
"shoppingcart",
|
||||
|
|
@ -98,18 +83,10 @@
|
|||
"testcontainers",
|
||||
"testresults",
|
||||
"thiserror",
|
||||
"traceparent",
|
||||
"Traceparent",
|
||||
"tracerprovider",
|
||||
"tracestate",
|
||||
"UCUM",
|
||||
"Umesan",
|
||||
"unsampled",
|
||||
"updown",
|
||||
"urlencoding",
|
||||
"usize",
|
||||
"Utkarsh",
|
||||
"webpki",
|
||||
"Zhongyang",
|
||||
"zipkin"
|
||||
],
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
# Log of local changes
|
||||
|
||||
Maintainers are expected to maintain this log. This is required as per
|
||||
[OpenTelemetry Community
|
||||
guidelines](https://github.com/open-telemetry/community/blob/main/docs/how-to-configure-new-repository.md#collaborators-and-teams).
|
||||
|
||||
## May 6th 2024
|
||||
|
||||
Modified branch protection for main branch to require the following CI checks as
|
||||
we now added Windows to CI.
|
||||
test (ubuntu-latest, stable)
|
||||
test (stable, windows-latest)
|
||||
|
||||
## April 30th 2024
|
||||
|
||||
Modified branch protection for main branch to require the following CI checks:
|
||||
docs
|
||||
test (stable)
|
||||
|
|
@ -15,45 +15,40 @@ on:
|
|||
name: benchmark pull requests
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
runBenchmark:
|
||||
name: run benchmark
|
||||
permissions:
|
||||
pull-requests: write
|
||||
|
||||
# If we're running on main, use our oracle bare-metal runner for accuracy.
|
||||
# If we're running on a PR, use github's shared workers to save resources.
|
||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'oracle-bare-metal-64cpu-512gb-x86-64' }}
|
||||
# If we're running on a PR, use ubuntu-latest - a shared runner. We can't use the self-hosted
|
||||
# runners on arbitrary PRs, and we don't want to unleash that load on the pool anyway.
|
||||
# If we're running on main, use the OTEL self-hosted runner pool.
|
||||
|
||||
# TODO - temporarily move main to the shared workers, until we've resolved the instance setup issue
|
||||
# runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }}
|
||||
runs-on: 'ubuntu-latest'
|
||||
if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) || github.event_name == 'push' }}
|
||||
container:
|
||||
image: rust:slim-bullseye
|
||||
env:
|
||||
# For PRs, compare against the base branch - e.g., 'main'.
|
||||
# For pushes to main, compare against the previous commit
|
||||
BRANCH_NAME: ${{ github.event_name == 'pull_request' && github.base_ref || github.event.before }}
|
||||
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
- name: Setup container environment
|
||||
run: |
|
||||
apt-get update && apt-get install --fix-missing -y unzip cmake build-essential pkg-config curl git
|
||||
cargo install cargo-criterion
|
||||
|
||||
- name: Make repo safe for Git inside container
|
||||
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
|
||||
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
with:
|
||||
fetch-depth: 10 # Fetch a bit of history so we can do perf diffs
|
||||
|
||||
fetch-depth: 10 # Fetch current commit and its parent
|
||||
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
|
||||
with:
|
||||
toolchain: stable
|
||||
- uses: boa-dev/criterion-compare-action@adfd3a94634fe2041ce5613eb7df09d247555b87 # v3.2.4
|
||||
with:
|
||||
branchName: ${{ env.BRANCH_NAME }}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ jobs:
|
|||
continue-on-error: ${{ matrix.rust == 'beta' }}
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -72,7 +72,7 @@ jobs:
|
|||
with:
|
||||
toolchain: stable
|
||||
components: rustfmt, clippy
|
||||
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
|
||||
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
|
||||
with:
|
||||
tool: cargo-hack
|
||||
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
|
||||
|
|
@ -89,7 +89,7 @@ jobs:
|
|||
runs-on: ubuntu-latest # TODO: Check if this could be covered for Windows. The step used currently fails on Windows.
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ jobs:
|
|||
# https://github.com/awslabs/cargo-check-external-types/releases
|
||||
toolchain: nightly-2025-05-04
|
||||
components: rustfmt
|
||||
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
|
||||
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
|
||||
with:
|
||||
tool: cargo-check-external-types@0.2.0
|
||||
- name: external-type-check
|
||||
|
|
@ -114,7 +114,7 @@ jobs:
|
|||
continue-on-error: true
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ jobs:
|
|||
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
|
||||
with:
|
||||
toolchain: stable
|
||||
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
|
||||
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
|
||||
with:
|
||||
tool: cargo-msrv
|
||||
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
|
||||
|
|
@ -137,29 +137,29 @@ jobs:
|
|||
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
|
||||
- name: Check advisories
|
||||
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
|
||||
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
|
||||
with:
|
||||
command: check advisories
|
||||
|
||||
- name: Check licenses
|
||||
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
|
||||
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
|
||||
with:
|
||||
command: check licenses
|
||||
|
||||
- name: Check bans
|
||||
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
|
||||
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
|
||||
with:
|
||||
command: check bans
|
||||
|
||||
- name: Check sources
|
||||
uses: EmbarkStudios/cargo-deny-action@30f817c6f72275c6d54dc744fbca09ebc958599f # v2.0.12
|
||||
uses: EmbarkStudios/cargo-deny-action@34899fc7ba81ca6268d5947a7a16b4649013fea1 # v2.0.11
|
||||
with:
|
||||
command: check sources
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ jobs:
|
|||
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'dependencies') }}
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -206,7 +206,7 @@ jobs:
|
|||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Install cargo-llvm-cov
|
||||
uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
|
||||
uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
|
||||
with:
|
||||
tool: cargo-llvm-cov
|
||||
- name: cargo generate-lockfile
|
||||
|
|
@ -215,7 +215,7 @@ jobs:
|
|||
- name: cargo llvm-cov
|
||||
run: cargo llvm-cov --locked --all-features --workspace --lcov --lib --output-path lcov.info
|
||||
- name: Upload to codecov.io
|
||||
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
|
||||
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
|
||||
env:
|
||||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
||||
with:
|
||||
|
|
@ -224,9 +224,8 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # stable
|
||||
- uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
|
||||
with:
|
||||
toolchain: stable
|
||||
components: rustfmt
|
||||
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
|
||||
with:
|
||||
|
|
@ -244,7 +243,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -254,7 +253,7 @@ jobs:
|
|||
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
|
||||
with:
|
||||
toolchain: stable
|
||||
- uses: taiki-e/install-action@0eee80d37f55e834144deec670972c19e81a85b0 # v2.56.0
|
||||
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
|
||||
with:
|
||||
tool: cargo-machete
|
||||
- name: cargo machete
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -34,12 +34,12 @@ jobs:
|
|||
submodules: true
|
||||
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
|
||||
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
|
||||
with:
|
||||
languages: rust
|
||||
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
|
||||
uses: github/codeql-action/autobuild@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
|
||||
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
|
||||
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
|
||||
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
|
||||
with:
|
||||
api-key: ${{secrets.FOSSA_API_KEY}}
|
||||
team: OpenTelemetry
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ jobs:
|
|||
timeout-minutes: 10
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ jobs:
|
|||
id-token: write
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ jobs:
|
|||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
|
||||
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
|
||||
with:
|
||||
results_file: results.sarif
|
||||
results_format: sarif
|
||||
|
|
@ -48,6 +48,6 @@ jobs:
|
|||
# Upload the results to GitHub's code scanning dashboard (optional).
|
||||
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
|
||||
- name: "Upload to code-scanning"
|
||||
uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
|
||||
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
|
||||
with:
|
||||
sarif_file: results.sarif
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ jobs:
|
|||
if: ${{ github.event.label.name == 'semver-check' || contains(github.event.pull_request.labels.*.name, 'semver-check') }}
|
||||
steps:
|
||||
- name: Harden the runner (Audit all outbound calls)
|
||||
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
|
||||
uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
|
||||
with:
|
||||
egress-policy: audit
|
||||
|
||||
|
|
@ -26,4 +26,4 @@ jobs:
|
|||
toolchain: stable
|
||||
components: rustfmt
|
||||
- name: cargo-semver-checks
|
||||
uses: obi1kenobi/cargo-semver-checks-action@5b298c9520f7096a4683c0bd981a7ac5a7e249ae # v2.8
|
||||
uses: obi1kenobi/cargo-semver-checks-action@7272cc2caa468d3e009a2b0a9cc366839348237b # v2.6
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ tonic = { version = "0.13", default-features = false }
|
|||
tonic-build = "0.13"
|
||||
tokio = { version = "1", default-features = false }
|
||||
tokio-stream = "0.1"
|
||||
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
|
||||
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
|
||||
# required for OpenTelemetry's internal logging macros.
|
||||
tracing = { version = ">=0.1.40", default-features = false }
|
||||
# `tracing-core >=0.1.33` is required for compatibility with `tracing >=0.1.40`.
|
||||
tracing-core = { version = ">=0.1.33", default-features = false }
|
||||
tracing-core = { version = ">=0.1.33", default-features = false }
|
||||
tracing-subscriber = { version = "0.3", default-features = false }
|
||||
url = { version = "2.5", default-features = false }
|
||||
anyhow = "1.0.94"
|
||||
|
|
@ -59,7 +59,8 @@ ctor = "0.2.9"
|
|||
ctrlc = "3.2.5"
|
||||
futures-channel = "0.3"
|
||||
futures-sink = "0.3"
|
||||
const-hex = "1.14.1"
|
||||
glob = "0.3.1"
|
||||
hex = "0.4.3"
|
||||
lazy_static = "1.4.0"
|
||||
num-format = "0.4.4"
|
||||
num_cpus = "1.15.0"
|
||||
|
|
@ -73,7 +74,7 @@ sysinfo = "0.32"
|
|||
tempfile = "3.3.0"
|
||||
testcontainers = "0.23.1"
|
||||
tracing-log = "0.2"
|
||||
tracing-opentelemetry = "0.31"
|
||||
tracing-opentelemetry = "0.30"
|
||||
typed-builder = "0.20"
|
||||
uuid = "1.3"
|
||||
|
||||
|
|
|
|||
10
README.md
10
README.md
|
|
@ -186,27 +186,21 @@ you're more than welcome to participate!
|
|||
* [Utkarsh Umesan Pillai](https://github.com/utpilla), Microsoft
|
||||
* [Zhongyang Wu](https://github.com/TommyCpp)
|
||||
|
||||
For more information about the maintainer role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).
|
||||
|
||||
### Approvers
|
||||
|
||||
* [Anton Grübel](https://github.com/gruebel), Baz
|
||||
* [Björn Antonsson](https://github.com/bantonsson), Datadog
|
||||
* [Scott Gerring](https://github.com/scottgerring), Datadog
|
||||
* [Shaun Cox](https://github.com/shaun-cox), Microsoft
|
||||
|
||||
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
|
||||
* [Scott Gerring](https://github.com/scottgerring), Datadog
|
||||
|
||||
### Emeritus
|
||||
|
||||
* [Dirkjan Ochtman](https://github.com/djc)
|
||||
* [Isobel Redelmeier](https://github.com/iredelmeier)
|
||||
* [Jan Kühle](https://github.com/frigus02)
|
||||
* [Julian Tescher](https://github.com/jtescher)
|
||||
* [Isobel Redelmeier](https://github.com/iredelmeier)
|
||||
* [Mike Goldsmith](https://github.com/MikeGoldsmith)
|
||||
|
||||
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
|
||||
|
||||
### Thanks to all the people who have contributed
|
||||
|
||||
[](https://github.com/open-telemetry/opentelemetry-rust/graphs/contributors)
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
## Summary
|
||||
|
||||
This ADR describes the general pattern we will follow when modelling errors in public API interfaces - that is, APIs that are exposed to users of the project's published crates. It summarizes the discussion and final option from [#2571](https://github.com/open-telemetry/opentelemetry-rust/issues/2571); for more context check out that issue.
|
||||
This ADR describes the general pattern we will follow when modelling errors in public API interfaces - that is, APIs that are exposed to users of the project's published crates. It summarises the discussion and final option from [#2571](https://github.com/open-telemetry/opentelemetry-rust/issues/2571); for more context check out that issue.
|
||||
|
||||
We will focus on the exporter traits in this example, but the outcome should be applied to _all_ public traits and their fallible operations.
|
||||
|
||||
These include [SpanExporter](https://github.com/open-telemetry/opentelemetry-rust/blob/eca1ce87084c39667061281e662d5edb9a002882/opentelemetry-sdk/src/trace/export.rs#L18), [LogExporter](https://github.com/open-telemetry/opentelemetry-rust/blob/eca1ce87084c39667061281e662d5edb9a002882/opentelemetry-sdk/src/logs/export.rs#L115), and [PushMetricExporter](https://github.com/open-telemetry/opentelemetry-rust/blob/eca1ce87084c39667061281e662d5edb9a002882/opentelemetry-sdk/src/metrics/exporter.rs#L11) which form part of the API surface of `opentelemetry-sdk`.
|
||||
|
||||
There are various ways to handle errors on trait methods, including swallowing them and logging, panicking, returning a shared global error, or returning a method-specific error. We strive for consistency, and we want to be sure that we've put enough thought into what this looks like that we don't have to make breaking interface changes unnecessarily in the future.
|
||||
There are various ways to handle errors on trait methods, including swallowing them and logging, panicing, returning a shared global error, or returning a method-specific error. We strive for consistency, and we want to be sure that we've put enough thought into what this looks like that we don't have to make breaking interface changes unecessarily in the future.
|
||||
|
||||
## Design Guidance
|
||||
|
||||
|
|
@ -69,7 +69,7 @@ trait MyTrait {
|
|||
|
||||
## 3. Consolidate error types between signals where we can, let them diverge where we can't
|
||||
|
||||
Consider the `Exporter`s mentioned earlier. Each of them has the same failure indicators - as dictated by the OpenTelemetry spec - and we will
|
||||
Consider the `Exporter`s mentioned earlier. Each of them has the same failure indicators - as dicated by the OpenTelemetry spec - and we will
|
||||
share the error types accordingly:
|
||||
|
||||
**Don't do this** - each signal has its own error type, despite having exactly the same failure cases:
|
||||
|
|
|
|||
115
docs/metrics.md
115
docs/metrics.md
|
|
@ -485,9 +485,9 @@ practice is important:
|
|||
|
||||
* **Delta Temporality**: The SDK "forgets" the state after each
|
||||
collection/export cycle. This means in each new interval, the SDK can track
|
||||
up to the cardinality limit of distinct attribute combinations. Over time,
|
||||
your metrics backend might see far more than the configured limit of
|
||||
distinct combinations from a single process.
|
||||
up to the cardinality limit of distinct attribute combinations.
|
||||
Over time, your metrics backend might see far more than the configured limit
|
||||
of distinct combinations from a single process.
|
||||
|
||||
* **Cumulative Temporality**: Since the SDK maintains state across export
|
||||
intervals, once the cardinality limit is reached, new attribute combinations
|
||||
|
|
@ -560,108 +560,7 @@ The exported metrics would be:
|
|||
words, attributes used to create `Meter` or `Resource` attributes are not
|
||||
subject to this cap.
|
||||
|
||||
#### Cardinality Limits - How to Choose the Right Limit
|
||||
|
||||
Choosing the right cardinality limit is crucial for maintaining efficient memory
|
||||
usage and predictable performance in your metrics system. The optimal limit
|
||||
depends on your temporality choice and application characteristics.
|
||||
|
||||
Setting the limit incorrectly can have consequences:
|
||||
|
||||
* **Limit too high**: Due to the SDK's [memory
|
||||
preallocation](#memory-preallocation) strategy, excess memory will be
|
||||
allocated upfront and remain unused, leading to resource waste.
|
||||
* **Limit too low**: Measurements will be folded into the overflow bucket
|
||||
(`{"otel.metric.overflow": true}`), losing granular attribute information and
|
||||
making attribute-based queries unreliable.
|
||||
|
||||
Consider these guidelines when determining the appropriate limit:
|
||||
|
||||
##### Choosing the Right Limit for Cumulative Temporality
|
||||
|
||||
Cumulative metrics retain every unique attribute combination that has *ever*
|
||||
been observed since the start of the process.
|
||||
|
||||
* You must account for the theoretical maximum number of attribute combinations.
|
||||
* This can be estimated by multiplying the number of possible values for each
|
||||
attribute.
|
||||
* If certain attribute combinations are invalid or will never occur in practice,
|
||||
you can reduce the limit accordingly.
|
||||
|
||||
###### Example - Fruit Sales Scenario
|
||||
|
||||
Attributes:
|
||||
|
||||
* `name` can be "apple" or "lemon" (2 values)
|
||||
* `color` can be "red", "yellow", or "green" (3 values)
|
||||
|
||||
The theoretical maximum is 2 × 3 = 6 unique attribute sets.
|
||||
|
||||
For this example, the simplest approach is to use the theoretical maximum and **set the cardinality limit to 6**.
|
||||
|
||||
However, if you know that certain combinations will never occur (for example, if "red lemons" don't exist in your application domain), you could reduce the limit to only account for valid combinations. In this case, if only 5 combinations are valid, **setting the cardinality limit to 5** would be more memory-efficient.
|
||||
|
||||
##### Choosing the Right Limit for Delta Temporality
|
||||
|
||||
Delta metrics reset their aggregation state after every export interval. This
|
||||
approach enables more efficient memory utilization by focusing only on attributes
|
||||
observed during each interval rather than maintaining state for all combinations.
|
||||
|
||||
* **When attributes are low-cardinality** (as in the fruit example), use the
|
||||
same calculation method as with cumulative temporality.
|
||||
* **When high-cardinality attribute(s) exist** like `user_id`, leverage Delta
|
||||
temporality's "forget state" nature to set a much lower limit based on active
|
||||
usage patterns. This is where Delta temporality truly excels - when the set of
|
||||
active values changes dynamically and only a small subset is active during any
|
||||
given interval.
|
||||
|
||||
###### Example - High Cardinality Attribute Scenario
|
||||
|
||||
Export interval: 60 sec
|
||||
|
||||
Attributes:
|
||||
|
||||
* `user_id` (up to 1 million unique users)
|
||||
* `success` (true or false, 2 values)
|
||||
|
||||
Theoretical limit: 1 million users × 2 = 2 million attribute sets
|
||||
|
||||
But if only 10,000 users are typically active during a 60 sec export interval:
|
||||
10,000 × 2 = 20,000
|
||||
|
||||
**You can set the limit to 20,000, dramatically reducing memory usage during
|
||||
normal operation.**
|
||||
|
||||
###### Export Interval Tuning
|
||||
|
||||
Shorter export intervals further reduce the required cardinality:
|
||||
|
||||
* If your interval is halved (e.g., from 60 sec to 30 sec), the number of unique
|
||||
attribute sets seen per interval may also be halved.
|
||||
|
||||
> [!NOTE] More frequent exports increase CPU/network overhead due to
|
||||
> serialization and transmission costs.
|
||||
|
||||
##### Choosing the Right Limit - Backend Considerations
|
||||
|
||||
While delta temporality offers certain advantages for cardinality management,
|
||||
your choice may be constrained by backend support:
|
||||
|
||||
* **Backend Restrictions:** Some metrics backends only support cumulative
|
||||
temporality. For example, Prometheus requires cumulative temporality and
|
||||
cannot directly consume delta metrics.
|
||||
* **Collector Conversion:** To leverage delta temporality's memory advantages
|
||||
while maintaining backend compatibility, configure your SDK to use delta
|
||||
temporality and deploy an OpenTelemetry Collector with a delta-to-cumulative
|
||||
conversion processor. This approach pushes the memory overhead from your
|
||||
application to the collector, which can be more easily scaled and managed
|
||||
independently.
|
||||
|
||||
TODO: Add the memory cost incurred by each data points, so users can know the
|
||||
memory impact of setting a higher limits.
|
||||
|
||||
TODO: Add example of how query can be affected when overflow occurs, use
|
||||
[Aspire](https://github.com/dotnet/aspire/pull/7784) tool.
|
||||
// TODO: Document how to pick cardinality limit.
|
||||
|
||||
### Memory Preallocation
|
||||
|
||||
|
|
@ -723,7 +622,7 @@ Follow these guidelines when deciding where to attach metric attributes:
|
|||
* **Meter-level attributes**: If the dimension applies only to a subset of
|
||||
metrics (e.g., library version), model it as meter-level attributes via
|
||||
`meter_with_scope`.
|
||||
|
||||
|
||||
```rust
|
||||
// Example: Setting meter-level attributes
|
||||
let scope = InstrumentationScope::builder("payment_library")
|
||||
|
|
@ -761,7 +660,3 @@ Common pitfalls that can result in missing metrics include:
|
|||
used, some metrics may be placed in the overflow bucket.
|
||||
|
||||
// TODO: Add more specific examples
|
||||
|
||||
## References
|
||||
|
||||
[OTel Metrics Specification - Supplementary Guidelines](https://opentelemetry.io/docs/specs/otel/metrics/supplementary-guidelines/)
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
# Release Notes 0.30
|
||||
|
||||
OpenTelemetry Rust 0.30 introduces a few breaking changes to the
|
||||
`opentelemetry_sdk` crate in the `metrics` feature. These changes were essential
|
||||
to drive the Metrics SDK towards stability. With this release, the Metrics SDK
|
||||
is officially declared stable. The Metrics API was declared stable last year,
|
||||
and previously, the Logs API, SDK, and OTel-Appender-Tracing were also marked
|
||||
stable. Importantly, no breaking changes have been introduced to components
|
||||
already marked as stable.
|
||||
|
||||
It is worth noting that the `opentelemetry-otlp` crate remains in a
|
||||
Release-Candidate state and is not yet considered stable. With the API and SDK
|
||||
for Logs and Metrics now stable, the focus will shift towards further refining
|
||||
and stabilizing the OTLP Exporters in upcoming releases. Additionally,
|
||||
Distributed Tracing is expected to progress towards stability, addressing key
|
||||
interoperability challenges.
|
||||
|
||||
For detailed changelogs of individual crates, please refer to their respective
|
||||
changelog files. This document serves as a summary of the main changes.
|
||||
|
||||
## Key Changes
|
||||
|
||||
### Metrics SDK Improvements
|
||||
|
||||
1. **Stabilized "view" features**: Previously under an experimental feature
|
||||
flag, views can now be used to modify the name, unit, description, and
|
||||
cardinality limit of a metric. Advanced view capabilities, such as changing
|
||||
aggregation or dropping attributes, remain under the experimental feature
|
||||
flag.
|
||||
|
||||
2. **Cardinality capping**: Introduced the ability to cap cardinality and
|
||||
configure limits using views.
|
||||
|
||||
3. **Polished public API**: Refined the public API to hide implementation
|
||||
details from exporters, enabling future internal optimizations and ensuring
|
||||
consistency. Some APIs related to authoring custom metric readers have been
|
||||
moved behind experimental feature flags. These advanced use cases require
|
||||
more time to finalize the API surface before being included in the stable
|
||||
release.
|
||||
|
||||
### Context-Based Suppression
|
||||
|
||||
Added the ability to suppress telemetry based on Context. This feature prevents
|
||||
telemetry-induced-telemetry scenarios and addresses a long-standing issue. Note
|
||||
that suppression relies on proper context propagation. Certain libraries used in
|
||||
OTLP Exporters utilize `tracing` but do not adopt OpenTelemetry's context
|
||||
propagation. As a result, not all telemetry is automatically suppressed with
|
||||
this feature. Improvements in this area are expected in future releases.
|
||||
|
||||
## Next Release
|
||||
|
||||
In the [next
|
||||
release](https://github.com/open-telemetry/opentelemetry-rust/milestone/22), the
|
||||
focus will shift to OTLP Exporters and Distributed Tracing, specifically
|
||||
resolving
|
||||
[interoperability](https://github.com/open-telemetry/opentelemetry-rust/issues/2420)
|
||||
issues with `tokio-tracing` and other fixes required to drive Distributed
|
||||
Tracing towards stability.
|
||||
|
||||
## Acknowledgments
|
||||
|
||||
Thank you to everyone who contributed to this milestone. We welcome your
|
||||
feedback through GitHub issues or discussions in the OTel-Rust Slack channel
|
||||
[here](https://cloud-native.slack.com/archives/C03GDP0H023).
|
||||
|
||||
We are also excited to announce that [Anton Grübel](https://github.com/gruebel)
|
||||
and [Björn Antonsson](https://github.com/bantonsson) have joined the OTel Rust
|
||||
project as Approvers.
|
||||
|
|
@ -12,3 +12,6 @@ Run the following, and the Metrics will be written out to stdout.
|
|||
```shell
|
||||
$ cargo run
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -85,23 +85,15 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
|||
.with_description("My histogram example description")
|
||||
.build();
|
||||
|
||||
// Record measurements using the histogram instrument. This metric will have
|
||||
// a cardinality limit of 2, as set in the view. Because of this, only the
|
||||
// first two distinct attribute combinations will be recorded, and the rest
|
||||
// will be folded into the overflow attribute. Any number of measurements
|
||||
// can be recorded as long as they use the same or already-seen attribute
|
||||
// combinations.
|
||||
// Record measurements using the histogram instrument.
|
||||
// This metric will have a cardinality limit of 2,
|
||||
// as set in the view. Because of this, only the first two
|
||||
// measurements will be recorded, and the rest will be folded
|
||||
// into the overflow attribute.
|
||||
histogram2.record(1.5, &[KeyValue::new("mykey1", "v1")]);
|
||||
|
||||
histogram2.record(1.2, &[KeyValue::new("mykey1", "v2")]);
|
||||
|
||||
// Repeatedly emitting measurements for "v1" and "v2" will not
|
||||
// trigger overflow, as they are already seen attribute combinations.
|
||||
histogram2.record(1.7, &[KeyValue::new("mykey1", "v1")]);
|
||||
histogram2.record(1.8, &[KeyValue::new("mykey1", "v2")]);
|
||||
|
||||
// Emitting measurements for new attribute combinations will trigger
|
||||
// overflow, as the cardinality limit of 2 has been reached.
|
||||
// All the below measurements will be folded into the overflow attribute.
|
||||
histogram2.record(1.23, &[KeyValue::new("mykey1", "v3")]);
|
||||
|
||||
histogram2.record(1.4, &[KeyValue::new("mykey1", "v4")]);
|
||||
|
|
@ -112,9 +104,9 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
|||
|
||||
histogram2.record(1.8, &[KeyValue::new("mykey1", "v7")]);
|
||||
|
||||
// Metrics are exported by default every 60 seconds when using stdout exporter,
|
||||
// Metrics are exported by default every 30 seconds when using stdout exporter,
|
||||
// however shutting down the MeterProvider here instantly flushes
|
||||
// the metrics, instead of waiting for the 60 sec interval.
|
||||
// the metrics, instead of waiting for the 30 sec interval.
|
||||
meter_provider.shutdown()?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,3 +11,6 @@ Run the following, and the Metrics will be written out to stdout.
|
|||
```shell
|
||||
$ cargo run
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -136,9 +136,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
|
|||
})
|
||||
.build();
|
||||
|
||||
// Metrics are exported by default every 60 seconds when using stdout
|
||||
// Metrics are exported by default every 30 seconds when using stdout
|
||||
// exporter, however shutting down the MeterProvider here instantly flushes
|
||||
// the metrics, instead of waiting for the 60 sec interval. Shutdown returns
|
||||
// the metrics, instead of waiting for the 30 sec interval. Shutdown returns
|
||||
// a result, which is bubbled up to the caller The commented code below
|
||||
// demonstrates handling the shutdown result, instead of bubbling up the
|
||||
// error.
|
||||
|
|
|
|||
|
|
@ -687,7 +687,7 @@ mod any_value {
|
|||
) -> Result<(), Self::Error> {
|
||||
let key = match key.serialize(ValueSerializer)? {
|
||||
Some(AnyValue::String(key)) => Key::from(String::from(key)),
|
||||
key => Key::from(format!("{key:?}")),
|
||||
key => Key::from(format!("{:?}", key)),
|
||||
};
|
||||
|
||||
self.key = Some(key);
|
||||
|
|
|
|||
|
|
@ -2,12 +2,6 @@
|
|||
|
||||
## vNext
|
||||
|
||||
## 0.30.1
|
||||
|
||||
Released 2025-June-05
|
||||
|
||||
- Bump `tracing-opentelemetry` to 0.31
|
||||
|
||||
## 0.30.0
|
||||
|
||||
Released 2025-May-23
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "opentelemetry-appender-tracing"
|
||||
version = "0.30.1"
|
||||
version = "0.30.0"
|
||||
edition = "2021"
|
||||
description = "An OpenTelemetry log appender for the tracing crate"
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-tracing"
|
||||
|
|
@ -18,7 +18,7 @@ tracing = { workspace = true, features = ["std"]}
|
|||
tracing-core = { workspace = true }
|
||||
tracing-log = { workspace = true, optional = true }
|
||||
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
|
||||
tracing-opentelemetry = { workspace = true, optional = true }
|
||||
# tracing-opentelemetry = { workspace = true, optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
log = { workspace = true }
|
||||
|
|
@ -37,7 +37,8 @@ pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
|
|||
default = []
|
||||
experimental_metadata_attributes = ["dep:tracing-log"]
|
||||
spec_unstable_logs_enabled = ["opentelemetry/spec_unstable_logs_enabled"]
|
||||
experimental_use_tracing_span_context = ["tracing-opentelemetry"]
|
||||
# TODO: Enable this back in 0.30.1 after tracing-opentelemetry is released
|
||||
# experimental_use_tracing_span_context = ["tracing-opentelemetry"]
|
||||
|
||||
|
||||
[[bench]]
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ fn create_benchmark(c: &mut Criterion, num_attributes: usize) {
|
|||
let subscriber = Registry::default().with(ot_layer);
|
||||
|
||||
tracing::subscriber::with_default(subscriber, || {
|
||||
c.bench_function(&format!("otel_{num_attributes}_attributes"), |b| {
|
||||
c.bench_function(&format!("otel_{}_attributes", num_attributes), |b| {
|
||||
b.iter(|| {
|
||||
// Dynamically generate the error! macro call based on the number of attributes
|
||||
match num_attributes {
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ impl<LR: LogRecord> tracing::field::Visit for EventVisitor<'_, LR> {
|
|||
return;
|
||||
}
|
||||
if field.name() == "message" {
|
||||
self.log_record.set_body(format!("{value:?}").into());
|
||||
self.log_record.set_body(format!("{:?}", value).into());
|
||||
} else {
|
||||
self.log_record
|
||||
.add_attribute(Key::new(field.name()), AnyValue::from(format!("{value:?}")));
|
||||
|
|
@ -244,28 +244,28 @@ where
|
|||
// Visit fields.
|
||||
event.record(&mut visitor);
|
||||
|
||||
#[cfg(feature = "experimental_use_tracing_span_context")]
|
||||
if let Some(span) = _ctx.event_span(event) {
|
||||
use opentelemetry::trace::TraceContextExt;
|
||||
use tracing_opentelemetry::OtelData;
|
||||
if let Some(otd) = span.extensions().get::<OtelData>() {
|
||||
if let Some(span_id) = otd.builder.span_id {
|
||||
let opt_trace_id = if otd.parent_cx.has_active_span() {
|
||||
Some(otd.parent_cx.span().span_context().trace_id())
|
||||
} else {
|
||||
span.scope().last().and_then(|root_span| {
|
||||
root_span
|
||||
.extensions()
|
||||
.get::<OtelData>()
|
||||
.and_then(|otd| otd.builder.trace_id)
|
||||
})
|
||||
};
|
||||
if let Some(trace_id) = opt_trace_id {
|
||||
log_record.set_trace_context(trace_id, span_id, None);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// #[cfg(feature = "experimental_use_tracing_span_context")]
|
||||
// if let Some(span) = _ctx.event_span(event) {
|
||||
// use opentelemetry::trace::TraceContextExt;
|
||||
// use tracing_opentelemetry::OtelData;
|
||||
// if let Some(otd) = span.extensions().get::<OtelData>() {
|
||||
// if let Some(span_id) = otd.builder.span_id {
|
||||
// let opt_trace_id = if otd.parent_cx.has_active_span() {
|
||||
// Some(otd.parent_cx.span().span_context().trace_id())
|
||||
// } else {
|
||||
// span.scope().last().and_then(|root_span| {
|
||||
// root_span
|
||||
// .extensions()
|
||||
// .get::<OtelData>()
|
||||
// .and_then(|otd| otd.builder.trace_id)
|
||||
// })
|
||||
// };
|
||||
// if let Some(trace_id) = opt_trace_id {
|
||||
// log_record.set_trace_context(trace_id, span_id, None);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
//emit record
|
||||
self.logger.emit(log_record);
|
||||
|
|
@ -611,117 +611,117 @@ mod tests {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "experimental_use_tracing_span_context")]
|
||||
#[test]
|
||||
fn tracing_appender_inside_tracing_crate_context() {
|
||||
use opentelemetry::{trace::SpanContext, Context, SpanId, TraceId};
|
||||
use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
|
||||
use tracing_opentelemetry::OpenTelemetrySpanExt;
|
||||
// #[cfg(feature = "experimental_use_tracing_span_context")]
|
||||
// #[test]
|
||||
// fn tracing_appender_inside_tracing_crate_context() {
|
||||
// use opentelemetry::{trace::SpanContext, Context, SpanId, TraceId};
|
||||
// use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
|
||||
// use tracing_opentelemetry::OpenTelemetrySpanExt;
|
||||
|
||||
// Arrange
|
||||
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
|
||||
let logger_provider = SdkLoggerProvider::builder()
|
||||
.with_simple_exporter(exporter.clone())
|
||||
.build();
|
||||
// // Arrange
|
||||
// let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
|
||||
// let logger_provider = SdkLoggerProvider::builder()
|
||||
// .with_simple_exporter(exporter.clone())
|
||||
// .build();
|
||||
|
||||
// setup tracing layer to compare trace/span IDs against
|
||||
let span_exporter = InMemorySpanExporterBuilder::new().build();
|
||||
let tracer_provider = SdkTracerProvider::builder()
|
||||
.with_simple_exporter(span_exporter.clone())
|
||||
.build();
|
||||
let tracer = tracer_provider.tracer("test-tracer");
|
||||
// // setup tracing layer to compare trace/span IDs against
|
||||
// let span_exporter = InMemorySpanExporterBuilder::new().build();
|
||||
// let tracer_provider = SdkTracerProvider::builder()
|
||||
// .with_simple_exporter(span_exporter.clone())
|
||||
// .build();
|
||||
// let tracer = tracer_provider.tracer("test-tracer");
|
||||
|
||||
let level_filter = tracing_subscriber::filter::LevelFilter::ERROR;
|
||||
let log_layer =
|
||||
layer::OpenTelemetryTracingBridge::new(&logger_provider).with_filter(level_filter);
|
||||
// let level_filter = tracing_subscriber::filter::LevelFilter::ERROR;
|
||||
// let log_layer =
|
||||
// layer::OpenTelemetryTracingBridge::new(&logger_provider).with_filter(level_filter);
|
||||
|
||||
let subscriber = tracing_subscriber::registry()
|
||||
.with(log_layer)
|
||||
.with(tracing_opentelemetry::layer().with_tracer(tracer));
|
||||
// let subscriber = tracing_subscriber::registry()
|
||||
// .with(log_layer)
|
||||
// .with(tracing_opentelemetry::layer().with_tracer(tracer));
|
||||
|
||||
// Avoiding global subscriber.init() as that does not play well with unit tests.
|
||||
let _guard = tracing::subscriber::set_default(subscriber);
|
||||
// // Avoiding global subscriber.init() as that does not play well with unit tests.
|
||||
// let _guard = tracing::subscriber::set_default(subscriber);
|
||||
|
||||
// Act
|
||||
tracing::error_span!("outer-span").in_scope(|| {
|
||||
error!("first-event");
|
||||
// // Act
|
||||
// tracing::error_span!("outer-span").in_scope(|| {
|
||||
// error!("first-event");
|
||||
|
||||
tracing::error_span!("inner-span").in_scope(|| {
|
||||
error!("second-event");
|
||||
});
|
||||
});
|
||||
// tracing::error_span!("inner-span").in_scope(|| {
|
||||
// error!("second-event");
|
||||
// });
|
||||
// });
|
||||
|
||||
assert!(logger_provider.force_flush().is_ok());
|
||||
// assert!(logger_provider.force_flush().is_ok());
|
||||
|
||||
let logs = exporter.get_emitted_logs().expect("No emitted logs");
|
||||
assert_eq!(logs.len(), 2, "Expected 2 logs, got: {logs:?}");
|
||||
// let logs = exporter.get_emitted_logs().expect("No emitted logs");
|
||||
// assert_eq!(logs.len(), 2, "Expected 2 logs, got: {logs:?}");
|
||||
|
||||
let spans = span_exporter.get_finished_spans().unwrap();
|
||||
assert_eq!(spans.len(), 2);
|
||||
// let spans = span_exporter.get_finished_spans().unwrap();
|
||||
// assert_eq!(spans.len(), 2);
|
||||
|
||||
let trace_id = spans[0].span_context.trace_id();
|
||||
assert_eq!(trace_id, spans[1].span_context.trace_id());
|
||||
let inner_span_id = spans[0].span_context.span_id();
|
||||
let outer_span_id = spans[1].span_context.span_id();
|
||||
assert_eq!(outer_span_id, spans[0].parent_span_id);
|
||||
// let trace_id = spans[0].span_context.trace_id();
|
||||
// assert_eq!(trace_id, spans[1].span_context.trace_id());
|
||||
// let inner_span_id = spans[0].span_context.span_id();
|
||||
// let outer_span_id = spans[1].span_context.span_id();
|
||||
// assert_eq!(outer_span_id, spans[0].parent_span_id);
|
||||
|
||||
let trace_ctx0 = logs[0].record.trace_context().unwrap();
|
||||
let trace_ctx1 = logs[1].record.trace_context().unwrap();
|
||||
// let trace_ctx0 = logs[0].record.trace_context().unwrap();
|
||||
// let trace_ctx1 = logs[1].record.trace_context().unwrap();
|
||||
|
||||
assert_eq!(trace_ctx0.trace_id, trace_id);
|
||||
assert_eq!(trace_ctx1.trace_id, trace_id);
|
||||
assert_eq!(trace_ctx0.span_id, outer_span_id);
|
||||
assert_eq!(trace_ctx1.span_id, inner_span_id);
|
||||
// assert_eq!(trace_ctx0.trace_id, trace_id);
|
||||
// assert_eq!(trace_ctx1.trace_id, trace_id);
|
||||
// assert_eq!(trace_ctx0.span_id, outer_span_id);
|
||||
// assert_eq!(trace_ctx1.span_id, inner_span_id);
|
||||
|
||||
// Set context from remote.
|
||||
let remote_trace_id = TraceId::from_u128(233);
|
||||
let remote_span_id = SpanId::from_u64(2333);
|
||||
let remote_span_context = SpanContext::new(
|
||||
remote_trace_id,
|
||||
remote_span_id,
|
||||
TraceFlags::SAMPLED,
|
||||
true,
|
||||
Default::default(),
|
||||
);
|
||||
// // Set context from remote.
|
||||
// let remote_trace_id = TraceId::from_u128(233);
|
||||
// let remote_span_id = SpanId::from_u64(2333);
|
||||
// let remote_span_context = SpanContext::new(
|
||||
// remote_trace_id,
|
||||
// remote_span_id,
|
||||
// TraceFlags::SAMPLED,
|
||||
// true,
|
||||
// Default::default(),
|
||||
// );
|
||||
|
||||
// Act again.
|
||||
tracing::error_span!("outer-span").in_scope(|| {
|
||||
let span = tracing::Span::current();
|
||||
let parent_context = Context::current().with_remote_span_context(remote_span_context);
|
||||
span.set_parent(parent_context);
|
||||
// // Act again.
|
||||
// tracing::error_span!("outer-span").in_scope(|| {
|
||||
// let span = tracing::Span::current();
|
||||
// let parent_context = Context::current().with_remote_span_context(remote_span_context);
|
||||
// span.set_parent(parent_context);
|
||||
|
||||
error!("first-event");
|
||||
// error!("first-event");
|
||||
|
||||
tracing::error_span!("inner-span").in_scope(|| {
|
||||
error!("second-event");
|
||||
});
|
||||
});
|
||||
// tracing::error_span!("inner-span").in_scope(|| {
|
||||
// error!("second-event");
|
||||
// });
|
||||
// });
|
||||
|
||||
assert!(logger_provider.force_flush().is_ok());
|
||||
// assert!(logger_provider.force_flush().is_ok());
|
||||
|
||||
let logs = exporter.get_emitted_logs().expect("No emitted logs");
|
||||
assert_eq!(logs.len(), 4, "Expected 4 logs, got: {logs:?}");
|
||||
let logs = &logs[2..];
|
||||
// let logs = exporter.get_emitted_logs().expect("No emitted logs");
|
||||
// assert_eq!(logs.len(), 4, "Expected 4 logs, got: {logs:?}");
|
||||
// let logs = &logs[2..];
|
||||
|
||||
let spans = span_exporter.get_finished_spans().unwrap();
|
||||
assert_eq!(spans.len(), 4);
|
||||
let spans = &spans[2..];
|
||||
// let spans = span_exporter.get_finished_spans().unwrap();
|
||||
// assert_eq!(spans.len(), 4);
|
||||
// let spans = &spans[2..];
|
||||
|
||||
let trace_id = spans[0].span_context.trace_id();
|
||||
assert_eq!(trace_id, remote_trace_id);
|
||||
assert_eq!(trace_id, spans[1].span_context.trace_id());
|
||||
let inner_span_id = spans[0].span_context.span_id();
|
||||
let outer_span_id = spans[1].span_context.span_id();
|
||||
assert_eq!(outer_span_id, spans[0].parent_span_id);
|
||||
// let trace_id = spans[0].span_context.trace_id();
|
||||
// assert_eq!(trace_id, remote_trace_id);
|
||||
// assert_eq!(trace_id, spans[1].span_context.trace_id());
|
||||
// let inner_span_id = spans[0].span_context.span_id();
|
||||
// let outer_span_id = spans[1].span_context.span_id();
|
||||
// assert_eq!(outer_span_id, spans[0].parent_span_id);
|
||||
|
||||
let trace_ctx0 = logs[0].record.trace_context().unwrap();
|
||||
let trace_ctx1 = logs[1].record.trace_context().unwrap();
|
||||
// let trace_ctx0 = logs[0].record.trace_context().unwrap();
|
||||
// let trace_ctx1 = logs[1].record.trace_context().unwrap();
|
||||
|
||||
assert_eq!(trace_ctx0.trace_id, trace_id);
|
||||
assert_eq!(trace_ctx1.trace_id, trace_id);
|
||||
assert_eq!(trace_ctx0.span_id, outer_span_id);
|
||||
assert_eq!(trace_ctx1.span_id, inner_span_id);
|
||||
}
|
||||
// assert_eq!(trace_ctx0.trace_id, trace_id);
|
||||
// assert_eq!(trace_ctx1.trace_id, trace_id);
|
||||
// assert_eq!(trace_ctx0.span_id, outer_span_id);
|
||||
// assert_eq!(trace_ctx1.span_id, inner_span_id);
|
||||
// }
|
||||
|
||||
#[test]
|
||||
fn tracing_appender_standalone_with_tracing_log() {
|
||||
|
|
|
|||
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
## vNext
|
||||
|
||||
- Implementation of `Extractor::get_all` for `HeaderExtractor`
|
||||
- Support `HttpClient` implementation for `HyperClient<C>` with custom connectors beyond `HttpConnector`, enabling Unix Domain Socket connections and other custom transports
|
||||
|
||||
## 0.30.0
|
||||
|
||||
Released 2025-May-23
|
||||
|
|
@ -54,7 +51,7 @@ Released 2024-Sep-30
|
|||
|
||||
## v0.12.0
|
||||
|
||||
- Add `reqwest-rustls-webpki-roots` feature flag to configure [`reqwest`](https://docs.rs/reqwest/0.11.27/reqwest/index.html#optional-features) to use embedded `webpki-roots`.
|
||||
- Add `reqwest-rustls-webkpi-roots` feature flag to configure [`reqwest`](https://docs.rs/reqwest/0.11.27/reqwest/index.html#optional-features) to use embedded `webkpi-roots`.
|
||||
- Update `opentelemetry` dependency version to 0.23
|
||||
|
||||
## v0.11.1
|
||||
|
|
|
|||
|
|
@ -43,16 +43,6 @@ impl Extractor for HeaderExtractor<'_> {
|
|||
.map(|value| value.as_str())
|
||||
.collect::<Vec<_>>()
|
||||
}
|
||||
|
||||
/// Get all the values for a key from the HeaderMap
|
||||
fn get_all(&self, key: &str) -> Option<Vec<&str>> {
|
||||
let all_iter = self.0.get_all(key).iter();
|
||||
if let (0, Some(0)) = all_iter.size_hint() {
|
||||
return None;
|
||||
}
|
||||
|
||||
Some(all_iter.filter_map(|value| value.to_str().ok()).collect())
|
||||
}
|
||||
}
|
||||
|
||||
pub type HttpError = Box<dyn std::error::Error + Send + Sync + 'static>;
|
||||
|
|
@ -179,11 +169,7 @@ pub mod hyper {
|
|||
}
|
||||
|
||||
#[async_trait]
|
||||
impl<C> HttpClient for HyperClient<C>
|
||||
where
|
||||
C: Connect + Clone + Send + Sync + 'static,
|
||||
HyperClient<C>: Debug,
|
||||
{
|
||||
impl HttpClient for HyperClient {
|
||||
async fn send_bytes(&self, request: Request<Bytes>) -> Result<Response<Bytes>, HttpError> {
|
||||
otel_debug!(name: "HyperClient.Send");
|
||||
let (parts, body) = request.into_parts();
|
||||
|
|
@ -250,8 +236,6 @@ impl<T> ResponseExt for Response<T> {
|
|||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use http::HeaderValue;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
|
|
@ -266,32 +250,6 @@ mod tests {
|
|||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn http_headers_get_all() {
|
||||
let mut carrier = http::HeaderMap::new();
|
||||
carrier.append("headerName", HeaderValue::from_static("value"));
|
||||
carrier.append("headerName", HeaderValue::from_static("value2"));
|
||||
carrier.append("headerName", HeaderValue::from_static("value3"));
|
||||
|
||||
assert_eq!(
|
||||
HeaderExtractor(&carrier).get_all("HEADERNAME"),
|
||||
Some(vec!["value", "value2", "value3"]),
|
||||
"all values from a key extraction"
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn http_headers_get_all_missing_key() {
|
||||
let mut carrier = http::HeaderMap::new();
|
||||
carrier.append("headerName", HeaderValue::from_static("value"));
|
||||
|
||||
assert_eq!(
|
||||
HeaderExtractor(&carrier).get_all("not_existing"),
|
||||
None,
|
||||
"all values from a missing key extraction"
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn http_headers_keys() {
|
||||
let mut carrier = http::HeaderMap::new();
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ mod tests {
|
|||
true,
|
||||
TraceState::default(),
|
||||
),
|
||||
format!("{LONG_TRACE_ID_STR}:{SPAN_ID_STR}:0:1"),
|
||||
format!("{}:{}:0:1", LONG_TRACE_ID_STR, SPAN_ID_STR),
|
||||
),
|
||||
(
|
||||
SpanContext::new(
|
||||
|
|
@ -335,7 +335,7 @@ mod tests {
|
|||
true,
|
||||
TraceState::default(),
|
||||
),
|
||||
format!("{LONG_TRACE_ID_STR}:{SPAN_ID_STR}:0:0"),
|
||||
format!("{}:{}:0:0", LONG_TRACE_ID_STR, SPAN_ID_STR),
|
||||
),
|
||||
(
|
||||
SpanContext::new(
|
||||
|
|
@ -345,7 +345,7 @@ mod tests {
|
|||
true,
|
||||
TraceState::default(),
|
||||
),
|
||||
format!("{LONG_TRACE_ID_STR}:{SPAN_ID_STR}:0:3"),
|
||||
format!("{}:{}:0:3", LONG_TRACE_ID_STR, SPAN_ID_STR),
|
||||
),
|
||||
]
|
||||
}
|
||||
|
|
@ -356,7 +356,7 @@ mod tests {
|
|||
let propagator = Propagator::with_custom_header(construct_header);
|
||||
for (trace_id, span_id, flag, expected) in get_extract_data() {
|
||||
let mut map: HashMap<String, String> = HashMap::new();
|
||||
map.set(context_key, format!("{trace_id}:{span_id}:0:{flag}"));
|
||||
map.set(context_key, format!("{}:{}:0:{}", trace_id, span_id, flag));
|
||||
let context = propagator.extract(&map);
|
||||
assert_eq!(context.span().span_context(), &expected);
|
||||
}
|
||||
|
|
@ -392,7 +392,7 @@ mod tests {
|
|||
|
||||
// Propagators implement debug
|
||||
assert_eq!(
|
||||
format!("{default_propagator:?}"),
|
||||
format!("{:?}", default_propagator),
|
||||
format!(
|
||||
"Propagator {{ baggage_prefix: \"{}\", header_name: \"{}\", fields: [\"{}\"] }}",
|
||||
JAEGER_BAGGAGE_PREFIX, JAEGER_HEADER, JAEGER_HEADER
|
||||
|
|
@ -641,7 +641,10 @@ mod tests {
|
|||
}
|
||||
for (trace_id, span_id, flag, expected) in get_extract_data() {
|
||||
let mut map: HashMap<String, String> = HashMap::new();
|
||||
map.set(JAEGER_HEADER, format!("{trace_id}:{span_id}:0:{flag}"));
|
||||
map.set(
|
||||
JAEGER_HEADER,
|
||||
format!("{}:{}:0:{}", trace_id, span_id, flag),
|
||||
);
|
||||
let context = propagator.extract(&map);
|
||||
assert_eq!(context.span().span_context(), &expected);
|
||||
}
|
||||
|
|
@ -652,7 +655,7 @@ mod tests {
|
|||
let mut map: HashMap<String, String> = HashMap::new();
|
||||
map.set(
|
||||
JAEGER_HEADER,
|
||||
format!("{LONG_TRACE_ID_STR}:{SPAN_ID_STR}:0:1:aa"),
|
||||
format!("{}:{}:0:1:aa", LONG_TRACE_ID_STR, SPAN_ID_STR),
|
||||
);
|
||||
let propagator = Propagator::new();
|
||||
let context = propagator.extract(&map);
|
||||
|
|
@ -664,7 +667,7 @@ mod tests {
|
|||
let mut map: HashMap<String, String> = HashMap::new();
|
||||
map.set(
|
||||
JAEGER_HEADER,
|
||||
format!("{LONG_TRACE_ID_STR}:{SPAN_ID_STR}:0:aa"),
|
||||
format!("{}:{}:0:aa", LONG_TRACE_ID_STR, SPAN_ID_STR),
|
||||
);
|
||||
let propagator = Propagator::new();
|
||||
let context = propagator.extract(&map);
|
||||
|
|
@ -676,7 +679,7 @@ mod tests {
|
|||
let mut map: HashMap<String, String> = HashMap::new();
|
||||
map.set(
|
||||
JAEGER_HEADER,
|
||||
format!("{LONG_TRACE_ID_STR}%3A{SPAN_ID_STR}%3A0%3A1"),
|
||||
format!("{}%3A{}%3A0%3A1", LONG_TRACE_ID_STR, SPAN_ID_STR),
|
||||
);
|
||||
let propagator = Propagator::new();
|
||||
let context = propagator.extract(&map);
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ Released 2025-Mar-21
|
|||
- Update `opentelemetry-http` dependency version to 0.29
|
||||
- Update `opentelemetry-proto` dependency version to 0.29
|
||||
|
||||
- The `OTEL_EXPORTER_OTLP_TIMEOUT`, `OTEL_EXPORTER_OTLP_TRACES_TIMEOUT`, `OTEL_EXPORTER_OTLP_METRICS_TIMEOUT` and `OTEL_EXPORTER_OTLP_LOGS_TIMEOUT` are changed from seconds to milliseconds.
|
||||
- The `OTEL_EXPORTER_OTLP_TIMEOUT`, `OTEL_EXPORTER_OTLP_TRACES_TIMEOUT`, `OTEL_EXPORTER_OTLP_METRICS_TIMEOUT` and `OTEL_EXPORTER_OTLP_LOGS_TIMEOUT` are changed from seconds to miliseconds.
|
||||
- Fixed `.with_headers()` in `HttpExporterBuilder` to correctly support multiple key/value pairs. [#2699](https://github.com/open-telemetry/opentelemetry-rust/pull/2699)
|
||||
- Fixed
|
||||
[#2770](https://github.com/open-telemetry/opentelemetry-rust/issues/2770)
|
||||
|
|
@ -199,7 +199,7 @@ now use `.with_resource(RESOURCE::default())` to configure Resource when using
|
|||
### Added
|
||||
|
||||
- Added `DeltaTemporalitySelector` ([#1568])
|
||||
- Add `webpki-roots` features to `reqwest` and `tonic` backends
|
||||
- Add `webkpi-roots` features to `reqwest` and `tonic` backends
|
||||
|
||||
[#1568]: https://github.com/open-telemetry/opentelemetry-rust/pull/1568
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,8 @@ serde_json = { workspace = true, optional = true }
|
|||
|
||||
[dev-dependencies]
|
||||
tokio-stream = { workspace = true, features = ["net"] }
|
||||
opentelemetry_sdk = { features = ["trace", "testing"], path = "../opentelemetry-sdk" }
|
||||
# need tokio runtime to run smoke tests.
|
||||
opentelemetry_sdk = { features = ["trace", "rt-tokio", "testing"], path = "../opentelemetry-sdk" }
|
||||
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
|
||||
futures-util = { workspace = true }
|
||||
temp-env = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -169,15 +169,15 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
|||
// Collect all shutdown errors
|
||||
let mut shutdown_errors = Vec::new();
|
||||
if let Err(e) = tracer_provider.shutdown() {
|
||||
shutdown_errors.push(format!("tracer provider: {e}"));
|
||||
shutdown_errors.push(format!("tracer provider: {}", e));
|
||||
}
|
||||
|
||||
if let Err(e) = meter_provider.shutdown() {
|
||||
shutdown_errors.push(format!("meter provider: {e}"));
|
||||
shutdown_errors.push(format!("meter provider: {}", e));
|
||||
}
|
||||
|
||||
if let Err(e) = logger_provider.shutdown() {
|
||||
shutdown_errors.push(format!("logger provider: {e}"));
|
||||
shutdown_errors.push(format!("logger provider: {}", e));
|
||||
}
|
||||
|
||||
// Return an error if any shutdown failed
|
||||
|
|
|
|||
|
|
@ -162,15 +162,15 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
|
|||
// Collect all shutdown errors
|
||||
let mut shutdown_errors = Vec::new();
|
||||
if let Err(e) = tracer_provider.shutdown() {
|
||||
shutdown_errors.push(format!("tracer provider: {e}"));
|
||||
shutdown_errors.push(format!("tracer provider: {}", e));
|
||||
}
|
||||
|
||||
if let Err(e) = meter_provider.shutdown() {
|
||||
shutdown_errors.push(format!("meter provider: {e}"));
|
||||
shutdown_errors.push(format!("meter provider: {}", e));
|
||||
}
|
||||
|
||||
if let Err(e) = logger_provider.shutdown() {
|
||||
shutdown_errors.push(format!("logger provider: {e}"));
|
||||
shutdown_errors.push(format!("logger provider: {}", e));
|
||||
}
|
||||
|
||||
// Return an error if any shutdown failed
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ impl LogExporter for OtlpHttpClient {
|
|||
let client = self
|
||||
.client
|
||||
.lock()
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Mutex lock failed: {e}")))?
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Mutex lock failed: {}", e)))?
|
||||
.clone()
|
||||
.ok_or(OTelSdkError::AlreadyShutdown)?;
|
||||
|
||||
|
|
@ -30,12 +30,11 @@ impl LogExporter for OtlpHttpClient {
|
|||
}
|
||||
|
||||
let request_uri = request.uri().to_string();
|
||||
otel_debug!(name: "HttpLogsClient.ExportStarted");
|
||||
otel_debug!(name: "HttpLogsClient.CallingExport");
|
||||
let response = client
|
||||
.send_bytes(request)
|
||||
.await
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("{e:?}")))?;
|
||||
|
||||
if !response.status().is_success() {
|
||||
let error = format!(
|
||||
"OpenTelemetry logs export failed. Url: {}, Status Code: {}, Response: {:?}",
|
||||
|
|
@ -43,17 +42,14 @@ impl LogExporter for OtlpHttpClient {
|
|||
response.status().as_u16(),
|
||||
response.body()
|
||||
);
|
||||
otel_debug!(name: "HttpLogsClient.ExportFailed", error = &error);
|
||||
return Err(OTelSdkError::InternalFailure(error));
|
||||
}
|
||||
|
||||
otel_debug!(name: "HttpLogsClient.ExportSucceeded");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
|
||||
let mut client_guard = self.client.lock().map_err(|e| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {e}"))
|
||||
OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {}", e))
|
||||
})?;
|
||||
|
||||
if client_guard.take().is_none() {
|
||||
|
|
|
|||
|
|
@ -33,36 +33,19 @@ impl MetricsClient for OtlpHttpClient {
|
|||
request.headers_mut().insert(k.clone(), v.clone());
|
||||
}
|
||||
|
||||
otel_debug!(name: "HttpMetricsClient.ExportStarted");
|
||||
let result = client.send_bytes(request).await;
|
||||
otel_debug!(name: "HttpMetricsClient.CallingExport");
|
||||
client
|
||||
.send_bytes(request)
|
||||
.await
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("{e:?}")))?;
|
||||
|
||||
match result {
|
||||
Ok(response) => {
|
||||
if response.status().is_success() {
|
||||
otel_debug!(name: "HttpMetricsClient.ExportSucceeded");
|
||||
Ok(())
|
||||
} else {
|
||||
let error = format!(
|
||||
"OpenTelemetry metrics export failed. Status Code: {}, Response: {:?}",
|
||||
response.status().as_u16(),
|
||||
response.body()
|
||||
);
|
||||
otel_debug!(name: "HttpMetricsClient.ExportFailed", error = &error);
|
||||
Err(OTelSdkError::InternalFailure(error))
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
let error = format!("{e:?}");
|
||||
otel_debug!(name: "HttpMetricsClient.ExportFailed", error = &error);
|
||||
Err(OTelSdkError::InternalFailure(error))
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn shutdown(&self) -> OTelSdkResult {
|
||||
self.client
|
||||
.lock()
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {e}")))?
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {}", e)))?
|
||||
.take();
|
||||
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ fn resolve_http_endpoint(
|
|||
provided_endpoint: Option<&str>,
|
||||
) -> Result<Uri, ExporterBuildError> {
|
||||
// programmatic configuration overrides any value set via environment variables
|
||||
if let Some(provider_endpoint) = provided_endpoint.filter(|s| !s.is_empty()) {
|
||||
if let Some(provider_endpoint) = provided_endpoint {
|
||||
provider_endpoint
|
||||
.parse()
|
||||
.map_err(|er: http::uri::InvalidUri| {
|
||||
|
|
@ -528,15 +528,6 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_use_default_when_empty_string_for_option() {
|
||||
run_env_test(vec![], || {
|
||||
let endpoint =
|
||||
super::resolve_http_endpoint("non_existent_var", "/v1/traces", Some("")).unwrap();
|
||||
assert_eq!(endpoint, "http://localhost:4318/v1/traces");
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_use_default_when_others_missing() {
|
||||
run_env_test(vec![], || {
|
||||
|
|
@ -615,14 +606,17 @@ mod tests {
|
|||
assert_eq!(
|
||||
headers.len(),
|
||||
expected_headers.len(),
|
||||
"Failed on input: {input_str}"
|
||||
"Failed on input: {}",
|
||||
input_str
|
||||
);
|
||||
|
||||
for (expected_key, expected_value) in expected_headers {
|
||||
assert_eq!(
|
||||
headers.get(&HeaderName::from_static(expected_key)),
|
||||
Some(&HeaderValue::from_static(expected_value)),
|
||||
"Failed on key: {expected_key} with input: {input_str}"
|
||||
"Failed on key: {} with input: {}",
|
||||
expected_key,
|
||||
input_str
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -662,14 +656,17 @@ mod tests {
|
|||
assert_eq!(
|
||||
headers.len(),
|
||||
expected_headers.len(),
|
||||
"Failed on input: {input_str}"
|
||||
"Failed on input: {}",
|
||||
input_str
|
||||
);
|
||||
|
||||
for (expected_key, expected_value) in expected_headers {
|
||||
assert_eq!(
|
||||
headers.get(&HeaderName::from_static(expected_key)),
|
||||
Some(&HeaderValue::from_static(expected_value)),
|
||||
"Failed on key: {expected_key} with input: {input_str}"
|
||||
"Failed on key: {} with input: {}",
|
||||
expected_key,
|
||||
input_str
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ impl SpanExporter for OtlpHttpClient {
|
|||
let client = match self
|
||||
.client
|
||||
.lock()
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Mutex lock failed: {e}")))
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Mutex lock failed: {}", e)))
|
||||
.and_then(|g| match &*g {
|
||||
Some(client) => Ok(Arc::clone(client)),
|
||||
_ => Err(OTelSdkError::AlreadyShutdown),
|
||||
|
|
@ -42,7 +42,7 @@ impl SpanExporter for OtlpHttpClient {
|
|||
}
|
||||
|
||||
let request_uri = request.uri().to_string();
|
||||
otel_debug!(name: "HttpTracesClient.ExportStarted");
|
||||
otel_debug!(name: "HttpTracesClient.CallingExport");
|
||||
let response = client
|
||||
.send_bytes(request)
|
||||
.await
|
||||
|
|
@ -51,21 +51,19 @@ impl SpanExporter for OtlpHttpClient {
|
|||
if !response.status().is_success() {
|
||||
let error = format!(
|
||||
"OpenTelemetry trace export failed. Url: {}, Status Code: {}, Response: {:?}",
|
||||
request_uri,
|
||||
response.status().as_u16(),
|
||||
request_uri,
|
||||
response.body()
|
||||
);
|
||||
otel_debug!(name: "HttpTracesClient.ExportFailed", error = &error);
|
||||
return Err(OTelSdkError::InternalFailure(error));
|
||||
}
|
||||
|
||||
otel_debug!(name: "HttpTracesClient.ExportSucceeded");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn shutdown(&mut self) -> OTelSdkResult {
|
||||
let mut client_guard = self.client.lock().map_err(|e| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {e}"))
|
||||
OTelSdkError::InternalFailure(format!("Failed to acquire client lock: {}", e))
|
||||
})?;
|
||||
|
||||
if client_guard.take().is_none() {
|
||||
|
|
|
|||
|
|
@ -396,7 +396,8 @@ mod tests {
|
|||
exporter_result,
|
||||
Err(crate::exporter::ExporterBuildError::InvalidUri(_, _))
|
||||
),
|
||||
"Expected InvalidUri error, but got {exporter_result:?}"
|
||||
"Expected InvalidUri error, but got {:?}",
|
||||
exporter_result
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ impl LogExporter for TonicLogsClient {
|
|||
let (m, e, _) = inner
|
||||
.interceptor
|
||||
.call(Request::new(()))
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("error: {e:?}")))?
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("error: {:?}", e)))?
|
||||
.into_parts();
|
||||
(inner.client.clone(), m, e)
|
||||
}
|
||||
|
|
@ -72,27 +72,17 @@ impl LogExporter for TonicLogsClient {
|
|||
|
||||
let resource_logs = group_logs_by_resource_and_scope(batch, &self.resource);
|
||||
|
||||
otel_debug!(name: "TonicLogsClient.ExportStarted");
|
||||
otel_debug!(name: "TonicsLogsClient.CallingExport");
|
||||
|
||||
let result = client
|
||||
client
|
||||
.export(Request::from_parts(
|
||||
metadata,
|
||||
extensions,
|
||||
ExportLogsServiceRequest { resource_logs },
|
||||
))
|
||||
.await;
|
||||
|
||||
match result {
|
||||
Ok(_) => {
|
||||
otel_debug!(name: "TonicLogsClient.ExportSucceeded");
|
||||
Ok(())
|
||||
}
|
||||
Err(e) => {
|
||||
let error = format!("export error: {e:?}");
|
||||
otel_debug!(name: "TonicLogsClient.ExportFailed", error = &error);
|
||||
Err(OTelSdkError::InternalFailure(error))
|
||||
}
|
||||
}
|
||||
.await
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("export error: {:?}", e)))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn shutdown_with_timeout(&self, _timeout: time::Duration) -> OTelSdkResult {
|
||||
|
|
|
|||
|
|
@ -75,33 +75,24 @@ impl MetricsClient for TonicMetricsClient {
|
|||
)),
|
||||
})?;
|
||||
|
||||
otel_debug!(name: "TonicMetricsClient.ExportStarted");
|
||||
otel_debug!(name: "TonicsMetricsClient.CallingExport");
|
||||
|
||||
let result = client
|
||||
client
|
||||
.export(Request::from_parts(
|
||||
metadata,
|
||||
extensions,
|
||||
ExportMetricsServiceRequest::from(metrics),
|
||||
))
|
||||
.await;
|
||||
.await
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("{e:?}")))?;
|
||||
|
||||
match result {
|
||||
Ok(_) => {
|
||||
otel_debug!(name: "TonicMetricsClient.ExportSucceeded");
|
||||
Ok(())
|
||||
}
|
||||
Err(e) => {
|
||||
let error = format!("{e:?}");
|
||||
otel_debug!(name: "TonicMetricsClient.ExportFailed", error = &error);
|
||||
Err(OTelSdkError::InternalFailure(error))
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn shutdown(&self) -> OTelSdkResult {
|
||||
self.inner
|
||||
.lock()
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {e}")))?
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {}", e)))?
|
||||
.take();
|
||||
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ impl TonicExporterBuilder {
|
|||
// If users for some reason want to use a custom path, they can use env var or builder to pass it
|
||||
//
|
||||
// programmatic configuration overrides any value set via environment variables
|
||||
if let Some(endpoint) = provided_endpoint.filter(|s| !s.is_empty()) {
|
||||
if let Some(endpoint) = provided_endpoint {
|
||||
endpoint
|
||||
} else if let Ok(endpoint) = env::var(default_endpoint_var) {
|
||||
endpoint
|
||||
|
|
@ -666,15 +666,4 @@ mod tests {
|
|||
assert_eq!(url, "http://localhost:4317");
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_use_default_when_empty_string_for_option() {
|
||||
run_env_test(vec![], || {
|
||||
let url = TonicExporterBuilder::resolve_endpoint(
|
||||
OTEL_EXPORTER_OTLP_TRACES_ENDPOINT,
|
||||
Some(String::new()),
|
||||
);
|
||||
assert_eq!(url, "http://localhost:4317");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ impl SpanExporter for TonicTracesClient {
|
|||
.lock()
|
||||
.await // tokio::sync::Mutex doesn't return a poisoned error, so we can safely use the interceptor here
|
||||
.call(Request::new(()))
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("error: {e:?}")))?
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("error: {:?}", e)))?
|
||||
.into_parts();
|
||||
(inner.client.clone(), m, e)
|
||||
}
|
||||
|
|
@ -76,27 +76,17 @@ impl SpanExporter for TonicTracesClient {
|
|||
|
||||
let resource_spans = group_spans_by_resource_and_scope(batch, &self.resource);
|
||||
|
||||
otel_debug!(name: "TonicTracesClient.ExportStarted");
|
||||
otel_debug!(name: "TonicsTracesClient.CallingExport");
|
||||
|
||||
let result = client
|
||||
client
|
||||
.export(Request::from_parts(
|
||||
metadata,
|
||||
extensions,
|
||||
ExportTraceServiceRequest { resource_spans },
|
||||
))
|
||||
.await;
|
||||
|
||||
match result {
|
||||
Ok(_) => {
|
||||
otel_debug!(name: "TonicTracesClient.ExportSucceeded");
|
||||
Ok(())
|
||||
}
|
||||
Err(e) => {
|
||||
let error = e.to_string();
|
||||
otel_debug!(name: "TonicTracesClient.ExportFailed", error = &error);
|
||||
Err(OTelSdkError::InternalFailure(error))
|
||||
}
|
||||
}
|
||||
.await
|
||||
.map_err(|e| OTelSdkError::InternalFailure(e.to_string()))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn shutdown(&mut self) -> OTelSdkResult {
|
||||
|
|
|
|||
|
|
@ -101,7 +101,9 @@ pub fn assert_metrics_results_contains(expected_content: &str) -> Result<()> {
|
|||
reader.read_to_string(&mut contents)?;
|
||||
assert!(
|
||||
contents.contains(expected_content),
|
||||
"Expected content {expected_content} not found in actual content {contents}"
|
||||
"Expected content {} not found in actual content {}",
|
||||
expected_content,
|
||||
contents
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -160,7 +162,12 @@ pub fn fetch_latest_metrics_for_scope(scope_name: &str) -> Result<Value> {
|
|||
None
|
||||
})
|
||||
})
|
||||
.with_context(|| format!("No valid JSON line containing scope `{scope_name}` found."))?;
|
||||
.with_context(|| {
|
||||
format!(
|
||||
"No valid JSON line containing scope `{}` found.",
|
||||
scope_name
|
||||
)
|
||||
})?;
|
||||
|
||||
Ok(json_line)
|
||||
}
|
||||
|
|
@ -171,16 +178,18 @@ pub fn fetch_latest_metrics_for_scope(scope_name: &str) -> Result<Value> {
|
|||
///
|
||||
pub fn validate_metrics_against_results(scope_name: &str) -> Result<()> {
|
||||
// Define the results file path
|
||||
let results_file_path = format!("./expected/metrics/{scope_name}.json");
|
||||
let results_file_path = format!("./expected/metrics/{}.json", scope_name);
|
||||
|
||||
// Fetch the actual metrics for the given scope
|
||||
let actual_metrics = fetch_latest_metrics_for_scope(scope_name)
|
||||
.context(format!("Failed to fetch metrics for scope: {scope_name}"))?;
|
||||
.context(format!("Failed to fetch metrics for scope: {}", scope_name))?;
|
||||
|
||||
// Read the expected metrics from the results file
|
||||
let expected_metrics = {
|
||||
let file = File::open(&results_file_path)
|
||||
.context(format!("Failed to open results file: {results_file_path}"))?;
|
||||
let file = File::open(&results_file_path).context(format!(
|
||||
"Failed to open results file: {}",
|
||||
results_file_path
|
||||
))?;
|
||||
read_metrics_from_json(file)
|
||||
}?;
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ impl SpanForest {
|
|||
}
|
||||
|
||||
if !spans.is_empty() {
|
||||
panic!("found spans with invalid parent: {spans:?}");
|
||||
panic!("found spans with invalid parent: {:?}", spans);
|
||||
}
|
||||
|
||||
forest
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ mod metrictests_roundtrip {
|
|||
let metrics: MetricsData = serde_json::from_str(metrics_in)?;
|
||||
let metrics_out = serde_json::to_string(&metrics)?;
|
||||
|
||||
println!("{metrics_out:}");
|
||||
println!("{:}", metrics_out);
|
||||
|
||||
let metrics_in_json: Value = serde_json::from_str(metrics_in)?;
|
||||
let metrics_out_json: Value = serde_json::from_str(&metrics_out)?;
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ async fn smoke_tracer() {
|
|||
opentelemetry_otlp::SpanExporter::builder()
|
||||
.with_tonic()
|
||||
.with_compression(opentelemetry_otlp::Compression::Gzip)
|
||||
.with_endpoint(format!("http://{addr}"))
|
||||
.with_endpoint(format!("http://{}", addr))
|
||||
.with_metadata(metadata)
|
||||
.build()
|
||||
.expect("gzip-tonic SpanExporter failed to build"),
|
||||
|
|
|
|||
|
|
@ -26,10 +26,10 @@ pub(crate) fn get_unit_suffixes(unit: &str) -> Option<Cow<'static, str>> {
|
|||
get_prom_per_unit(second),
|
||||
) {
|
||||
(true, _, Some(second_part)) | (false, None, Some(second_part)) => {
|
||||
Some(Cow::Owned(format!("per_{second_part}")))
|
||||
Some(Cow::Owned(format!("per_{}", second_part)))
|
||||
}
|
||||
(false, Some(first_part), Some(second_part)) => {
|
||||
Some(Cow::Owned(format!("{first_part}_per_{second_part}")))
|
||||
Some(Cow::Owned(format!("{}_per_{}", first_part, second_part)))
|
||||
}
|
||||
_ => None,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
## vNext
|
||||
|
||||
- Update proto definitions to v1.7.0.
|
||||
|
||||
## 0.30.0
|
||||
|
||||
Released 2025-May-23
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ testing = ["opentelemetry/testing"]
|
|||
# add ons
|
||||
internal-logs = ["opentelemetry/internal-logs"]
|
||||
with-schemars = ["schemars"]
|
||||
with-serde = ["serde", "const-hex", "base64"]
|
||||
with-serde = ["serde", "hex", "base64"]
|
||||
|
||||
[dependencies]
|
||||
tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
|
||||
|
|
@ -58,7 +58,7 @@ opentelemetry = { version = "0.30", default-features = false, path = "../opentel
|
|||
opentelemetry_sdk = { version = "0.30", default-features = false, path = "../opentelemetry-sdk" }
|
||||
schemars = { workspace = true, optional = true }
|
||||
serde = { workspace = true, optional = true, features = ["serde_derive"] }
|
||||
const-hex = { workspace = true, optional = true }
|
||||
hex = { workspace = true, optional = true }
|
||||
base64 = { workspace = true, optional = true }
|
||||
|
||||
[dev-dependencies]
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ pub(crate) mod serializers {
|
|||
where
|
||||
S: Serializer,
|
||||
{
|
||||
let hex_string = const_hex::encode(bytes);
|
||||
let hex_string = hex::encode(bytes);
|
||||
serializer.serialize_str(&hex_string)
|
||||
}
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ pub(crate) mod serializers {
|
|||
where
|
||||
E: de::Error,
|
||||
{
|
||||
const_hex::decode(value).map_err(E::custom)
|
||||
hex::decode(value).map_err(E::custom)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8654ab7a5a43ca25fe8046e59dcd6935c3f76de0
|
||||
Subproject commit f7676e812035aa8a67478c6d740cb09f4c50f86a
|
||||
|
|
@ -1,35 +1,4 @@
|
|||
// This file is @generated by prost-build.
|
||||
/// ProfilesDictionary represents the profiles data shared across the
|
||||
/// entire message being sent.
|
||||
#[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
|
||||
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
|
||||
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct ProfilesDictionary {
|
||||
/// Mappings from address ranges to the image/binary/library mapped
|
||||
/// into that address range referenced by locations via Location.mapping_index.
|
||||
#[prost(message, repeated, tag = "1")]
|
||||
pub mapping_table: ::prost::alloc::vec::Vec<Mapping>,
|
||||
/// Locations referenced by samples via Profile.location_indices.
|
||||
#[prost(message, repeated, tag = "2")]
|
||||
pub location_table: ::prost::alloc::vec::Vec<Location>,
|
||||
/// Functions referenced by locations via Line.function_index.
|
||||
#[prost(message, repeated, tag = "3")]
|
||||
pub function_table: ::prost::alloc::vec::Vec<Function>,
|
||||
/// Links referenced by samples via Sample.link_index.
|
||||
#[prost(message, repeated, tag = "4")]
|
||||
pub link_table: ::prost::alloc::vec::Vec<Link>,
|
||||
/// A common table for strings referenced by various messages.
|
||||
/// string_table\[0\] must always be "".
|
||||
#[prost(string, repeated, tag = "5")]
|
||||
pub string_table: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
||||
/// A common table for attributes referenced by various messages.
|
||||
#[prost(message, repeated, tag = "6")]
|
||||
pub attribute_table: ::prost::alloc::vec::Vec<super::super::common::v1::KeyValue>,
|
||||
/// Represents a mapping between Attribute Keys and Units.
|
||||
#[prost(message, repeated, tag = "7")]
|
||||
pub attribute_units: ::prost::alloc::vec::Vec<AttributeUnit>,
|
||||
}
|
||||
/// ProfilesData represents the profiles data that can be stored in persistent storage,
|
||||
/// OR can be embedded by other protocols that transfer OTLP profiles data but do not
|
||||
/// implement the OTLP protocol.
|
||||
|
|
@ -54,9 +23,29 @@ pub struct ProfilesData {
|
|||
/// Resource.attributes and semantic conventions.
|
||||
#[prost(message, repeated, tag = "1")]
|
||||
pub resource_profiles: ::prost::alloc::vec::Vec<ResourceProfiles>,
|
||||
/// One instance of ProfilesDictionary
|
||||
#[prost(message, optional, tag = "2")]
|
||||
pub dictionary: ::core::option::Option<ProfilesDictionary>,
|
||||
/// Mappings from address ranges to the image/binary/library mapped
|
||||
/// into that address range referenced by locations via Location.mapping_index.
|
||||
#[prost(message, repeated, tag = "2")]
|
||||
pub mapping_table: ::prost::alloc::vec::Vec<Mapping>,
|
||||
/// Locations referenced by samples via Profile.location_indices.
|
||||
#[prost(message, repeated, tag = "3")]
|
||||
pub location_table: ::prost::alloc::vec::Vec<Location>,
|
||||
/// Functions referenced by locations via Line.function_index.
|
||||
#[prost(message, repeated, tag = "4")]
|
||||
pub function_table: ::prost::alloc::vec::Vec<Function>,
|
||||
/// Links referenced by samples via Sample.link_index.
|
||||
#[prost(message, repeated, tag = "5")]
|
||||
pub link_table: ::prost::alloc::vec::Vec<Link>,
|
||||
/// A common table for strings referenced by various messages.
|
||||
/// string_table\[0\] must always be "".
|
||||
#[prost(string, repeated, tag = "6")]
|
||||
pub string_table: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
|
||||
/// A common table for attributes referenced by various messages.
|
||||
#[prost(message, repeated, tag = "7")]
|
||||
pub attribute_table: ::prost::alloc::vec::Vec<super::super::common::v1::KeyValue>,
|
||||
/// Represents a mapping between Attribute Keys and Units.
|
||||
#[prost(message, repeated, tag = "8")]
|
||||
pub attribute_units: ::prost::alloc::vec::Vec<AttributeUnit>,
|
||||
}
|
||||
/// A collection of ScopeProfiles from a Resource.
|
||||
#[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
|
||||
|
|
@ -127,7 +116,7 @@ pub struct Profile {
|
|||
/// The set of samples recorded in this profile.
|
||||
#[prost(message, repeated, tag = "2")]
|
||||
pub sample: ::prost::alloc::vec::Vec<Sample>,
|
||||
/// References to locations in ProfilesDictionary.location_table.
|
||||
/// References to locations in ProfilesData.location_table.
|
||||
#[prost(int32, repeated, tag = "3")]
|
||||
pub location_indices: ::prost::alloc::vec::Vec<i32>,
|
||||
/// Time of collection (UTC) represented as nanoseconds past the epoch.
|
||||
|
|
@ -156,7 +145,7 @@ pub struct Profile {
|
|||
/// for human-friendly content. The profile must stay functional if this field
|
||||
/// is cleaned.
|
||||
///
|
||||
/// Indices into ProfilesDictionary.string_table.
|
||||
/// Indices into ProfilesData.string_table.
|
||||
#[prost(int32, repeated, tag = "8")]
|
||||
pub comment_strindices: ::prost::alloc::vec::Vec<i32>,
|
||||
/// Index into the sample_type array to the default sample type.
|
||||
|
|
@ -241,10 +230,10 @@ pub struct Link {
|
|||
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
|
||||
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
|
||||
pub struct ValueType {
|
||||
/// Index into ProfilesDictionary.string_table.
|
||||
/// Index into ProfilesData.string_table.
|
||||
#[prost(int32, tag = "1")]
|
||||
pub type_strindex: i32,
|
||||
/// Index into ProfilesDictionary.string_table.
|
||||
/// Index into ProfilesData.string_table.
|
||||
#[prost(int32, tag = "2")]
|
||||
pub unit_strindex: i32,
|
||||
#[prost(enumeration = "AggregationTemporality", tag = "3")]
|
||||
|
|
@ -274,10 +263,10 @@ pub struct Sample {
|
|||
/// lists of the originals.
|
||||
#[prost(int64, repeated, tag = "3")]
|
||||
pub value: ::prost::alloc::vec::Vec<i64>,
|
||||
/// References to attributes in ProfilesDictionary.attribute_table. \[optional\]
|
||||
/// References to attributes in ProfilesData.attribute_table. \[optional\]
|
||||
#[prost(int32, repeated, tag = "4")]
|
||||
pub attribute_indices: ::prost::alloc::vec::Vec<i32>,
|
||||
/// Reference to link in ProfilesDictionary.link_table. \[optional\]
|
||||
/// Reference to link in ProfilesData.link_table. \[optional\]
|
||||
#[prost(int32, optional, tag = "5")]
|
||||
pub link_index: ::core::option::Option<i32>,
|
||||
/// Timestamps associated with Sample represented in nanoseconds. These timestamps are expected
|
||||
|
|
@ -312,10 +301,10 @@ pub struct Mapping {
|
|||
/// disk for the main binary and shared libraries, or virtual
|
||||
/// abstractions like "\[vdso\]".
|
||||
///
|
||||
/// Index into ProfilesDictionary.string_table.
|
||||
/// Index into ProfilesData.string_table.
|
||||
#[prost(int32, tag = "4")]
|
||||
pub filename_strindex: i32,
|
||||
/// References to attributes in ProfilesDictionary.attribute_table. \[optional\]
|
||||
/// References to attributes in ProfilesData.attribute_table. \[optional\]
|
||||
#[prost(int32, repeated, tag = "5")]
|
||||
pub attribute_indices: ::prost::alloc::vec::Vec<i32>,
|
||||
/// The following fields indicate the resolution of symbolic info.
|
||||
|
|
@ -334,7 +323,7 @@ pub struct Mapping {
|
|||
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct Location {
|
||||
/// Reference to mapping in ProfilesDictionary.mapping_table.
|
||||
/// Reference to mapping in ProfilesData.mapping_table.
|
||||
/// It can be unset if the mapping is unknown or not applicable for
|
||||
/// this profile type.
|
||||
#[prost(int32, optional, tag = "1")]
|
||||
|
|
@ -362,7 +351,7 @@ pub struct Location {
|
|||
/// profile changes.
|
||||
#[prost(bool, tag = "4")]
|
||||
pub is_folded: bool,
|
||||
/// References to attributes in ProfilesDictionary.attribute_table. \[optional\]
|
||||
/// References to attributes in ProfilesData.attribute_table. \[optional\]
|
||||
#[prost(int32, repeated, tag = "5")]
|
||||
pub attribute_indices: ::prost::alloc::vec::Vec<i32>,
|
||||
}
|
||||
|
|
@ -372,7 +361,7 @@ pub struct Location {
|
|||
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
|
||||
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
|
||||
pub struct Line {
|
||||
/// Reference to function in ProfilesDictionary.function_table.
|
||||
/// Reference to function in ProfilesData.function_table.
|
||||
#[prost(int32, tag = "1")]
|
||||
pub function_index: i32,
|
||||
/// Line number in source code. 0 means unset.
|
||||
|
|
|
|||
|
|
@ -61,11 +61,10 @@ mod json_serde {
|
|||
dropped_attributes_count: 0,
|
||||
}),
|
||||
spans: vec![Span {
|
||||
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
|
||||
.unwrap(),
|
||||
span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
|
||||
trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
|
||||
span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
|
||||
trace_state: String::new(),
|
||||
parent_span_id: const_hex::decode("eee19b7ec3c1b173").unwrap(),
|
||||
parent_span_id: hex::decode("eee19b7ec3c1b173").unwrap(),
|
||||
flags: 0,
|
||||
name: String::from("I'm a server span"),
|
||||
kind: 2,
|
||||
|
|
@ -268,11 +267,10 @@ mod json_serde {
|
|||
dropped_attributes_count: 1,
|
||||
}),
|
||||
spans: vec![Span {
|
||||
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
|
||||
.unwrap(),
|
||||
span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
|
||||
trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
|
||||
span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
|
||||
trace_state: String::from("browser=firefox,os=linux"),
|
||||
parent_span_id: const_hex::decode("eee19b7ec3c1b173").unwrap(),
|
||||
parent_span_id: hex::decode("eee19b7ec3c1b173").unwrap(),
|
||||
flags: 1,
|
||||
name: String::from("I'm a server span"),
|
||||
kind: 2,
|
||||
|
|
@ -310,9 +308,9 @@ mod json_serde {
|
|||
}],
|
||||
dropped_events_count: 1,
|
||||
links: vec![Link {
|
||||
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60b")
|
||||
trace_id: hex::decode("5b8efff798038103d269b633813fc60b")
|
||||
.unwrap(),
|
||||
span_id: const_hex::decode("eee19b7ec3c1b172").unwrap(),
|
||||
span_id: hex::decode("eee19b7ec3c1b172").unwrap(),
|
||||
trace_state: String::from("food=pizza,color=red"),
|
||||
attributes: vec![KeyValue {
|
||||
key: String::from("my.link.attr"),
|
||||
|
|
@ -1274,9 +1272,8 @@ mod json_serde {
|
|||
],
|
||||
dropped_attributes_count: 0,
|
||||
flags: 0,
|
||||
trace_id: const_hex::decode("5b8efff798038103d269b633813fc60c")
|
||||
.unwrap(),
|
||||
span_id: const_hex::decode("eee19b7ec3c1b174").unwrap(),
|
||||
trace_id: hex::decode("5b8efff798038103d269b633813fc60c").unwrap(),
|
||||
span_id: hex::decode("eee19b7ec3c1b174").unwrap(),
|
||||
}],
|
||||
schema_url: String::new(),
|
||||
}],
|
||||
|
|
|
|||
|
|
@ -2,10 +2,6 @@
|
|||
|
||||
## vNext
|
||||
|
||||
- TODO: Placeholder for Span processor related things
|
||||
- *Fix* SpanProcessor::on_start is no longer called on non recording spans
|
||||
- **Fix**: Restore true parallel exports in the async-native `BatchSpanProcessor` by honoring `OTEL_BSP_MAX_CONCURRENT_EXPORTS` ([#2959](https://github.com/open-telemetry/opentelemetry-rust/pull/3028)). A regression in [#2685](https://github.com/open-telemetry/opentelemetry-rust/pull/2685) inadvertently awaited the `export()` future directly in `opentelemetry-sdk/src/trace/span_processor_with_async_runtime.rs` instead of spawning it on the runtime, forcing all exports to run sequentially.
|
||||
|
||||
## 0.30.0
|
||||
|
||||
Released 2025-May-23
|
||||
|
|
@ -190,7 +186,7 @@ Released 2025-Mar-21
|
|||
needs to mutate state, it should rely on interior mutability.
|
||||
[2764](https://github.com/open-telemetry/opentelemetry-rust/pull/2764)
|
||||
- *Breaking (Affects custom Exporter/Processor authors only)* Removed
|
||||
`opentelemetry_sdk::logs::error::{LogError, LogResult}`. These were not
|
||||
`opentelelemetry_sdk::logs::error::{LogError, LogResult}`. These were not
|
||||
intended to be public. If you are authoring custom processor/exporters, use
|
||||
`opentelemetry_sdk::error::OTelSdkError` and
|
||||
`opentelemetry_sdk::error::OTelSdkResult`.
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ serde = { workspace = true, features = ["derive", "rc"], optional = true }
|
|||
serde_json = { workspace = true, optional = true }
|
||||
thiserror = { workspace = true }
|
||||
url = { workspace = true, optional = true }
|
||||
tokio = { workspace = true, default-features = false, optional = true }
|
||||
tokio = { workspace = true, features = ["rt", "time"], optional = true }
|
||||
tokio-stream = { workspace = true, optional = true }
|
||||
http = { workspace = true, optional = true }
|
||||
|
||||
|
|
@ -47,15 +47,15 @@ spec_unstable_logs_enabled = ["logs", "opentelemetry/spec_unstable_logs_enabled"
|
|||
metrics = ["opentelemetry/metrics"]
|
||||
testing = ["opentelemetry/testing", "trace", "metrics", "logs", "rt-tokio", "rt-tokio-current-thread", "tokio/macros", "tokio/rt-multi-thread"]
|
||||
experimental_async_runtime = []
|
||||
rt-tokio = ["tokio/rt", "tokio/time", "tokio-stream", "experimental_async_runtime"]
|
||||
rt-tokio-current-thread = ["tokio/rt", "tokio/time", "tokio-stream", "experimental_async_runtime"]
|
||||
rt-tokio = ["tokio", "tokio-stream", "experimental_async_runtime"]
|
||||
rt-tokio-current-thread = ["tokio", "tokio-stream", "experimental_async_runtime"]
|
||||
internal-logs = ["opentelemetry/internal-logs"]
|
||||
experimental_metrics_periodicreader_with_async_runtime = ["metrics", "experimental_async_runtime"]
|
||||
spec_unstable_metrics_views = ["metrics"]
|
||||
experimental_metrics_custom_reader = ["metrics"]
|
||||
experimental_logs_batch_log_processor_with_async_runtime = ["logs", "experimental_async_runtime"]
|
||||
experimental_logs_concurrent_log_processor = ["logs"]
|
||||
experimental_trace_batch_span_processor_with_async_runtime = ["tokio/sync", "trace", "experimental_async_runtime"]
|
||||
experimental_trace_batch_span_processor_with_async_runtime = ["trace", "experimental_async_runtime"]
|
||||
experimental_metrics_disable_name_validation = ["metrics"]
|
||||
|
||||
[[bench]]
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ fn criterion_benchmark(c: &mut Criterion) {
|
|||
|
||||
for task_num in [1, 2, 4, 8, 16, 32].iter() {
|
||||
group.bench_with_input(
|
||||
BenchmarkId::from_parameter(format!("with {task_num} concurrent task")),
|
||||
BenchmarkId::from_parameter(format!("with {} concurrent task", task_num)),
|
||||
task_num,
|
||||
|b, &task_num| {
|
||||
b.iter(|| {
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ fn bench_histogram(bound_count: usize) -> (SharedReader, Histogram<u64>) {
|
|||
|
||||
let mtr = builder.build().meter("test_meter");
|
||||
let hist = mtr
|
||||
.u64_histogram(format!("histogram_{bound_count}"))
|
||||
.u64_histogram(format!("histogram_{}", bound_count))
|
||||
.build();
|
||||
|
||||
(r, hist)
|
||||
|
|
@ -307,14 +307,15 @@ fn histograms(c: &mut Criterion) {
|
|||
let mut attributes: Vec<KeyValue> = Vec::new();
|
||||
for i in 0..*attr_size {
|
||||
attributes.push(KeyValue::new(
|
||||
format!("K,{bound_size},{attr_size}"),
|
||||
format!("V,{bound_size},{attr_size},{i}"),
|
||||
format!("K,{},{}", bound_size, attr_size),
|
||||
format!("V,{},{},{}", bound_size, attr_size, i),
|
||||
))
|
||||
}
|
||||
let value: u64 = rng.random_range(0..MAX_BOUND).try_into().unwrap();
|
||||
group.bench_function(format!("Record{attr_size}Attrs{bound_size}bounds"), |b| {
|
||||
b.iter(|| hist.record(value, &attributes))
|
||||
});
|
||||
group.bench_function(
|
||||
format!("Record{}Attrs{}bounds", attr_size, bound_size),
|
||||
|b| b.iter(|| hist.record(value, &attributes)),
|
||||
);
|
||||
}
|
||||
}
|
||||
group.bench_function("CollectOne", |b| benchmark_collect_histogram(b, 1));
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ fn criterion_benchmark(c: &mut Criterion) {
|
|||
counter_add_unsorted(c);
|
||||
|
||||
let attribute_values: [String; 10] = (1..=10)
|
||||
.map(|i| format!("value{i}"))
|
||||
.map(|i| format!("value{}", i))
|
||||
.collect::<Vec<String>>()
|
||||
.try_into()
|
||||
.expect("Expected a Vec of length 10");
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ fn criterion_benchmark(c: &mut Criterion) {
|
|||
histogram_record(c);
|
||||
|
||||
let attribute_values: [String; 10] = (1..=10)
|
||||
.map(|i| format!("value{i}"))
|
||||
.map(|i| format!("value{}", i))
|
||||
.collect::<Vec<String>>()
|
||||
.try_into()
|
||||
.expect("Expected a Vec of length 10");
|
||||
|
|
|
|||
|
|
@ -164,6 +164,6 @@ pub enum InMemoryExporterError {
|
|||
#[cfg(any(feature = "testing", test))]
|
||||
impl<T> From<std::sync::PoisonError<T>> for InMemoryExporterError {
|
||||
fn from(err: std::sync::PoisonError<T>) -> Self {
|
||||
InMemoryExporterError::InternalFailure(format!("Mutex poison error: {err}"))
|
||||
InMemoryExporterError::InternalFailure(format!("Mutex poison error: {}", err))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ impl LogProcessor for BatchLogProcessor {
|
|||
if err == RecvTimeoutError::Timeout {
|
||||
OTelSdkError::Timeout(self.forceflush_timeout)
|
||||
} else {
|
||||
OTelSdkError::InternalFailure(format!("{err}"))
|
||||
OTelSdkError::InternalFailure(format!("{}", err))
|
||||
}
|
||||
})?,
|
||||
Err(mpsc::TrySendError::Full(_)) => {
|
||||
|
|
@ -291,7 +291,7 @@ impl LogProcessor for BatchLogProcessor {
|
|||
name: "BatchLogProcessor.Shutdown.Error",
|
||||
error = format!("{}", err)
|
||||
);
|
||||
OTelSdkError::InternalFailure(format!("{err}"))
|
||||
OTelSdkError::InternalFailure(format!("{}", err))
|
||||
}
|
||||
})?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use std::sync::atomic::AtomicBool;
|
|||
use std::sync::{Arc, Mutex};
|
||||
use std::time;
|
||||
|
||||
/// An in-memory logs exporter that stores logs data in memory.
|
||||
/// An in-memory logs exporter that stores logs data in memory..
|
||||
///
|
||||
/// This exporter is useful for testing and debugging purposes.
|
||||
/// It stores logs in a `Vec<OwnedLogData>`. Logs can be retrieved using
|
||||
|
|
@ -73,7 +73,7 @@ pub struct LogDataWithResource {
|
|||
pub resource: Cow<'static, Resource>,
|
||||
}
|
||||
|
||||
///Builder for [`InMemoryLogExporter`].
|
||||
///Builder for ['InMemoryLogExporter'].
|
||||
/// # Example
|
||||
///
|
||||
/// ```no_run
|
||||
|
|
@ -187,14 +187,14 @@ impl InMemoryLogExporter {
|
|||
.logs
|
||||
.lock()
|
||||
.map(|mut logs_guard| logs_guard.clear())
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to reset logs: {e}")));
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to reset logs: {}", e)));
|
||||
}
|
||||
}
|
||||
|
||||
impl LogExporter for InMemoryLogExporter {
|
||||
async fn export(&self, batch: LogBatch<'_>) -> OTelSdkResult {
|
||||
let mut logs_guard = self.logs.lock().map_err(|e| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to lock logs for export: {e}"))
|
||||
OTelSdkError::InternalFailure(format!("Failed to lock logs for export: {}", e))
|
||||
})?;
|
||||
for (log_record, instrumentation) in batch.iter() {
|
||||
let owned_log = OwnedLogData {
|
||||
|
|
|
|||
|
|
@ -80,10 +80,10 @@ impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {
|
|||
let (res_sender, res_receiver) = oneshot::channel();
|
||||
self.message_sender
|
||||
.try_send(BatchMessage::Flush(Some(res_sender)))
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{err:?}")))?;
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{:?}", err)))?;
|
||||
|
||||
futures_executor::block_on(res_receiver)
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{err:?}")))
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{:?}", err)))
|
||||
.and_then(std::convert::identity)
|
||||
}
|
||||
|
||||
|
|
@ -101,10 +101,10 @@ impl<R: RuntimeChannel> LogProcessor for BatchLogProcessor<R> {
|
|||
let (res_sender, res_receiver) = oneshot::channel();
|
||||
self.message_sender
|
||||
.try_send(BatchMessage::Shutdown(res_sender))
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{err:?}")))?;
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{:?}", err)))?;
|
||||
|
||||
futures_executor::block_on(res_receiver)
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{err:?}")))
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("{:?}", err)))
|
||||
.and_then(std::convert::identity)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ impl SdkLoggerProvider {
|
|||
if result.iter().all(|r| r.is_ok()) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(OTelSdkError::InternalFailure(format!("errs: {result:?}")))
|
||||
Err(OTelSdkError::InternalFailure(format!("errs: {:?}", result)))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -798,7 +798,7 @@ mod tests {
|
|||
|
||||
// Explicitly shut down the logger provider
|
||||
let shutdown_result = logger_provider1.shutdown();
|
||||
println!("---->Result: {shutdown_result:?}");
|
||||
println!("---->Result: {:?}", shutdown_result);
|
||||
assert!(shutdown_result.is_ok());
|
||||
|
||||
// Verify that shutdown was called exactly once
|
||||
|
|
|
|||
|
|
@ -110,8 +110,8 @@ mod tests {
|
|||
assert_eq!(log.record.attributes_len(), 10);
|
||||
for i in 1..=10 {
|
||||
assert!(log.record.attributes_contains(
|
||||
&Key::new(format!("key{i}")),
|
||||
&AnyValue::String(format!("value{i}").into())
|
||||
&Key::new(format!("key{}", i)),
|
||||
&AnyValue::String(format!("value{}", i).into())
|
||||
));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -340,7 +340,8 @@ mod tests {
|
|||
assert!(
|
||||
panic_message.contains("no reactor running")
|
||||
|| panic_message.contains("must be called from the context of a Tokio 1.x runtime"),
|
||||
"Expected panic message about missing Tokio runtime, but got: {panic_message}"
|
||||
"Expected panic message about missing Tokio runtime, but got: {}",
|
||||
panic_message
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -120,7 +120,8 @@ impl Aggregation {
|
|||
for x in boundaries.windows(2) {
|
||||
if x[0] >= x[1] {
|
||||
return Err(MetricError::Config(format!(
|
||||
"aggregation: explicit bucket histogram: non-monotonic boundaries: {boundaries:?}",
|
||||
"aggregation: explicit bucket histogram: non-monotonic boundaries: {:?}",
|
||||
boundaries,
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
|
@ -130,12 +131,14 @@ impl Aggregation {
|
|||
Aggregation::Base2ExponentialHistogram { max_scale, .. } => {
|
||||
if *max_scale > EXPO_MAX_SCALE {
|
||||
return Err(MetricError::Config(format!(
|
||||
"aggregation: exponential histogram: max scale ({max_scale}) is greater than 20",
|
||||
"aggregation: exponential histogram: max scale ({}) is greater than 20",
|
||||
max_scale,
|
||||
)));
|
||||
}
|
||||
if *max_scale < EXPO_MIN_SCALE {
|
||||
return Err(MetricError::Config(format!(
|
||||
"aggregation: exponential histogram: max scale ({max_scale}) is less than -10",
|
||||
"aggregation: exponential histogram: max scale ({}) is less than -10",
|
||||
max_scale,
|
||||
)));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -436,7 +436,10 @@ mod tests {
|
|||
let err_str = err.to_string();
|
||||
assert!(
|
||||
err_str == expected_error,
|
||||
"For name '{name}', expected error '{expected_error}', but got '{err_str}'"
|
||||
"For name '{}', expected error '{}', but got '{}'",
|
||||
name,
|
||||
expected_error,
|
||||
err_str
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -475,7 +478,10 @@ mod tests {
|
|||
let err_str = err.to_string();
|
||||
assert!(
|
||||
err_str == expected_error,
|
||||
"For unit '{unit}', expected error '{expected_error}', but got '{err_str}'"
|
||||
"For unit '{}', expected error '{}', but got '{}'",
|
||||
unit,
|
||||
expected_error,
|
||||
err_str
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1505,7 +1505,8 @@ mod tests {
|
|||
assert_eq!(
|
||||
a.data_points.len(),
|
||||
b.data_points.len(),
|
||||
"{test_name} gauge counts"
|
||||
"{} gauge counts",
|
||||
test_name
|
||||
);
|
||||
for (a, b) in a.data_points.iter().zip(b.data_points.iter()) {
|
||||
assert_gauge_data_points_eq(a, b, "mismatching gauge data points", test_name);
|
||||
|
|
@ -1514,16 +1515,19 @@ mod tests {
|
|||
(MetricData::Sum(a), MetricData::Sum(b)) => {
|
||||
assert_eq!(
|
||||
a.temporality, b.temporality,
|
||||
"{test_name} mismatching sum temporality"
|
||||
"{} mismatching sum temporality",
|
||||
test_name
|
||||
);
|
||||
assert_eq!(
|
||||
a.is_monotonic, b.is_monotonic,
|
||||
"{test_name} mismatching sum monotonicity",
|
||||
"{} mismatching sum monotonicity",
|
||||
test_name,
|
||||
);
|
||||
assert_eq!(
|
||||
a.data_points.len(),
|
||||
b.data_points.len(),
|
||||
"{test_name} sum counts"
|
||||
"{} sum counts",
|
||||
test_name
|
||||
);
|
||||
for (a, b) in a.data_points.iter().zip(b.data_points.iter()) {
|
||||
assert_sum_data_points_eq(a, b, "mismatching sum data points", test_name);
|
||||
|
|
@ -1532,12 +1536,14 @@ mod tests {
|
|||
(MetricData::Histogram(a), MetricData::Histogram(b)) => {
|
||||
assert_eq!(
|
||||
a.temporality, b.temporality,
|
||||
"{test_name}: mismatching hist temporality"
|
||||
"{}: mismatching hist temporality",
|
||||
test_name
|
||||
);
|
||||
assert_eq!(
|
||||
a.data_points.len(),
|
||||
b.data_points.len(),
|
||||
"{test_name} hist counts"
|
||||
"{} hist counts",
|
||||
test_name
|
||||
);
|
||||
for (a, b) in a.data_points.iter().zip(b.data_points.iter()) {
|
||||
assert_hist_data_points_eq(a, b, "mismatching hist data points", test_name);
|
||||
|
|
@ -1546,12 +1552,14 @@ mod tests {
|
|||
(MetricData::ExponentialHistogram(a), MetricData::ExponentialHistogram(b)) => {
|
||||
assert_eq!(
|
||||
a.temporality, b.temporality,
|
||||
"{test_name} mismatching hist temporality"
|
||||
"{} mismatching hist temporality",
|
||||
test_name
|
||||
);
|
||||
assert_eq!(
|
||||
a.data_points.len(),
|
||||
b.data_points.len(),
|
||||
"{test_name} hist counts"
|
||||
"{} hist counts",
|
||||
test_name
|
||||
);
|
||||
for (a, b) in a.data_points.iter().zip(b.data_points.iter()) {
|
||||
assert_exponential_hist_data_points_eq(
|
||||
|
|
@ -1566,7 +1574,8 @@ mod tests {
|
|||
assert_eq!(
|
||||
a.type_id(),
|
||||
b.type_id(),
|
||||
"{test_name} Aggregation types not equal"
|
||||
"{} Aggregation types not equal",
|
||||
test_name
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1580,9 +1589,10 @@ mod tests {
|
|||
) {
|
||||
assert_eq!(
|
||||
a.attributes, b.attributes,
|
||||
"{test_name}: {message} attributes"
|
||||
"{}: {} attributes",
|
||||
test_name, message
|
||||
);
|
||||
assert_eq!(a.value, b.value, "{test_name}: {message} value");
|
||||
assert_eq!(a.value, b.value, "{}: {} value", test_name, message);
|
||||
}
|
||||
|
||||
fn assert_gauge_data_points_eq<T: Number>(
|
||||
|
|
@ -1593,9 +1603,10 @@ mod tests {
|
|||
) {
|
||||
assert_eq!(
|
||||
a.attributes, b.attributes,
|
||||
"{test_name}: {message} attributes"
|
||||
"{}: {} attributes",
|
||||
test_name, message
|
||||
);
|
||||
assert_eq!(a.value, b.value, "{test_name}: {message} value");
|
||||
assert_eq!(a.value, b.value, "{}: {} value", test_name, message);
|
||||
}
|
||||
|
||||
fn assert_hist_data_points_eq<T: Number>(
|
||||
|
|
@ -1606,17 +1617,19 @@ mod tests {
|
|||
) {
|
||||
assert_eq!(
|
||||
a.attributes, b.attributes,
|
||||
"{test_name}: {message} attributes"
|
||||
"{}: {} attributes",
|
||||
test_name, message
|
||||
);
|
||||
assert_eq!(a.count, b.count, "{test_name}: {message} count");
|
||||
assert_eq!(a.bounds, b.bounds, "{test_name}: {message} bounds");
|
||||
assert_eq!(a.count, b.count, "{}: {} count", test_name, message);
|
||||
assert_eq!(a.bounds, b.bounds, "{}: {} bounds", test_name, message);
|
||||
assert_eq!(
|
||||
a.bucket_counts, b.bucket_counts,
|
||||
"{test_name}: {message} bucket counts"
|
||||
"{}: {} bucket counts",
|
||||
test_name, message
|
||||
);
|
||||
assert_eq!(a.min, b.min, "{test_name}: {message} min");
|
||||
assert_eq!(a.max, b.max, "{test_name}: {message} max");
|
||||
assert_eq!(a.sum, b.sum, "{test_name}: {message} sum");
|
||||
assert_eq!(a.min, b.min, "{}: {} min", test_name, message);
|
||||
assert_eq!(a.max, b.max, "{}: {} max", test_name, message);
|
||||
assert_eq!(a.sum, b.sum, "{}: {} sum", test_name, message);
|
||||
}
|
||||
|
||||
fn assert_exponential_hist_data_points_eq<T: Number>(
|
||||
|
|
@ -1627,23 +1640,30 @@ mod tests {
|
|||
) {
|
||||
assert_eq!(
|
||||
a.attributes, b.attributes,
|
||||
"{test_name}: {message} attributes"
|
||||
"{}: {} attributes",
|
||||
test_name, message
|
||||
);
|
||||
assert_eq!(a.count, b.count, "{test_name}: {message} count");
|
||||
assert_eq!(a.min, b.min, "{test_name}: {message} min");
|
||||
assert_eq!(a.max, b.max, "{test_name}: {message} max");
|
||||
assert_eq!(a.sum, b.sum, "{test_name}: {message} sum");
|
||||
assert_eq!(a.count, b.count, "{}: {} count", test_name, message);
|
||||
assert_eq!(a.min, b.min, "{}: {} min", test_name, message);
|
||||
assert_eq!(a.max, b.max, "{}: {} max", test_name, message);
|
||||
assert_eq!(a.sum, b.sum, "{}: {} sum", test_name, message);
|
||||
|
||||
assert_eq!(a.scale, b.scale, "{test_name}: {message} scale");
|
||||
assert_eq!(a.zero_count, b.zero_count, "{test_name}: {message} zeros");
|
||||
assert_eq!(a.scale, b.scale, "{}: {} scale", test_name, message);
|
||||
assert_eq!(
|
||||
a.zero_count, b.zero_count,
|
||||
"{}: {} zeros",
|
||||
test_name, message
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
a.positive_bucket, b.positive_bucket,
|
||||
"{test_name}: {message} pos"
|
||||
"{}: {} pos",
|
||||
test_name, message
|
||||
);
|
||||
assert_eq!(
|
||||
a.negative_bucket, b.negative_bucket,
|
||||
"{test_name}: {message} neg"
|
||||
"{}: {} neg",
|
||||
test_name, message
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ impl MetricReader for ManualReader {
|
|||
let mut inner = self
|
||||
.inner
|
||||
.lock()
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {e}")))?;
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to acquire lock: {}", e)))?;
|
||||
|
||||
// Any future call to collect will now return an error.
|
||||
inner.sdk_producer = None;
|
||||
|
|
|
|||
|
|
@ -545,7 +545,7 @@ mod tests {
|
|||
};
|
||||
// The Observable counter reports values[0], values[1],....values[n] on each flush.
|
||||
let values: Vec<u64> = (0..length).map(|i| start + i * increment).collect();
|
||||
println!("Testing with observable values: {values:?}");
|
||||
println!("Testing with observable values: {:?}", values);
|
||||
let values = Arc::new(values);
|
||||
let values_clone = values.clone();
|
||||
let i = Arc::new(Mutex::new(0));
|
||||
|
|
@ -834,7 +834,7 @@ mod tests {
|
|||
let resource_metrics = exporter
|
||||
.get_finished_metrics()
|
||||
.expect("metrics are expected to be exported.");
|
||||
println!("resource_metrics: {resource_metrics:?}");
|
||||
println!("resource_metrics: {:?}", resource_metrics);
|
||||
assert!(
|
||||
resource_metrics[0].scope_metrics.len() == 1,
|
||||
"There should be a single scope as the meters are identical"
|
||||
|
|
@ -1272,7 +1272,7 @@ mod tests {
|
|||
.exporter
|
||||
.get_finished_metrics()
|
||||
.expect("metrics are expected to be exported.");
|
||||
println!("resource_metrics: {resource_metrics:?}");
|
||||
println!("resource_metrics: {:?}", resource_metrics);
|
||||
assert!(resource_metrics.is_empty(), "No metrics should be exported as no new measurements were recorded since last collect.");
|
||||
}
|
||||
|
||||
|
|
@ -1666,15 +1666,18 @@ mod tests {
|
|||
let metric = &resource_metrics[0].scope_metrics[0].metrics[0];
|
||||
assert_eq!(
|
||||
metric.name, expected_name,
|
||||
"Expected name: {expected_name}."
|
||||
"Expected name: {}.",
|
||||
expected_name
|
||||
);
|
||||
assert_eq!(
|
||||
metric.unit, expected_unit,
|
||||
"Expected unit: {expected_unit}."
|
||||
"Expected unit: {}.",
|
||||
expected_unit
|
||||
);
|
||||
assert_eq!(
|
||||
metric.description, expected_description,
|
||||
"Expected description: {expected_description}."
|
||||
"Expected description: {}.",
|
||||
expected_description
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -3334,7 +3337,8 @@ mod tests {
|
|||
assert_eq!(
|
||||
self.resource_metrics.len(),
|
||||
invocation_count,
|
||||
"Expected collect to be called {invocation_count} times"
|
||||
"Expected collect to be called {} times",
|
||||
invocation_count
|
||||
);
|
||||
|
||||
let result = self
|
||||
|
|
|
|||
|
|
@ -255,7 +255,8 @@ mod tests {
|
|||
assert_eq!(
|
||||
propagator.extract(&extractor).span().span_context(),
|
||||
&SpanContext::empty_context(),
|
||||
"{reason}"
|
||||
"{}",
|
||||
reason
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -411,7 +411,10 @@ mod tests {
|
|||
assert_eq!(
|
||||
result_schema_url.map(|s| s as &str),
|
||||
expected_schema_url,
|
||||
"Merging schema_url_a {schema_url_a:?} with schema_url_b {schema_url_b:?} did not yield expected result {expected_schema_url:?}"
|
||||
"Merging schema_url_a {:?} with schema_url_b {:?} did not yield expected result {:?}",
|
||||
schema_url_a,
|
||||
schema_url_b,
|
||||
expected_schema_url
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -507,7 +510,10 @@ mod tests {
|
|||
assert_eq!(
|
||||
resource.schema_url().map(|s| s as &str),
|
||||
expected_schema_url,
|
||||
"Merging schema_url_a {schema_url_a:?} with schema_url_b {schema_url_b:?} did not yield expected result {expected_schema_url:?}"
|
||||
"Merging schema_url_a {:?} with schema_url_b {:?} did not yield expected result {:?}",
|
||||
schema_url_a,
|
||||
schema_url_b,
|
||||
expected_schema_url
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ impl SpanExporter for TokioSpanExporter {
|
|||
batch.into_iter().try_for_each(|span_data| {
|
||||
self.tx_export
|
||||
.send(span_data)
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("Export failed: {err:?}")))
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("Export failed: {:?}", err)))
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ use std::time::Duration;
|
|||
/// An in-memory span exporter that stores span data in memory.
|
||||
///
|
||||
/// This exporter is useful for testing and debugging purposes. It stores
|
||||
/// span data in a `Vec<SpanData>`. Spans can be retrieved
|
||||
/// metric data in a `Vec<SpanData>`. Metrics can be retrieved
|
||||
/// using the `get_finished_spans` method.
|
||||
/// # Example
|
||||
/// ```
|
||||
|
|
@ -135,7 +135,9 @@ impl SpanExporter for InMemorySpanExporter {
|
|||
.spans
|
||||
.lock()
|
||||
.map(|mut spans_guard| spans_guard.append(&mut batch.clone()))
|
||||
.map_err(|err| OTelSdkError::InternalFailure(format!("Failed to lock spans: {err:?}")));
|
||||
.map_err(|err| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to lock spans: {:?}", err))
|
||||
});
|
||||
result
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ impl SdkTracerProvider {
|
|||
if result.iter().all(|r| r.is_ok()) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(OTelSdkError::InternalFailure(format!("errs: {result:?}")))
|
||||
Err(OTelSdkError::InternalFailure(format!("errs: {:?}", result)))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -351,7 +351,12 @@ mod tests {
|
|||
let diff = (got - expectation).abs();
|
||||
assert!(
|
||||
diff <= tolerance,
|
||||
"{name} got {got:?} (diff: {diff}), expected {expectation} (w/tolerance: {tolerance})"
|
||||
"{} got {:?} (diff: {}), expected {} (w/tolerance: {})",
|
||||
name,
|
||||
got,
|
||||
diff,
|
||||
expectation,
|
||||
tolerance
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ impl JaegerRemoteSampler {
|
|||
let resp = client
|
||||
.send_bytes(request)
|
||||
.await
|
||||
.map_err(|err| format!("the request is failed to send {err}"))?;
|
||||
.map_err(|err| format!("the request is failed to send {}", err))?;
|
||||
|
||||
// process failures
|
||||
if resp.status() != http::StatusCode::OK {
|
||||
|
|
@ -248,7 +248,7 @@ impl JaegerRemoteSampler {
|
|||
|
||||
// deserialize the response
|
||||
serde_json::from_slice(&resp.body()[..])
|
||||
.map_err(|err| format!("cannot deserialize the response, {err}"))
|
||||
.map_err(|err| format!("cannot deserialize the response, {}", err))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -538,7 +538,7 @@ mod tests {
|
|||
let mut initial_attributes = Vec::new();
|
||||
let mut expected_dropped_count = 1;
|
||||
for i in 0..(DEFAULT_MAX_ATTRIBUTES_PER_SPAN + 1) {
|
||||
initial_attributes.push(KeyValue::new(format!("key {i}"), i.to_string()))
|
||||
initial_attributes.push(KeyValue::new(format!("key {}", i), i.to_string()))
|
||||
}
|
||||
let span_builder = SpanBuilder::from_name("test_span").with_attributes(initial_attributes);
|
||||
|
||||
|
|
@ -578,7 +578,7 @@ mod tests {
|
|||
for i in 0..(DEFAULT_MAX_ATTRIBUTES_PER_EVENT * 2) {
|
||||
event1
|
||||
.attributes
|
||||
.push(KeyValue::new(format!("key {i}"), i.to_string()))
|
||||
.push(KeyValue::new(format!("key {}", i), i.to_string()))
|
||||
}
|
||||
let event2 = event1.clone();
|
||||
|
||||
|
|
@ -619,7 +619,7 @@ mod tests {
|
|||
));
|
||||
for i in 0..(DEFAULT_MAX_ATTRIBUTES_PER_LINK * 2) {
|
||||
link.attributes
|
||||
.push(KeyValue::new(format!("key {i}"), i.to_string()));
|
||||
.push(KeyValue::new(format!("key {}", i), i.to_string()));
|
||||
}
|
||||
|
||||
let span_builder = tracer.span_builder("test").with_links(vec![link]);
|
||||
|
|
@ -719,7 +719,7 @@ mod tests {
|
|||
let exported_data = span.exported_data();
|
||||
assert!(exported_data.is_some());
|
||||
let res = provider.shutdown();
|
||||
println!("{res:?}");
|
||||
println!("{:?}", res);
|
||||
assert!(res.is_ok());
|
||||
let dropped_span = tracer.start("span_with_dropped_provider");
|
||||
// return none if the provider has already been dropped
|
||||
|
|
|
|||
|
|
@ -606,7 +606,8 @@ impl SpanProcessor for BatchSpanProcessor {
|
|||
if let Some(handle) = self.handle.lock().unwrap().take() {
|
||||
if let Err(err) = handle.join() {
|
||||
return Err(OTelSdkError::InternalFailure(format!(
|
||||
"Background thread failed to join during shutdown. This may indicate a panic or unexpected termination: {err:?}"
|
||||
"Background thread failed to join during shutdown. This may indicate a panic or unexpected termination: {:?}",
|
||||
err
|
||||
)));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,21 +6,19 @@ use crate::trace::Span;
|
|||
use crate::trace::SpanProcessor;
|
||||
use crate::trace::{SpanData, SpanExporter};
|
||||
use futures_channel::oneshot;
|
||||
use futures_util::pin_mut;
|
||||
use futures_util::{
|
||||
future::{self, BoxFuture, Either},
|
||||
pin_mut, select,
|
||||
select,
|
||||
stream::{self, FusedStream, FuturesUnordered},
|
||||
StreamExt as _,
|
||||
};
|
||||
use opentelemetry::Context;
|
||||
use opentelemetry::{otel_debug, otel_error, otel_warn};
|
||||
use std::fmt;
|
||||
use std::sync::{
|
||||
atomic::{AtomicUsize, Ordering},
|
||||
Arc,
|
||||
};
|
||||
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
/// A [`SpanProcessor`] that asynchronously buffers finished spans and reports
|
||||
/// them at a preconfigured interval.
|
||||
|
|
@ -128,11 +126,11 @@ impl<R: RuntimeChannel> SpanProcessor for BatchSpanProcessor<R> {
|
|||
self.message_sender
|
||||
.try_send(BatchMessage::Flush(Some(res_sender)))
|
||||
.map_err(|err| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to send flush message: {err}"))
|
||||
OTelSdkError::InternalFailure(format!("Failed to send flush message: {}", err))
|
||||
})?;
|
||||
|
||||
futures_executor::block_on(res_receiver).map_err(|err| {
|
||||
OTelSdkError::InternalFailure(format!("Flush response channel error: {err}"))
|
||||
OTelSdkError::InternalFailure(format!("Flush response channel error: {}", err))
|
||||
})?
|
||||
}
|
||||
|
||||
|
|
@ -152,11 +150,11 @@ impl<R: RuntimeChannel> SpanProcessor for BatchSpanProcessor<R> {
|
|||
self.message_sender
|
||||
.try_send(BatchMessage::Shutdown(res_sender))
|
||||
.map_err(|err| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to send shutdown message: {err}"))
|
||||
OTelSdkError::InternalFailure(format!("Failed to send shutdown message: {}", err))
|
||||
})?;
|
||||
|
||||
futures_executor::block_on(res_receiver).map_err(|err| {
|
||||
OTelSdkError::InternalFailure(format!("Shutdown response channel error: {err}"))
|
||||
OTelSdkError::InternalFailure(format!("Shutdown response channel error: {}", err))
|
||||
})?
|
||||
}
|
||||
|
||||
|
|
@ -190,22 +188,13 @@ struct BatchSpanProcessorInternal<E, R> {
|
|||
spans: Vec<SpanData>,
|
||||
export_tasks: FuturesUnordered<BoxFuture<'static, OTelSdkResult>>,
|
||||
runtime: R,
|
||||
exporter: E,
|
||||
config: BatchConfig,
|
||||
// TODO: Redesign the `SpanExporter` trait to use immutable references (`&self`)
|
||||
// for all methods. This would allow us to remove the `RwLock` and just use `Arc<E>`,
|
||||
// similar to how `crate::logs::LogExporter` is implemented.
|
||||
exporter: Arc<RwLock<E>>,
|
||||
}
|
||||
|
||||
impl<E: SpanExporter + 'static, R: RuntimeChannel> BatchSpanProcessorInternal<E, R> {
|
||||
impl<E: SpanExporter, R: RuntimeChannel> BatchSpanProcessorInternal<E, R> {
|
||||
async fn flush(&mut self, res_channel: Option<oneshot::Sender<OTelSdkResult>>) {
|
||||
let export_result = Self::export(
|
||||
self.spans.split_off(0),
|
||||
self.exporter.clone(),
|
||||
self.runtime.clone(),
|
||||
self.config.max_export_timeout,
|
||||
)
|
||||
.await;
|
||||
let export_result = self.export().await;
|
||||
let task = Box::pin(async move {
|
||||
if let Some(channel) = res_channel {
|
||||
// If a response channel is provided, attempt to send the export result through it.
|
||||
|
|
@ -254,15 +243,9 @@ impl<E: SpanExporter + 'static, R: RuntimeChannel> BatchSpanProcessorInternal<E,
|
|||
self.export_tasks.next().await;
|
||||
}
|
||||
|
||||
let batch = self.spans.split_off(0);
|
||||
let exporter = self.exporter.clone();
|
||||
let runtime = self.runtime.clone();
|
||||
let max_export_timeout = self.config.max_export_timeout;
|
||||
|
||||
let export_result = self.export().await;
|
||||
let task = async move {
|
||||
if let Err(err) =
|
||||
Self::export(batch, exporter, runtime, max_export_timeout).await
|
||||
{
|
||||
if let Err(err) = export_result {
|
||||
otel_error!(
|
||||
name: "BatchSpanProcessor.Export.Error",
|
||||
reason = format!("{}", err)
|
||||
|
|
@ -271,7 +254,6 @@ impl<E: SpanExporter + 'static, R: RuntimeChannel> BatchSpanProcessorInternal<E,
|
|||
|
||||
Ok(())
|
||||
};
|
||||
|
||||
// Special case when not using concurrent exports
|
||||
if self.config.max_concurrent_exports == 1 {
|
||||
let _ = task.await;
|
||||
|
|
@ -306,39 +288,34 @@ impl<E: SpanExporter + 'static, R: RuntimeChannel> BatchSpanProcessorInternal<E,
|
|||
// Stream has terminated or processor is shutdown, return to finish execution.
|
||||
BatchMessage::Shutdown(ch) => {
|
||||
self.flush(Some(ch)).await;
|
||||
let _ = self.exporter.write().await.shutdown();
|
||||
let _ = self.exporter.shutdown();
|
||||
return false;
|
||||
}
|
||||
// propagate the resource
|
||||
BatchMessage::SetResource(resource) => {
|
||||
self.exporter.write().await.set_resource(&resource);
|
||||
self.exporter.set_resource(&resource);
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
async fn export(
|
||||
batch: Vec<SpanData>,
|
||||
exporter: Arc<RwLock<E>>,
|
||||
runtime: R,
|
||||
max_export_timeout: Duration,
|
||||
) -> OTelSdkResult {
|
||||
async fn export(&mut self) -> OTelSdkResult {
|
||||
// Batch size check for flush / shutdown. Those methods may be called
|
||||
// when there's no work to do.
|
||||
if batch.is_empty() {
|
||||
if self.spans.is_empty() {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let exporter_guard = exporter.read().await;
|
||||
let export = exporter_guard.export(batch);
|
||||
let timeout = runtime.delay(max_export_timeout);
|
||||
let export = self.exporter.export(self.spans.split_off(0));
|
||||
let timeout = self.runtime.delay(self.config.max_export_timeout);
|
||||
let time_out = self.config.max_export_timeout;
|
||||
|
||||
pin_mut!(export);
|
||||
pin_mut!(timeout);
|
||||
|
||||
match future::select(export, timeout).await {
|
||||
Either::Left((export_res, _)) => export_res,
|
||||
Either::Right((_, _)) => Err(OTelSdkError::Timeout(max_export_timeout)),
|
||||
Either::Right((_, _)) => Err(OTelSdkError::Timeout(time_out)),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -391,7 +368,7 @@ impl<R: RuntimeChannel> BatchSpanProcessor<R> {
|
|||
export_tasks: FuturesUnordered::new(),
|
||||
runtime: timeout_runtime,
|
||||
config,
|
||||
exporter: Arc::new(RwLock::new(exporter)),
|
||||
exporter,
|
||||
};
|
||||
|
||||
processor.run(messages).await
|
||||
|
|
@ -458,8 +435,6 @@ mod tests {
|
|||
use crate::trace::{SpanData, SpanExporter};
|
||||
use futures_util::Future;
|
||||
use std::fmt::Debug;
|
||||
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
struct BlockingExporter<D> {
|
||||
|
|
@ -488,39 +463,6 @@ mod tests {
|
|||
}
|
||||
}
|
||||
|
||||
/// Exporter that records whether two exports overlap in time.
|
||||
struct TrackingExporter {
|
||||
/// Artificial delay to keep each export alive for a while.
|
||||
delay: Duration,
|
||||
/// Current number of in-flight exports.
|
||||
active: Arc<AtomicUsize>,
|
||||
/// Set to true the first time we see overlap.
|
||||
concurrent_seen: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
impl Debug for TrackingExporter {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.write_str("tracking exporter")
|
||||
}
|
||||
}
|
||||
|
||||
impl SpanExporter for TrackingExporter {
|
||||
async fn export(&self, _batch: Vec<SpanData>) -> crate::error::OTelSdkResult {
|
||||
// Increment in-flight counter and note any overlap.
|
||||
let inflight = self.active.fetch_add(1, Ordering::SeqCst) + 1;
|
||||
if inflight > 1 {
|
||||
self.concurrent_seen.store(true, Ordering::SeqCst);
|
||||
}
|
||||
|
||||
// Keep the export "busy" for a bit.
|
||||
tokio::time::sleep(self.delay).await;
|
||||
|
||||
// Decrement counter.
|
||||
self.active.fetch_sub(1, Ordering::SeqCst);
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_batch_span_processor_builder() {
|
||||
let mut env_vars = vec![
|
||||
|
|
@ -590,8 +532,8 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
// If `time_out` is `true`, then the export should fail with a timeout.
|
||||
// Else, the exporter should be able to export within the timeout duration.
|
||||
// If the time_out is true, then the result suppose to ended with timeout.
|
||||
// otherwise the exporter should be able to export within time out duration.
|
||||
async fn timeout_test_tokio(time_out: bool) {
|
||||
let config = BatchConfig {
|
||||
max_export_timeout: Duration::from_millis(if time_out { 5 } else { 60 }),
|
||||
|
|
@ -615,92 +557,24 @@ mod tests {
|
|||
assert!(shutdown_res.is_ok());
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn test_timeout_tokio_timeout() {
|
||||
#[test]
|
||||
fn test_timeout_tokio_timeout() {
|
||||
// If time_out is true, then we ask exporter to block for 60s and set timeout to 5s.
|
||||
// If time_out is false, then we ask the exporter to block for 5s and set timeout to 60s.
|
||||
// Either way, the test should be finished within 5s.
|
||||
timeout_test_tokio(true).await;
|
||||
let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
.unwrap();
|
||||
runtime.block_on(timeout_test_tokio(true));
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn test_timeout_tokio_not_timeout() {
|
||||
timeout_test_tokio(false).await;
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn test_concurrent_exports_expected() {
|
||||
// Shared state for the exporter.
|
||||
let active = Arc::new(AtomicUsize::new(0));
|
||||
let concurrent_seen = Arc::new(AtomicBool::new(false));
|
||||
|
||||
let exporter = TrackingExporter {
|
||||
delay: Duration::from_millis(50),
|
||||
active: active.clone(),
|
||||
concurrent_seen: concurrent_seen.clone(),
|
||||
};
|
||||
|
||||
// Intentionally tiny batch-size so every span forces an export.
|
||||
let config = BatchConfig {
|
||||
max_export_batch_size: 1,
|
||||
max_queue_size: 16,
|
||||
scheduled_delay: Duration::from_secs(3600), // effectively disabled
|
||||
max_export_timeout: Duration::from_secs(5),
|
||||
max_concurrent_exports: 2, // what we want to verify
|
||||
};
|
||||
|
||||
// Spawn the processor.
|
||||
let processor = BatchSpanProcessor::new(exporter, config, runtime::Tokio);
|
||||
|
||||
// Finish three spans in rapid succession.
|
||||
processor.on_end(new_test_export_span_data());
|
||||
processor.on_end(new_test_export_span_data());
|
||||
processor.on_end(new_test_export_span_data());
|
||||
|
||||
// Wait until everything has been exported.
|
||||
processor.force_flush().expect("force flush failed");
|
||||
processor.shutdown().expect("shutdown failed");
|
||||
|
||||
// Expect at least one period with >1 export in flight.
|
||||
assert!(
|
||||
concurrent_seen.load(Ordering::SeqCst),
|
||||
"exports never overlapped, processor is still serialising them"
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
||||
async fn test_exports_serial_when_max_concurrent_exports_1() {
|
||||
let active = Arc::new(AtomicUsize::new(0));
|
||||
let concurrent_seen = Arc::new(AtomicBool::new(false));
|
||||
|
||||
let exporter = TrackingExporter {
|
||||
delay: Duration::from_millis(50),
|
||||
active: active.clone(),
|
||||
concurrent_seen: concurrent_seen.clone(),
|
||||
};
|
||||
|
||||
let config = BatchConfig {
|
||||
max_export_batch_size: 1,
|
||||
max_queue_size: 16,
|
||||
scheduled_delay: Duration::from_secs(3600),
|
||||
max_export_timeout: Duration::from_secs(5),
|
||||
max_concurrent_exports: 1, // what we want to verify
|
||||
};
|
||||
|
||||
let processor = BatchSpanProcessor::new(exporter, config, runtime::Tokio);
|
||||
|
||||
// Finish several spans quickly.
|
||||
processor.on_end(new_test_export_span_data());
|
||||
processor.on_end(new_test_export_span_data());
|
||||
processor.on_end(new_test_export_span_data());
|
||||
|
||||
processor.force_flush().expect("force flush failed");
|
||||
processor.shutdown().expect("shutdown failed");
|
||||
|
||||
// There must never have been more than one export in flight.
|
||||
assert!(
|
||||
!concurrent_seen.load(Ordering::SeqCst),
|
||||
"exports overlapped even though max_concurrent_exports was 1"
|
||||
);
|
||||
#[test]
|
||||
fn test_timeout_tokio_not_timeout() {
|
||||
let runtime = tokio::runtime::Builder::new_multi_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
.unwrap();
|
||||
runtime.block_on(timeout_test_tokio(false));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,7 @@ use crate::trace::{
|
|||
IdGenerator, ShouldSample, SpanEvents, SpanLimits, SpanLinks,
|
||||
};
|
||||
use opentelemetry::{
|
||||
trace::{
|
||||
SamplingDecision, Span as _, SpanBuilder, SpanContext, SpanKind, TraceContextExt,
|
||||
TraceFlags,
|
||||
},
|
||||
trace::{SamplingDecision, SpanBuilder, SpanContext, SpanKind, TraceContextExt, TraceFlags},
|
||||
Context, InstrumentationScope, KeyValue,
|
||||
};
|
||||
use std::fmt;
|
||||
|
|
@ -284,11 +281,9 @@ impl opentelemetry::trace::Tracer for SdkTracer {
|
|||
}
|
||||
};
|
||||
|
||||
if span.is_recording() {
|
||||
// Call `on_start` for all processors
|
||||
for processor in provider.span_processors() {
|
||||
processor.on_start(&mut span, parent_cx)
|
||||
}
|
||||
// Call `on_start` for all processors
|
||||
for processor in provider.span_processors() {
|
||||
processor.on_start(&mut span, parent_cx)
|
||||
}
|
||||
|
||||
span
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
## vNext
|
||||
|
||||
- Update to [v1.34.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.34.0) of the semantic conventions.
|
||||
|
||||
## 0.30.0
|
||||
|
||||
Released 2025-May-23
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|||
CRATE_DIR="${SCRIPT_DIR}/../"
|
||||
|
||||
# freeze the spec version and generator version to make generation reproducible
|
||||
SPEC_VERSION=1.36.0
|
||||
WEAVER_VERSION=v0.16.1
|
||||
SPEC_VERSION=1.33.0
|
||||
WEAVER_VERSION=v0.15.0
|
||||
|
||||
cd "$CRATE_DIR"
|
||||
|
||||
|
|
@ -58,9 +58,4 @@ expression='
|
|||
# TODO: This workaround should be removed once the upstream generator handles this correctly.
|
||||
"${SED[@]}" 's/<key>/`key`/g' src/attribute.rs
|
||||
|
||||
# Patch: rustdoc warns about bare URLs in doc comments.
|
||||
# The following line wraps the specific Kubernetes ResourceRequirements URL with <...>
|
||||
# as suggested by rustdoc warnings, so it becomes a clickable link and the warning goes away.
|
||||
"${SED[@]}" -E 's|(/// See )(https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#resourcerequirements-v1-core)( for details)|\1<\2>\3|g' src/metric.rs
|
||||
|
||||
cargo fmt
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ comment_formats:
|
|||
default_comment_format: rust
|
||||
|
||||
params:
|
||||
schema_url: "https://opentelemetry.io/schemas/1.36.0"
|
||||
schema_url: "https://opentelemetry.io/schemas/1.33.0"
|
||||
exclude_root_namespace: []
|
||||
excluded_attributes: ["messaging.client_id"]
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -22,4 +22,4 @@ pub mod trace;
|
|||
|
||||
/// The schema URL that matches the version of the semantic conventions that
|
||||
/// this crate defines.
|
||||
pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.36.0";
|
||||
pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.33.0";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -350,15 +350,6 @@ pub use crate::attribute::K8S_DEPLOYMENT_UID;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::K8S_HPA_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::K8S_HPA_SCALETARGETREF_API_VERSION;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::K8S_HPA_SCALETARGETREF_KIND;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::K8S_HPA_SCALETARGETREF_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::K8S_HPA_UID;
|
||||
|
||||
|
|
@ -443,9 +434,6 @@ pub use crate::attribute::K8S_STATEFULSET_NAME;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::K8S_STATEFULSET_UID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::MAINFRAME_LPAR_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::OCI_MANIFEST_DIGEST;
|
||||
|
||||
|
|
@ -551,9 +539,3 @@ pub use crate::attribute::WEBENGINE_NAME;
|
|||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::WEBENGINE_VERSION;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::ZOS_SMF_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::ZOS_SYSPLEX_NAME;
|
||||
|
|
|
|||
|
|
@ -43,12 +43,6 @@ pub use crate::attribute::APP_WIDGET_ID;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::APP_WIDGET_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AWS_BEDROCK_GUARDRAIL_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AWS_BEDROCK_KNOWLEDGE_BASE_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AWS_DYNAMODB_ATTRIBUTE_DEFINITIONS;
|
||||
|
||||
|
|
@ -121,9 +115,6 @@ pub use crate::attribute::AWS_EXTENDED_REQUEST_ID;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AWS_LAMBDA_INVOKED_ARN;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AWS_LAMBDA_RESOURCE_MAPPING_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AWS_REQUEST_ID;
|
||||
|
||||
|
|
@ -146,7 +137,9 @@ pub use crate::attribute::AWS_S3_PART_NUMBER;
|
|||
pub use crate::attribute::AWS_S3_UPLOAD_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
#[allow(deprecated)]
|
||||
pub use crate::attribute::AZ_NAMESPACE;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AZ_SERVICE_REQUEST_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
|
|
@ -170,12 +163,6 @@ pub use crate::attribute::AZURE_COSMOSDB_REQUEST_BODY_SIZE;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AZURE_COSMOSDB_RESPONSE_SUB_STATUS_CODE;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AZURE_RESOURCE_PROVIDER_NAMESPACE;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::AZURE_SERVICE_REQUEST_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::CASSANDRA_CONSISTENCY_LEVEL;
|
||||
|
||||
|
|
@ -216,9 +203,6 @@ pub use crate::attribute::CLIENT_ADDRESS;
|
|||
|
||||
pub use crate::attribute::CLIENT_PORT;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::CLOUD_REGION;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::CLOUD_RESOURCE_ID;
|
||||
|
||||
|
|
@ -249,12 +233,6 @@ pub use crate::attribute::DB_STORED_PROCEDURE_NAME;
|
|||
|
||||
pub use crate::attribute::DB_SYSTEM_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::DNS_ANSWERS;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::DNS_QUESTION_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::ELASTICSEARCH_NODE_NAME;
|
||||
|
||||
|
|
@ -317,9 +295,6 @@ pub use crate::attribute::FEATURE_FLAG_PROVIDER_NAME;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::FEATURE_FLAG_RESULT_REASON;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::FEATURE_FLAG_RESULT_VALUE;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::FEATURE_FLAG_RESULT_VARIANT;
|
||||
|
||||
|
|
@ -338,12 +313,6 @@ pub use crate::attribute::GEN_AI_AGENT_ID;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::GEN_AI_AGENT_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::GEN_AI_CONVERSATION_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::GEN_AI_DATA_SOURCE_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::GEN_AI_OPENAI_REQUEST_SERVICE_TIER;
|
||||
|
||||
|
|
@ -519,12 +488,6 @@ pub use crate::attribute::SESSION_ID;
|
|||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::SESSION_PREVIOUS_ID;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::TLS_PROTOCOL_NAME;
|
||||
|
||||
#[cfg(feature = "semconv_experimental")]
|
||||
pub use crate::attribute::TLS_PROTOCOL_VERSION;
|
||||
|
||||
pub use crate::attribute::URL_FULL;
|
||||
|
||||
pub use crate::attribute::URL_PATH;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ opentelemetry_sdk = { version = "0.30", path = "../opentelemetry-sdk" }
|
|||
|
||||
[dev-dependencies]
|
||||
opentelemetry = { path = "../opentelemetry", features = ["metrics"] }
|
||||
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["metrics"] }
|
||||
opentelemetry_sdk = { path = "../opentelemetry-sdk", features = ["rt-tokio", "metrics"] }
|
||||
opentelemetry-appender-tracing = { workspace = true }
|
||||
tracing = { workspace = true, features = ["std"]}
|
||||
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
|
||||
|
|
|
|||
|
|
@ -46,10 +46,10 @@ impl opentelemetry_sdk::logs::LogExporter for LogExporter {
|
|||
} else {
|
||||
println!("Resource");
|
||||
if let Some(schema_url) = self.resource.schema_url() {
|
||||
println!("\t Resource SchemaUrl: {schema_url:?}");
|
||||
println!("\t Resource SchemaUrl: {:?}", schema_url);
|
||||
}
|
||||
self.resource.iter().for_each(|(k, v)| {
|
||||
println!("\t -> {k}={v:?}");
|
||||
println!("\t -> {}={:?}", k, v);
|
||||
});
|
||||
print_logs(batch);
|
||||
}
|
||||
|
|
@ -70,22 +70,22 @@ impl opentelemetry_sdk::logs::LogExporter for LogExporter {
|
|||
|
||||
fn print_logs(batch: LogBatch<'_>) {
|
||||
for (i, log) in batch.iter().enumerate() {
|
||||
println!("Log #{i}");
|
||||
println!("Log #{}", i);
|
||||
let (record, library) = log;
|
||||
|
||||
println!("\t Instrumentation Scope: {library:?}");
|
||||
println!("\t Instrumentation Scope: {:?}", library);
|
||||
|
||||
if let Some(event_name) = record.event_name() {
|
||||
println!("\t EventName: {event_name:?}");
|
||||
println!("\t EventName: {:?}", event_name);
|
||||
}
|
||||
if let Some(target) = record.target() {
|
||||
println!("\t Target (Scope): {target:?}");
|
||||
println!("\t Target (Scope): {:?}", target);
|
||||
}
|
||||
if let Some(trace_context) = record.trace_context() {
|
||||
println!("\t TraceId: {:?}", trace_context.trace_id);
|
||||
println!("\t SpanId: {:?}", trace_context.span_id);
|
||||
if let Some(trace_flags) = trace_context.trace_flags {
|
||||
println!("\t TraceFlags: {trace_flags:?}");
|
||||
println!("\t TraceFlags: {:?}", trace_flags);
|
||||
}
|
||||
}
|
||||
if let Some(timestamp) = record.timestamp() {
|
||||
|
|
@ -100,18 +100,18 @@ fn print_logs(batch: LogBatch<'_>) {
|
|||
);
|
||||
}
|
||||
if let Some(severity) = record.severity_text() {
|
||||
println!("\t SeverityText: {severity:?}");
|
||||
println!("\t SeverityText: {:?}", severity);
|
||||
}
|
||||
if let Some(severity) = record.severity_number() {
|
||||
println!("\t SeverityNumber: {severity:?}");
|
||||
println!("\t SeverityNumber: {:?}", severity);
|
||||
}
|
||||
if let Some(body) = record.body() {
|
||||
println!("\t Body: {body:?}");
|
||||
println!("\t Body: {:?}", body);
|
||||
}
|
||||
|
||||
println!("\t Attributes:");
|
||||
for (k, v) in record.attributes_iter() {
|
||||
println!("\t\t -> {k}: {v:?}");
|
||||
println!("\t\t -> {}: {:?}", k, v);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,11 +49,11 @@ impl PushMetricExporter for MetricExporter {
|
|||
println!("Metrics");
|
||||
println!("Resource");
|
||||
if let Some(schema_url) = metrics.resource().schema_url() {
|
||||
println!("\tResource SchemaUrl: {schema_url:?}");
|
||||
println!("\tResource SchemaUrl: {:?}", schema_url);
|
||||
}
|
||||
|
||||
metrics.resource().iter().for_each(|(k, v)| {
|
||||
println!("\t -> {k}={v:?}");
|
||||
println!("\t -> {}={:?}", k, v);
|
||||
});
|
||||
print_metrics(metrics.scope_metrics());
|
||||
Ok(())
|
||||
|
|
@ -81,14 +81,14 @@ impl PushMetricExporter for MetricExporter {
|
|||
|
||||
fn print_metrics<'a>(metrics: impl Iterator<Item = &'a ScopeMetrics>) {
|
||||
for (i, metric) in metrics.enumerate() {
|
||||
println!("\tInstrumentation Scope #{i}");
|
||||
println!("\tInstrumentation Scope #{}", i);
|
||||
let scope = metric.scope();
|
||||
println!("\t\tName : {}", scope.name());
|
||||
if let Some(version) = scope.version() {
|
||||
println!("\t\tVersion : {version:?}");
|
||||
println!("\t\tVersion : {:?}", version);
|
||||
}
|
||||
if let Some(schema_url) = scope.schema_url() {
|
||||
println!("\t\tSchemaUrl: {schema_url:?}");
|
||||
println!("\t\tSchemaUrl: {:?}", schema_url);
|
||||
}
|
||||
scope.attributes().enumerate().for_each(|(index, kv)| {
|
||||
if index == 0 {
|
||||
|
|
@ -98,7 +98,7 @@ fn print_metrics<'a>(metrics: impl Iterator<Item = &'a ScopeMetrics>) {
|
|||
});
|
||||
|
||||
metric.metrics().enumerate().for_each(|(i, metric)| {
|
||||
println!("Metric #{i}");
|
||||
println!("Metric #{}", i);
|
||||
println!("\t\tName : {}", metric.name());
|
||||
println!("\t\tDescription : {}", metric.description());
|
||||
println!("\t\tUnit : {}", metric.unit());
|
||||
|
|
@ -197,7 +197,7 @@ fn print_sum_data_points<'a, T: Debug + Copy + 'a>(
|
|||
data_points: impl Iterator<Item = &'a SumDataPoint<T>>,
|
||||
) {
|
||||
for (i, data_point) in data_points.enumerate() {
|
||||
println!("\t\tDataPoint #{i}");
|
||||
println!("\t\tDataPoint #{}", i);
|
||||
println!("\t\t\tValue : {:#?}", data_point.value());
|
||||
println!("\t\t\tAttributes :");
|
||||
for kv in data_point.attributes() {
|
||||
|
|
@ -210,7 +210,7 @@ fn print_gauge_data_points<'a, T: Debug + Copy + 'a>(
|
|||
data_points: impl Iterator<Item = &'a GaugeDataPoint<T>>,
|
||||
) {
|
||||
for (i, data_point) in data_points.enumerate() {
|
||||
println!("\t\tDataPoint #{i}");
|
||||
println!("\t\tDataPoint #{}", i);
|
||||
println!("\t\t\tValue : {:#?}", data_point.value());
|
||||
println!("\t\t\tAttributes :");
|
||||
for kv in data_point.attributes() {
|
||||
|
|
@ -223,15 +223,15 @@ fn print_hist_data_points<'a, T: Debug + Copy + 'a>(
|
|||
data_points: impl Iterator<Item = &'a HistogramDataPoint<T>>,
|
||||
) {
|
||||
for (i, data_point) in data_points.enumerate() {
|
||||
println!("\t\tDataPoint #{i}");
|
||||
println!("\t\tDataPoint #{}", i);
|
||||
println!("\t\t\tCount : {}", data_point.count());
|
||||
println!("\t\t\tSum : {:?}", data_point.sum());
|
||||
if let Some(min) = &data_point.min() {
|
||||
println!("\t\t\tMin : {min:?}");
|
||||
println!("\t\t\tMin : {:?}", min);
|
||||
}
|
||||
|
||||
if let Some(max) = &data_point.max() {
|
||||
println!("\t\t\tMax : {max:?}");
|
||||
println!("\t\t\tMax : {:?}", max);
|
||||
}
|
||||
|
||||
println!("\t\t\tAttributes :");
|
||||
|
|
@ -254,14 +254,14 @@ fn print_hist_data_points<'a, T: Debug + Copy + 'a>(
|
|||
|
||||
// Get the count for this bucket, or 0 if not available
|
||||
let count = bucket_counts_iter.next().unwrap_or(0);
|
||||
println!("\t\t\t\t {lower_bound} to {upper_bound} : {count}");
|
||||
println!("\t\t\t\t {} to {} : {}", lower_bound, upper_bound, count);
|
||||
lower_bound = upper_bound;
|
||||
}
|
||||
|
||||
// Handle the final +Infinity bucket if we processed any buckets
|
||||
if header_printed {
|
||||
let last_count = bucket_counts_iter.next().unwrap_or(0);
|
||||
println!("\t\t\t\t{lower_bound} to +Infinity : {last_count}");
|
||||
println!("\t\t\t\t{} to +Infinity : {}", lower_bound, last_count);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,11 +45,11 @@ impl opentelemetry_sdk::trace::SpanExporter for SpanExporter {
|
|||
} else {
|
||||
println!("Resource");
|
||||
if let Some(schema_url) = self.resource.schema_url() {
|
||||
println!("\tResource SchemaUrl: {schema_url:?}");
|
||||
println!("\tResource SchemaUrl: {:?}", schema_url);
|
||||
}
|
||||
|
||||
self.resource.iter().for_each(|(k, v)| {
|
||||
println!("\t -> {k}={v:?}");
|
||||
println!("\t -> {}={:?}", k, v);
|
||||
});
|
||||
|
||||
print_spans(batch);
|
||||
|
|
@ -71,17 +71,17 @@ impl opentelemetry_sdk::trace::SpanExporter for SpanExporter {
|
|||
|
||||
fn print_spans(batch: Vec<SpanData>) {
|
||||
for (i, span) in batch.into_iter().enumerate() {
|
||||
println!("Span #{i}");
|
||||
println!("Span #{}", i);
|
||||
println!("\tInstrumentation Scope");
|
||||
println!(
|
||||
"\t\tName : {:?}",
|
||||
&span.instrumentation_scope.name()
|
||||
);
|
||||
if let Some(version) = &span.instrumentation_scope.version() {
|
||||
println!("\t\tVersion : {version:?}");
|
||||
println!("\t\tVersion : {:?}", version);
|
||||
}
|
||||
if let Some(schema_url) = &span.instrumentation_scope.schema_url() {
|
||||
println!("\t\tSchemaUrl: {schema_url:?}");
|
||||
println!("\t\tSchemaUrl: {:?}", schema_url);
|
||||
}
|
||||
span.instrumentation_scope
|
||||
.attributes()
|
||||
|
|
@ -120,7 +120,7 @@ fn print_spans(batch: Vec<SpanData>) {
|
|||
if index == 0 {
|
||||
println!("\tEvents:");
|
||||
}
|
||||
println!("\tEvent #{index}");
|
||||
println!("\tEvent #{}", index);
|
||||
println!("\tName : {}", event.name);
|
||||
let datetime: DateTime<Utc> = event.timestamp.into();
|
||||
println!("\tTimestamp : {}", datetime.format("%Y-%m-%d %H:%M:%S%.6f"));
|
||||
|
|
@ -137,7 +137,7 @@ fn print_spans(batch: Vec<SpanData>) {
|
|||
if index == 0 {
|
||||
println!("\tLinks:");
|
||||
}
|
||||
println!("\tLink #{index}");
|
||||
println!("\tLink #{}", index);
|
||||
println!("\tTraceId: {}", link.span_context.trace_id());
|
||||
println!("\tSpanId : {}", link.span_context.span_id());
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ pub(crate) fn get_timeout() -> Duration {
|
|||
Some(timeout) => match timeout.parse() {
|
||||
Ok(timeout) => Duration::from_millis(timeout),
|
||||
Err(e) => {
|
||||
eprintln!("{ENV_TIMEOUT} malformed defaulting to 10000: {e}");
|
||||
eprintln!("{} malformed defaulting to 10000: {}", ENV_TIMEOUT, e);
|
||||
DEFAULT_COLLECTOR_TIMEOUT
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -38,24 +38,25 @@ pub(crate) struct JsonV2Client {
|
|||
impl JsonV2Client {
|
||||
async fn upload(&self, spans: Vec<Span>) -> OTelSdkResult {
|
||||
let body = serde_json::to_vec(&spans).map_err(|e| {
|
||||
OTelSdkError::InternalFailure(format!("JSON serialization failed: {e}"))
|
||||
OTelSdkError::InternalFailure(format!("JSON serialization failed: {}", e))
|
||||
})?;
|
||||
let req = Request::builder()
|
||||
.method(Method::POST)
|
||||
.uri(self.collector_endpoint.clone())
|
||||
.header(CONTENT_TYPE, "application/json")
|
||||
.body(body.into())
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("Failed to create request: {e}")))?;
|
||||
.map_err(|e| {
|
||||
OTelSdkError::InternalFailure(format!("Failed to create request: {}", e))
|
||||
})?;
|
||||
|
||||
let response = self
|
||||
.client
|
||||
.send_bytes(req)
|
||||
.await
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("HTTP request failed: {e}")))?;
|
||||
let response =
|
||||
self.client.send_bytes(req).await.map_err(|e| {
|
||||
OTelSdkError::InternalFailure(format!("HTTP request failed: {}", e))
|
||||
})?;
|
||||
|
||||
response
|
||||
.error_for_status()
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("HTTP response error: {e}")))?;
|
||||
.map_err(|e| OTelSdkError::InternalFailure(format!("HTTP response error: {}", e)))?;
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ impl TextMapPropagator for Propagator {
|
|||
} else {
|
||||
"0"
|
||||
};
|
||||
value = format!("{value}-{flag:01}")
|
||||
value = format!("{}-{:01}", value, flag)
|
||||
}
|
||||
|
||||
injector.set(B3_SINGLE_HEADER, value);
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
## vNext
|
||||
|
||||
- Add `get_all` method to `opentelemetry::propagation::Extractor` to return all values of the given propagation key and provide a default implementation.
|
||||
|
||||
## 0.30.0
|
||||
|
||||
Released 2025-May-23
|
||||
|
|
@ -35,7 +33,7 @@ predictable and efficient observability pipelines.
|
|||
|
||||
Release 2025-Apr-01
|
||||
|
||||
- Bug Fix: Re-export `WithContext` at `opentelemetry::trace::context::WithContext` [#2879](https://github.com/open-telemetry/opentelemetry-rust/pull/2879) to restore backwards compatibility
|
||||
- Bug Fix: Re-export `WithContext` at `opentelemetry::trace::context::WithContext` [#2879](https://github.com/open-telemetry/opentelemetry-rust/pull/2879) to restore backwards compatability
|
||||
- The new path for `WithContext` and `FutureExt` are in `opentelemetry::context` as they are independent of the trace signal. Users should prefer this path.
|
||||
|
||||
## 0.29.0
|
||||
|
|
@ -504,7 +502,7 @@ and SDK are still unstable.
|
|||
- Use current span for SDK-less context propagation #510
|
||||
- Always export span batch when limit reached #519
|
||||
- Rename message events to events #530
|
||||
- Update resource merge behavior #537
|
||||
- Update resource merge behaviour #537
|
||||
- Ignore links with invalid context #538
|
||||
|
||||
## Removed
|
||||
|
|
@ -529,7 +527,7 @@ use `opentelemetry::global::shutdown_tracer_provider` explicitly instead.
|
|||
|
||||
## Changed
|
||||
|
||||
- Pull configurations from environment variables by default when creating BatchSpanProcessor #445
|
||||
- Pull configrations from environment variables by default when creating BatchSpanProcessor #445
|
||||
- Convert doc links to intra-doc #466
|
||||
- Switch to Cow for event names #471
|
||||
- Use API to configure async runtime instead of features #481
|
||||
|
|
@ -826,7 +824,7 @@ use `opentelemetry::global::shutdown_tracer_provider` explicitly instead.
|
|||
- Make trace and metrics features optional
|
||||
- ExportResult as specified in the specification
|
||||
- Add Futures compatibility API
|
||||
- Added serde serialize support to SpanData
|
||||
- Added serde serialise support to SpanData
|
||||
- Separate OpenTelemetry Jaeger crate
|
||||
|
||||
### Changed
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ fn encode(s: &str) -> String {
|
|||
encoded_string.push(*byte as char)
|
||||
}
|
||||
b' ' => encoded_string.push_str("%20"),
|
||||
_ => encoded_string.push_str(&format!("%{byte:02X}")),
|
||||
_ => encoded_string.push_str(&format!("%{:02X}", byte)),
|
||||
}
|
||||
}
|
||||
encoded_string
|
||||
|
|
@ -412,7 +412,7 @@ impl BaggageExt for Context {
|
|||
}
|
||||
|
||||
fn with_cleared_baggage(&self) -> Self {
|
||||
self.with_baggage(Baggage::new())
|
||||
self.with_value(Baggage::new())
|
||||
}
|
||||
|
||||
fn baggage(&self) -> &Baggage {
|
||||
|
|
@ -653,28 +653,4 @@ mod tests {
|
|||
baggage.insert("(example)", "1");
|
||||
assert!(baggage.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_context_clear_baggage() {
|
||||
let ctx = Context::new();
|
||||
let ctx = ctx.with_baggage([KeyValue::new("foo", 1)]);
|
||||
let _guard = ctx.attach();
|
||||
|
||||
{
|
||||
let ctx = Context::current();
|
||||
let baggage = ctx.baggage();
|
||||
// At this point baggage should still contain the inital value.
|
||||
assert_eq!(baggage.len(), 1);
|
||||
|
||||
// Baggage gets cleared.
|
||||
let ctx = ctx.with_cleared_baggage();
|
||||
let _guard = ctx.attach();
|
||||
{
|
||||
let ctx = Context::current();
|
||||
let baggage = ctx.baggage();
|
||||
// Baggage should contain no entries.
|
||||
assert_eq!(baggage.len(), 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ impl fmt::Display for Array {
|
|||
if i > 0 {
|
||||
write!(fmt, ",")?;
|
||||
}
|
||||
write!(fmt, "\"{t}\"")?;
|
||||
write!(fmt, "\"{}\"", t)?;
|
||||
}
|
||||
write!(fmt, "]")
|
||||
}
|
||||
|
|
@ -191,7 +191,7 @@ fn display_array_str<T: fmt::Display>(slice: &[T], fmt: &mut fmt::Formatter<'_>)
|
|||
if i > 0 {
|
||||
write!(fmt, ",")?;
|
||||
}
|
||||
write!(fmt, "{t}")?;
|
||||
write!(fmt, "{}", t)?;
|
||||
}
|
||||
write!(fmt, "]")
|
||||
}
|
||||
|
|
@ -305,11 +305,11 @@ impl From<Cow<'static, str>> for StringValue {
|
|||
impl From<Value> for StringValue {
|
||||
fn from(s: Value) -> Self {
|
||||
match s {
|
||||
Value::Bool(v) => format!("{v}").into(),
|
||||
Value::I64(v) => format!("{v}").into(),
|
||||
Value::F64(v) => format!("{v}").into(),
|
||||
Value::Bool(v) => format!("{}", v).into(),
|
||||
Value::I64(v) => format!("{}", v).into(),
|
||||
Value::F64(v) => format!("{}", v).into(),
|
||||
Value::String(v) => v,
|
||||
Value::Array(v) => format!("{v}").into(),
|
||||
Value::Array(v) => format!("{}", v).into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -320,11 +320,11 @@ impl Value {
|
|||
/// This will allocate if the underlying value is not a `String`.
|
||||
pub fn as_str(&self) -> Cow<'_, str> {
|
||||
match self {
|
||||
Value::Bool(v) => format!("{v}").into(),
|
||||
Value::I64(v) => format!("{v}").into(),
|
||||
Value::F64(v) => format!("{v}").into(),
|
||||
Value::Bool(v) => format!("{}", v).into(),
|
||||
Value::I64(v) => format!("{}", v).into(),
|
||||
Value::F64(v) => format!("{}", v).into(),
|
||||
Value::String(v) => Cow::Borrowed(v.as_str()),
|
||||
Value::Array(v) => format!("{v}").into(),
|
||||
Value::Array(v) => format!("{}", v).into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,6 @@ pub trait Extractor {
|
|||
|
||||
/// Collect all the keys from the underlying data.
|
||||
fn keys(&self) -> Vec<&str>;
|
||||
|
||||
/// Get all values from a key from the underlying data.
|
||||
fn get_all(&self, key: &str) -> Option<Vec<&str>> {
|
||||
self.get(key).map(|value| vec![value])
|
||||
}
|
||||
}
|
||||
|
||||
impl<S: std::hash::BuildHasher> Injector for HashMap<String, String, S> {
|
||||
|
|
@ -82,30 +77,6 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_map_get_all() {
|
||||
let mut carrier = HashMap::new();
|
||||
carrier.set("headerName", "value".to_string());
|
||||
|
||||
assert_eq!(
|
||||
Extractor::get_all(&carrier, "HEADERNAME"),
|
||||
Some(vec!["value"]),
|
||||
"case insensitive get_all extraction"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_map_get_all_missing_key() {
|
||||
let mut carrier = HashMap::new();
|
||||
carrier.set("headerName", "value".to_string());
|
||||
|
||||
assert_eq!(
|
||||
Extractor::get_all(&carrier, "missing_key"),
|
||||
None,
|
||||
"case insensitive get_all extraction"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn hash_map_keys() {
|
||||
let mut carrier = HashMap::new();
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue