Skip to content

Commit 609a158

Browse files
lalitblalitb
authored
Merge branch 'main' into chore/integration-test-2
2 parents 2eb3eba + c726c4d commit 609a158

File tree

46 files changed

+708
-425
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+708
-425
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
Cargo.lock
66
/.idea/
77

8-
.cosine
8+
.cosine
9+
10+
opentelemetry-otlp/tests/integration_test/result.json

‎Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ tonic = { version = "0.12.3", default-features = false }
4444
tonic-build = "0.12"
4545
tokio = { version = "1", default-features = false }
4646
tokio-stream = "0.1"
47-
tracing = { version = "0.1", default-features = false }
48-
tracing-core = { version = "0.1", default-features = false }
47+
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
48+
# required for OpenTelemetry's internal logging macros.
49+
tracing = { version = ">=0.1.40", default-features = false }
50+
# `tracing-core >=0.1.33` is required for compatibility with `tracing >=0.1.40`.
51+
tracing-core = { version = ">=0.1.33", default-features = false }
4952
tracing-subscriber = { version = "0.3", default-features = false }
5053
url = { version = "2.5", default-features = false }

‎examples/logs-basic/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use opentelemetry::KeyValue;
21
use opentelemetry_appender_tracing::layer;
32
use opentelemetry_sdk::logs::LoggerProvider;
43
use opentelemetry_sdk::Resource;
@@ -8,10 +7,11 @@ use tracing_subscriber::prelude::*;
87
fn main() {
98
let exporter = opentelemetry_stdout::LogExporter::default();
109
let provider: LoggerProvider = LoggerProvider::builder()
11-
.with_resource(Resource::new(vec![KeyValue::new(
12-
"service.name",
13-
"log-appender-tracing-example",
14-
)]))
10+
.with_resource(
11+
Resource::builder()
12+
.with_service_name("log-appender-tracing-example")
13+
.build(),
14+
)
1515
.with_simple_exporter(exporter)
1616
.build();
1717
let layer = layer::OpenTelemetryTracingBridge::new(&provider);

‎examples/metrics-advanced/src/main.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
5050
.build();
5151

5252
let reader = PeriodicReader::builder(exporter).build();
53+
54+
let resource = Resource::builder()
55+
.with_service_name("metrics-advanced-example")
56+
.build();
57+
5358
let provider = SdkMeterProvider::builder()
5459
.with_reader(reader)
55-
.with_resource(Resource::new([KeyValue::new(
56-
"service.name",
57-
"metrics-advanced-example",
58-
)]))
60+
.with_resource(resource)
5961
.with_view(my_view_rename_and_unit)
6062
.with_view(my_view_drop_attributes)
6163
.with_view(my_view_change_aggregation)

‎examples/metrics-basic/src/main.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ fn init_meter_provider() -> opentelemetry_sdk::metrics::SdkMeterProvider {
1212
let reader = PeriodicReader::builder(exporter).build();
1313
let provider = SdkMeterProvider::builder()
1414
.with_reader(reader)
15-
.with_resource(Resource::new([KeyValue::new(
16-
"service.name",
17-
"metrics-basic-example",
18-
)]))
15+
.with_resource(
16+
Resource::builder()
17+
.with_service_name("metrics-basic-example")
18+
.build(),
19+
)
1920
.build();
2021
global::set_meter_provider(provider.clone());
2122
provider

‎examples/tracing-jaeger/src/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use opentelemetry::{
55
};
66
use opentelemetry_sdk::trace::TracerProvider;
77
use opentelemetry_sdk::{runtime, Resource};
8-
use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
98

109
use std::error::Error;
1110

@@ -16,10 +15,11 @@ fn init_tracer_provider() -> Result<opentelemetry_sdk::trace::TracerProvider, Tr
1615

1716
Ok(TracerProvider::builder()
1817
.with_batch_exporter(exporter, runtime::Tokio)
19-
.with_resource(Resource::new(vec![KeyValue::new(
20-
SERVICE_NAME,
21-
"tracing-jaeger",
22-
)]))
18+
.with_resource(
19+
Resource::builder()
20+
.with_service_name("tracing-jaeger")
21+
.build(),
22+
)
2323
.build())
2424
}
2525

‎opentelemetry-appender-log/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,11 +846,11 @@ mod tests {
846846

847847
assert_eq!(logs.len(), 5);
848848
for log in logs {
849-
let body: String = match log.record.body.as_ref().unwrap() {
849+
let body: String = match log.record.body().unwrap() {
850850
super::AnyValue::String(s) => s.to_string(),
851851
_ => panic!("AnyValue::String expected"),
852852
};
853-
assert_eq!(body, log.record.severity_text.unwrap());
853+
assert_eq!(body, log.record.severity_text().unwrap());
854854
}
855855
}
856856

‎opentelemetry-appender-tracing/benches/logs.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
use async_trait::async_trait;
1717
use criterion::{criterion_group, criterion_main, Criterion};
18-
use opentelemetry::{InstrumentationScope, KeyValue};
18+
use opentelemetry::InstrumentationScope;
1919
use opentelemetry_appender_tracing::layer as tracing_layer;
2020
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
2121
use opentelemetry_sdk::logs::LogResult;
@@ -126,10 +126,11 @@ fn benchmark_with_ot_layer(c: &mut Criterion, enabled: bool, bench_name: &str) {
126126
let exporter = NoopExporter { enabled };
127127
let processor = NoopProcessor::new(Box::new(exporter));
128128
let provider = LoggerProvider::builder()
129-
.with_resource(Resource::new(vec![KeyValue::new(
130-
"service.name",
131-
"benchmark",
132-
)]))
129+
.with_resource(
130+
Resource::builder_empty()
131+
.with_service_name("benchmark")
132+
.build(),
133+
)
133134
.with_log_processor(processor)
134135
.build();
135136
let ot_layer = tracing_layer::OpenTelemetryTracingBridge::new(&provider);

‎opentelemetry-appender-tracing/examples/basic.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! run with `$ cargo run --example basic
22
3-
use opentelemetry::KeyValue;
43
use opentelemetry_appender_tracing::layer;
54
use opentelemetry_sdk::{logs::LoggerProvider, Resource};
65
use tracing::error;
@@ -9,10 +8,11 @@ use tracing_subscriber::prelude::*;
98
fn main() {
109
let exporter = opentelemetry_stdout::LogExporter::default();
1110
let provider: LoggerProvider = LoggerProvider::builder()
12-
.with_resource(Resource::new(vec![KeyValue::new(
13-
"service.name",
14-
"log-appender-tracing-example",
15-
)]))
11+
.with_resource(
12+
Resource::builder()
13+
.with_service_name("log-appender-tracing-example")
14+
.build(),
15+
)
1616
.with_simple_exporter(exporter)
1717
.build();
1818
let layer = layer::OpenTelemetryTracingBridge::new(&provider);

‎opentelemetry-appender-tracing/src/layer.rs

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,10 @@ mod tests {
334334

335335
// Validate common fields
336336
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
337-
assert_eq!(log.record.severity_number, Some(Severity::Error));
337+
assert_eq!(log.record.severity_number(), Some(Severity::Error));
338338

339339
// Validate trace context is none.
340-
assert!(log.record.trace_context.is_none());
340+
assert!(log.record.trace_context().is_none());
341341

342342
// Validate attributes
343343
#[cfg(not(feature = "experimental_metadata_attributes"))]
@@ -428,25 +428,20 @@ mod tests {
428428

429429
// validate common fields.
430430
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
431-
assert_eq!(log.record.severity_number, Some(Severity::Error));
431+
assert_eq!(log.record.severity_number(), Some(Severity::Error));
432432

433433
// validate trace context.
434-
assert!(log.record.trace_context.is_some());
434+
assert!(log.record.trace_context().is_some());
435435
assert_eq!(
436-
log.record.trace_context.as_ref().unwrap().trace_id,
436+
log.record.trace_context().unwrap().trace_id,
437437
trace_id_expected
438438
);
439439
assert_eq!(
440-
log.record.trace_context.as_ref().unwrap().span_id,
440+
log.record.trace_context().unwrap().span_id,
441441
span_id_expected
442442
);
443443
assert_eq!(
444-
log.record
445-
.trace_context
446-
.as_ref()
447-
.unwrap()
448-
.trace_flags
449-
.unwrap(),
444+
log.record.trace_context().unwrap().trace_flags.unwrap(),
450445
TraceFlags::SAMPLED
451446
);
452447

@@ -526,10 +521,10 @@ mod tests {
526521

527522
// Validate common fields
528523
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
529-
assert_eq!(log.record.severity_number, Some(Severity::Error));
524+
assert_eq!(log.record.severity_number(), Some(Severity::Error));
530525

531526
// Validate trace context is none.
532-
assert!(log.record.trace_context.is_none());
527+
assert!(log.record.trace_context().is_none());
533528

534529
// Attributes can be polluted when we don't use this feature.
535530
#[cfg(feature = "experimental_metadata_attributes")]
@@ -605,25 +600,20 @@ mod tests {
605600

606601
// validate common fields.
607602
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
608-
assert_eq!(log.record.severity_number, Some(Severity::Error));
603+
assert_eq!(log.record.severity_number(), Some(Severity::Error));
609604

610605
// validate trace context.
611-
assert!(log.record.trace_context.is_some());
606+
assert!(log.record.trace_context().is_some());
612607
assert_eq!(
613-
log.record.trace_context.as_ref().unwrap().trace_id,
608+
log.record.trace_context().unwrap().trace_id,
614609
trace_id_expected
615610
);
616611
assert_eq!(
617-
log.record.trace_context.as_ref().unwrap().span_id,
612+
log.record.trace_context().unwrap().span_id,
618613
span_id_expected
619614
);
620615
assert_eq!(
621-
log.record
622-
.trace_context
623-
.as_ref()
624-
.unwrap()
625-
.trace_flags
626-
.unwrap(),
616+
log.record.trace_context().unwrap().trace_flags.unwrap(),
627617
TraceFlags::SAMPLED
628618
);
629619

‎opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ use tracing_subscriber::prelude::*;
2424
use tracing_subscriber::EnvFilter;
2525

2626
static RESOURCE: Lazy<Resource> = Lazy::new(|| {
27-
Resource::new(vec![KeyValue::new(
28-
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
29-
"basic-otlp-example",
30-
)])
27+
Resource::builder()
28+
.with_service_name("basic-otlp-example")
29+
.build()
3130
});
3231

3332
fn init_logs() -> Result<sdklogs::LoggerProvider, opentelemetry_sdk::logs::LogError> {

‎opentelemetry-otlp/examples/basic-otlp/src/main.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ use tracing_subscriber::prelude::*;
1515
use tracing_subscriber::EnvFilter;
1616

1717
static RESOURCE: Lazy<Resource> = Lazy::new(|| {
18-
Resource::new(vec![KeyValue::new(
19-
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
20-
"basic-otlp-example",
21-
)])
18+
Resource::builder()
19+
.with_service_name("basic-otlp-example")
20+
.build()
2221
});
2322

2423
fn init_traces() -> Result<sdktrace::TracerProvider, TraceError> {

‎opentelemetry-otlp/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
//! .with_max_events_per_span(64)
163163
//! .with_max_attributes_per_span(16)
164164
//! .with_max_events_per_span(16)
165-
//! .with_resource(Resource::new(vec![KeyValue::new("service.name", "example")])),
165+
//! .with_resource(Resource::builder_empty().with_attributes([KeyValue::new("service.name", "example")]).build()),
166166
//! ).build();
167167
//! global::set_tracer_provider(tracer_provider);
168168
//! let tracer = global::tracer("tracer-name");
@@ -186,7 +186,7 @@
186186
//!
187187
//! let provider = opentelemetry_sdk::metrics::SdkMeterProvider::builder()
188188
//! .with_reader(reader)
189-
//! .with_resource(Resource::new(vec![KeyValue::new("service.name", "example")]))
189+
//! .with_resource(Resource::builder_empty().with_attributes([KeyValue::new("service.name", "example")]).build())
190190
//! .build();
191191
//! # }
192192
//!

‎opentelemetry-otlp/tests/integration_test/tests/logs.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use ctor::dtor;
55
use integration_test_runner::logs_asserter::{read_logs_from_json, LogsAsserter};
66
use integration_test_runner::test_utils;
77
use log::{info, Level};
8-
use opentelemetry::KeyValue;
98
use opentelemetry_appender_log::OpenTelemetryLogBridge;
109
use opentelemetry_otlp::LogExporter;
1110
use opentelemetry_sdk::logs::{LogError, LoggerProvider};
@@ -31,10 +30,11 @@ fn init_logs() -> Result<sdklogs::LoggerProvider> {
3130

3231
Ok(LoggerProvider::builder()
3332
.with_batch_exporter(exporter, runtime::Tokio)
34-
.with_resource(Resource::new(vec![KeyValue::new(
35-
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
36-
"logs-integration-test",
37-
)]))
33+
.with_resource(
34+
Resource::builder_empty()
35+
.with_service_name("logs-integration-test")
36+
.build(),
37+
)
3838
.build())
3939
}
4040

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ fn init_tracer_provider() -> Result<sdktrace::TracerProvider, TraceError> {
3737

3838
Ok(opentelemetry_sdk::trace::TracerProvider::builder()
3939
.with_batch_exporter(exporter, runtime::Tokio)
40-
.with_resource(Resource::new(vec![KeyValue::new(
41-
opentelemetry_semantic_conventions::resource::SERVICE_NAME,
42-
"basic-otlp-tracing-example",
43-
)]))
40+
.with_resource(
41+
Resource::builder_empty()
42+
.with_service_name("basic-otlp-tracing-example")
43+
.build(),
44+
)
4445
.build())
4546
}
4647

0 commit comments

Comments
 (0)