Skip to content

Commit 47095f0

Browse files
authored
Move datadog and aws out of contrib crate (#446)
1 parent a021dd0 commit 47095f0

File tree

33 files changed

+1725
-1124
lines changed

33 files changed

+1725
-1124
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- uses: actions-rs/cargo@v1
7272
with:
7373
command: test
74-
args: -p opentelemetry --all-features --no-fail-fast
74+
args: -p opentelemetry -p opentelemetry-jaeger -p opentelemetry-zipkin -p opentelemetry-datadog -p opentelemetry-aws --all-features --no-fail-fast
7575
env:
7676
CARGO_INCREMENTAL: '0'
7777
RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
members = [
33
"opentelemetry",
44
"opentelemetry-contrib",
5+
"opentelemetry-datadog",
56
"opentelemetry-http",
67
"opentelemetry-jaeger",
78
"opentelemetry-otlp",
89
"opentelemetry-prometheus",
10+
"opentelemetry-aws",
911
"opentelemetry-semantic-conventions",
1012
"opentelemetry-zipkin",
1113
"examples/actix-http",

examples/aws-xray/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ path = "src/client.rs"
1717
hyper = { version = "0.14", features = ["full"] }
1818
tokio = { version = "1.0", features = ["full"] }
1919
opentelemetry = { path = "../../opentelemetry" }
20-
opentelemetry-contrib = { path = "../../opentelemetry-contrib", features = ["aws-xray"] }
20+
opentelemetry-aws = { path = "../../opentelemetry-aws", features = ["trace"] }
2121
opentelemetry-http = { path = "../../opentelemetry-http" }

examples/aws-xray/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use opentelemetry::{
66
trace::{TraceContextExt, Tracer},
77
Context, KeyValue,
88
};
9-
use opentelemetry_contrib::trace::propagator::XrayPropagator;
9+
use opentelemetry_aws::XrayPropagator;
1010
use opentelemetry_http::HeaderInjector;
1111

1212
fn init_tracer() -> (sdktrace::Tracer, stdout::Uninstall) {

examples/aws-xray/src/server.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use opentelemetry::{
66
sdk::trace as sdktrace,
77
trace::{Span, Tracer},
88
};
9-
use opentelemetry_contrib::trace::propagator::XrayPropagator;
9+
use opentelemetry_aws::XrayPropagator;
1010
use opentelemetry_http::HeaderExtractor;
1111
use std::{convert::Infallible, net::SocketAddr};
1212

examples/datadog/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ edition = "2018"
55

66
[dependencies]
77
opentelemetry = { path = "../../opentelemetry" }
8-
opentelemetry-contrib = { path = "../../opentelemetry-contrib", features = ["datadog", "reqwest-blocking-client"] }
8+
opentelemetry-datadog = { path = "../../opentelemetry-datadog", features = ["reqwest-blocking-client"] }

examples/datadog/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use opentelemetry::{
33
trace::{Span, TraceContextExt, Tracer},
44
Key,
55
};
6-
use opentelemetry_contrib::trace::exporter::datadog::{new_pipeline, ApiVersion};
6+
use opentelemetry_datadog::{new_pipeline, ApiVersion};
77
use std::thread;
88
use std::time::Duration;
99

opentelemetry-aws/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## v0.1.0
2+
3+
### Added
4+
5+
- AWS XRay propagator

opentelemetry-aws/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Code owners file.
2+
# This file controls who is tagged for review for any given pull request.
3+
4+
# For anything not explicitly taken by someone else:
5+
* @open-telemetry/rust-approvers

opentelemetry-aws/Cargo.toml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
[package]
2+
name = "opentelemetry-aws"
3+
version = "0.1.0"
4+
authors = ["OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>"]
5+
description = "AWS exporters and propagators for OpenTelemetry"
6+
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-aws"
7+
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-aws"
8+
readme = "README.md"
9+
categories = [
10+
"development-tools::debugging",
11+
"development-tools::profiling",
12+
]
13+
keywords = ["opentelemetry", "tracing"]
14+
license = "Apache-2.0"
15+
edition = "2018"
16+
17+
[package.metadata.docs.rs]
18+
all-features = true
19+
rustdoc-args = ["--cfg", "docsrs"]
20+
21+
[features]
22+
default = ["trace"]
23+
trace = ["opentelemetry/trace"]
24+
25+
[dependencies]
26+
opentelemetry = { version = "0.12", path = "../opentelemetry", features = ["trace"] }
27+
lazy_static = "1.4"
28+
29+
[dev-dependencies]
30+
opentelemetry = { path = "../opentelemetry", features = ["trace", "testing"] }

0 commit comments

Comments
 (0)