Skip to content

Commit 50c82de

Browse files
authored
Merge branch 'main' into coverage-dependencies
2 parents e784da5 + 1169445 commit 50c82de

File tree

4 files changed

+31
-7
lines changed

4 files changed

+31
-7
lines changed

opentelemetry-otlp/CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22

33
## vNext
44

5-
- **Breaking** Remove support for surf HTTP client [#1537](https://github.com/open-telemetry/opentelemetry-rust/pull/1537)
5+
### Fixed
6+
- Fix `tonic()` to the use correct port. [#1556](https://github.com/open-telemetry/opentelemetry-rust/pull/1556)
7+
8+
### Changed
69
- Update to tonic 0.11 and prost 0.12 (#1536)
10+
11+
### Removed
12+
- **Breaking** Remove support for surf HTTP client [#1537](https://github.com/open-telemetry/opentelemetry-rust/pull/1537)
713
- Remove support for grpcio transport (#1534)
814

915
## v0.14.0

opentelemetry-otlp/src/exporter/mod.rs

+22
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,28 @@ mod tests {
245245
)
246246
}
247247

248+
#[cfg(feature = "http-proto")]
249+
#[test]
250+
fn test_default_http_endpoint() {
251+
let exporter_builder = crate::new_exporter().http();
252+
253+
assert_eq!(
254+
exporter_builder.exporter_config.endpoint,
255+
"http://localhost:4318"
256+
);
257+
}
258+
259+
#[cfg(feature = "grpc-tonic")]
260+
#[test]
261+
fn test_default_tonic_endpoint() {
262+
let exporter_builder = crate::new_exporter().tonic();
263+
264+
assert_eq!(
265+
exporter_builder.exporter_config.endpoint,
266+
"http://localhost:4317"
267+
);
268+
}
269+
248270
#[test]
249271
fn test_parse_header_string() {
250272
let test_cases = vec![

opentelemetry-otlp/src/exporter/tonic/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ impl Default for TonicExporterBuilder {
149149
TonicExporterBuilder {
150150
exporter_config: ExportConfig {
151151
protocol: crate::Protocol::Grpc,
152+
endpoint: crate::exporter::default_endpoint(crate::Protocol::Grpc),
152153
..Default::default()
153154
},
154155
tonic_config,

opentelemetry-otlp/tests/integration_test/tests/traces.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use opentelemetry::{
66
trace::{TraceContextExt, Tracer},
77
Key, KeyValue,
88
};
9-
use opentelemetry_otlp::WithExportConfig;
109
use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};
1110
use std::error::Error;
1211
use std::fs::File;
@@ -15,11 +14,7 @@ use std::os::unix::fs::MetadataExt;
1514
fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
1615
opentelemetry_otlp::new_pipeline()
1716
.tracing()
18-
.with_exporter(
19-
opentelemetry_otlp::new_exporter()
20-
.tonic()
21-
.with_endpoint("http://localhost:4317"),
22-
)
17+
.with_exporter(opentelemetry_otlp::new_exporter().tonic())
2318
.with_trace_config(
2419
sdktrace::config().with_resource(Resource::new(vec![KeyValue::new(
2520
opentelemetry_semantic_conventions::resource::SERVICE_NAME,

0 commit comments

Comments
 (0)