actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2025-02-22 10:23:18 +01:00
Code Issues Releases Wiki Activity

Support opentelemetry 0.18 (#89)

Browse Source 
* Support opentelemetry 0.18

* Update github workflow
This commit is contained in:
Riley 2022-09-20 03:36:55 -05:00 committed by GitHub
parent 973d9b0389
commit 2ffc110e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/general.yml vendored
View File

@ -53,6 +53,7 @@ jobs:
- opentelemetry_0_15
- opentelemetry_0_16
- opentelemetry_0_17
- opentelemetry_0_18
steps:
- uses: actions/checkout@v2
- name: Cache dependencies

4
Cargo.toml
View File

@ -25,24 +25,26 @@ opentelemetry_0_14 = ["opentelemetry_0_14_pkg", "tracing-opentelemetry_0_13_pkg"
opentelemetry_0_15 = ["opentelemetry_0_15_pkg", "tracing-opentelemetry_0_14_pkg"]
opentelemetry_0_16 = ["opentelemetry_0_16_pkg", "tracing-opentelemetry_0_16_pkg"]
opentelemetry_0_17 = ["opentelemetry_0_17_pkg", "tracing-opentelemetry_0_17_pkg"]
opentelemetry_0_18 = ["opentelemetry_0_18_pkg", "tracing-opentelemetry_0_18_pkg"]
emit_event_on_error = []
[dependencies]
actix-web = { version = "4", default-features = false }
pin-project = "1.0.0"
tracing = "0.1.19"
tracing-futures = "0.2.4"
uuid = { version = "1", features = ["v4"] }
opentelemetry_0_13_pkg = { package = "opentelemetry", version = "0.13", optional = true }
opentelemetry_0_14_pkg = { package = "opentelemetry", version = "0.14", optional = true }
opentelemetry_0_15_pkg = { package = "opentelemetry", version = "0.15", optional = true }
opentelemetry_0_16_pkg = { package = "opentelemetry", version = "0.16", optional = true }
opentelemetry_0_17_pkg = { package = "opentelemetry", version = "0.17", optional = true }
opentelemetry_0_18_pkg = { package = "opentelemetry", version = "0.18", optional = true }
tracing-opentelemetry_0_12_pkg = { package = "tracing-opentelemetry",version = "0.12", optional = true }
tracing-opentelemetry_0_13_pkg = { package = "tracing-opentelemetry", version = "0.13", optional = true }
tracing-opentelemetry_0_14_pkg = { package = "tracing-opentelemetry",version = "0.14", optional = true }
tracing-opentelemetry_0_16_pkg = { package = "tracing-opentelemetry",version = "0.16", optional = true }
tracing-opentelemetry_0_17_pkg = { package = "tracing-opentelemetry",version = "0.17", optional = true }
tracing-opentelemetry_0_18_pkg = { package = "tracing-opentelemetry",version = "0.18", optional = true }
[dev-dependencies]
actix-web = { version = "4", default-features = false, features = ["macros"] }

18
src/lib.rs
View File

@ -252,7 +252,8 @@ pub mod root_span_macro;
feature = "opentelemetry_0_14",
feature = "opentelemetry_0_15",
feature = "opentelemetry_0_16",
feature = "opentelemetry_0_17"
feature = "opentelemetry_0_17",
feature = "opentelemetry_0_18"
))]
mod otel;
@ -268,6 +269,9 @@ compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_16\
#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_17"))]
compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_13", feature = "opentelemetry_0_18"))]
compile_error!("feature \"opentelemetry_0_13\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_15"))]
compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_15\" cannot be enabled at the same time");
@ -277,11 +281,23 @@ compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_16\
#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_17"))]
compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_14", feature = "opentelemetry_0_18"))]
compile_error!("feature \"opentelemetry_0_14\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_16"))]
compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_16\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_17"))]
compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_15", feature = "opentelemetry_0_18"))]
compile_error!("feature \"opentelemetry_0_15\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_16", feature = "opentelemetry_0_17"))]
compile_error!("feature \"opentelemetry_0_16\" and feature \"opentelemetry_0_17\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_16", feature = "opentelemetry_0_18"))]
compile_error!("feature \"opentelemetry_0_16\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");
#[cfg(all(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18"))]
compile_error!("feature \"opentelemetry_0_17\" and feature \"opentelemetry_0_18\" cannot be enabled at the same time");

8
src/otel.rs
View File

@ -10,6 +10,8 @@ use opentelemetry_0_15_pkg as opentelemetry;
use opentelemetry_0_16_pkg as opentelemetry;
#[cfg(feature = "opentelemetry_0_17")]
use opentelemetry_0_17_pkg as opentelemetry;
#[cfg(feature = "opentelemetry_0_18")]
use opentelemetry_0_18_pkg as opentelemetry;
#[cfg(feature = "opentelemetry_0_13")]
use tracing_opentelemetry_0_12_pkg as tracing_opentelemetry;
@ -21,6 +23,8 @@ use tracing_opentelemetry_0_14_pkg as tracing_opentelemetry;
use tracing_opentelemetry_0_16_pkg as tracing_opentelemetry;
#[cfg(feature = "opentelemetry_0_17")]
use tracing_opentelemetry_0_17_pkg as tracing_opentelemetry;
#[cfg(feature = "opentelemetry_0_18")]
use tracing_opentelemetry_0_18_pkg as tracing_opentelemetry;
use opentelemetry::propagation::Extractor;
@ -54,10 +58,10 @@ pub(crate) fn set_otel_parent(req: &ServiceRequest, span: &tracing::Span) {
span.set_parent(parent_context);
// If we have a remote parent span, this will be the parent's trace identifier.
// If not, it will be the newly generated trace identifier with this request as root span.
#[cfg(not(feature = "opentelemetry_0_17"))]
#[cfg(not(any(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18")))]
let trace_id = span.context().span().span_context().trace_id().to_hex();
#[cfg(feature = "opentelemetry_0_17")]
#[cfg(any(feature = "opentelemetry_0_17", feature = "opentelemetry_0_18"))]
let trace_id = {
let id = span.context().span().span_context().trace_id();
format!("{:032x}", id)

3
src/root_span_macro.rs
View File

@ -134,7 +134,8 @@ pub mod private {
feature = "opentelemetry_0_14",
feature = "opentelemetry_0_15",
feature = "opentelemetry_0_16",
feature = "opentelemetry_0_17"
feature = "opentelemetry_0_17",
feature = "opentelemetry_0_18"
))]
crate::otel::set_otel_parent(req, span);
}