Skip to content

Commit b29fa99

Browse files
authored
Add log appender for tracing (#1085)
1 parent e56a711 commit b29fa99

File tree

11 files changed

+457
-2
lines changed

11 files changed

+457
-2
lines changed

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ members = [
1111
"opentelemetry-jaeger/examples/actix-udp",
1212
"opentelemetry-jaeger/examples/remote-sampler",
1313
"opentelemetry-appender-log",
14+
"opentelemetry-appender-tracing",
1415
"opentelemetry-otlp",
1516
"opentelemetry-prometheus",
1617
"opentelemetry-proto",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Changelog
2+
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
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[package]
2+
name = "opentelemetry-appender-tracing"
3+
version = "0.1.0"
4+
edition = "2021"
5+
description = "An OpenTelemetry log appender for the tracing crate"
6+
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-tracing"
7+
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-tracing"
8+
readme = "README.md"
9+
keywords = ["opentelemetry", "log", "logs", "tracing"]
10+
license = "Apache-2.0"
11+
rust-version = "1.60"
12+
13+
[dependencies]
14+
opentelemetry_api = { version = "0.19", path = "../opentelemetry-api", features = ["logs"]}
15+
opentelemetry_sdk = { version = "0.19", path = "../opentelemetry-sdk", features = ["logs"]}
16+
tracing = {version = "0.1.37", default-features = false, features = ["std"]}
17+
tracing-core = "0.1.31"
18+
tracing-subscriber = { version = "0.3.0", default-features = false, features = ["registry", "std"] }
19+
once_cell = "1.13.0"
20+
21+
[dev-dependencies]
22+
opentelemetry-stdout = {path = "../opentelemetry-stdout", features = ["logs"] }
+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
![OpenTelemetry — An observability framework for cloud-native software.][splash]
2+
3+
[splash]: https://raw.githubusercontent.com/open-telemetry/opentelemetry-rust/main/assets/logo-text.png
4+
5+
# OpenTelemetry Log Appender for Tracing
6+
7+
A [Log
8+
Appender](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/glossary.md#log-appender--bridge)
9+
that bridges logs from the [tracing crate](https://tracing.rs/tracing/#events)
10+
to OpenTelemetry logs. Note that this is different from the existing
11+
[tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry)
12+
project, which supports bridging traces and logs from tracing into OpenTelemetry
13+
traces. This is an experimental component, and could be merged with the
14+
tracing-opentelemetry crate itself.
15+
16+
[![Crates.io: opentelemetry-appender-tracing](https://img.shields.io/crates/v/opentelemetry-appender-tracing.svg)](https://crates.io/crates/opentelemetry-appender-tracing)
17+
[![Documentation](https://docs.rs/opentelemetry-appender-tracing/badge.svg)](https://docs.rs/opentelemetry-appender-tracing)
18+
[![LICENSE](https://img.shields.io/crates/l/opentelemetry-appender-tracing)](./LICENSE)
19+
[![GitHub Actions CI](https://github.com/open-telemetry/opentelemetry-rust/workflows/CI/badge.svg)](https://github.com/open-telemetry/opentelemetry-rust/actions?query=workflow%3ACI+branch%3Amain)
20+
[![Slack](https://img.shields.io/badge/slack-@cncf/otel/rust-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C03GDP0H023)
21+
22+
## Overview
23+
24+
[`OpenTelemetry`] is a collection of tools, APIs, and SDKs used to instrument,
25+
generate, collect, and export telemetry data (metrics, logs, and traces) for
26+
analysis in order to understand your software's performance and behavior. This
27+
crate provides additional propagators and exporters for sending telemetry data
28+
to vendors or using experimental propagators like `base64`.
29+
30+
[`OpenTelemetry`]: https://crates.io/crates/opentelemetry
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//! run with `$ cargo run --example basic
2+
3+
use opentelemetry_api::KeyValue;
4+
use opentelemetry_appender_tracing::layer;
5+
use opentelemetry_sdk::{
6+
logs::{Config, LoggerProvider},
7+
Resource,
8+
};
9+
use tracing::error;
10+
use tracing_subscriber::prelude::*;
11+
12+
fn main() {
13+
let exporter = opentelemetry_stdout::LogExporter::default();
14+
let provider: LoggerProvider = LoggerProvider::builder()
15+
.with_config(
16+
Config::default().with_resource(Resource::new(vec![KeyValue::new(
17+
"service.name",
18+
"log-appender-tracing-example",
19+
)])),
20+
)
21+
.with_simple_exporter(exporter)
22+
.build();
23+
let layer = layer::OpenTelemetryTracingBridge::new(&provider);
24+
tracing_subscriber::registry().with(layer).init();
25+
26+
error!(target: "my-system", event_id = 20, event_name = "my-event_name", user_name = "otel", user_email = "otel@opentelemetry.io");
27+
drop(provider);
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
use opentelemetry_api::{
2+
logs::LoggerProvider,
3+
logs::Severity,
4+
logs::{LogRecord, Logger},
5+
OrderMap,
6+
};
7+
8+
use tracing_subscriber::Layer;
9+
10+
const INSTRUMENTATION_LIBRARY_NAME: &str = "opentelemetry-appender-tracing";
11+
12+
/// Visitor to record the fields from the event record.
13+
struct EventVisitor<'a> {
14+
log_record: &'a mut LogRecord,
15+
}
16+
17+
impl<'a> tracing::field::Visit for EventVisitor<'a> {
18+
fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
19+
if field.name() == "message" {
20+
self.log_record.body = Some(format!("{value:?}").into());
21+
} else if let Some(ref mut map) = self.log_record.attributes {
22+
map.insert(field.name().into(), format!("{value:?}").into());
23+
} else {
24+
let mut map = OrderMap::with_capacity(1);
25+
map.insert(field.name().into(), format!("{value:?}").into());
26+
self.log_record.attributes = Some(map);
27+
}
28+
}
29+
30+
// TODO: All record functions should be implemented instead of relying
31+
// of record_debug which stores everything as string.
32+
}
33+
34+
pub struct OpenTelemetryTracingBridge<P, L>
35+
where
36+
P: LoggerProvider<Logger = L> + Send + Sync,
37+
L: Logger + Send + Sync,
38+
{
39+
logger: L,
40+
_phantom: std::marker::PhantomData<P>, // P is not used.
41+
}
42+
43+
impl<P, L> OpenTelemetryTracingBridge<P, L>
44+
where
45+
P: LoggerProvider<Logger = L> + Send + Sync,
46+
L: Logger + Send + Sync,
47+
{
48+
pub fn new(provider: &P) -> Self {
49+
OpenTelemetryTracingBridge {
50+
logger: provider.logger(INSTRUMENTATION_LIBRARY_NAME),
51+
_phantom: Default::default(),
52+
}
53+
}
54+
}
55+
56+
impl<S, P, L> Layer<S> for OpenTelemetryTracingBridge<P, L>
57+
where
58+
S: tracing::Subscriber,
59+
P: LoggerProvider<Logger = L> + Send + Sync + 'static,
60+
L: Logger + Send + Sync + 'static,
61+
{
62+
fn on_event(
63+
&self,
64+
event: &tracing::Event<'_>,
65+
_ctx: tracing_subscriber::layer::Context<'_, S>,
66+
) {
67+
let meta = event.metadata();
68+
let mut log_record: LogRecord = LogRecord::default();
69+
log_record.severity_number = Some(map_severity_to_otel_severity(meta.level().as_str()));
70+
log_record.severity_text = Some(meta.level().to_string().into());
71+
72+
let mut visitor = EventVisitor {
73+
log_record: &mut log_record,
74+
};
75+
event.record(&mut visitor);
76+
self.logger.emit(log_record);
77+
}
78+
}
79+
80+
fn map_severity_to_otel_severity(level: &str) -> Severity {
81+
match level {
82+
"INFO" => Severity::Info,
83+
"DEBUG" => Severity::Debug,
84+
"TRACE" => Severity::Trace,
85+
"WARN" => Severity::Warn,
86+
"ERROR" => Severity::Error,
87+
_ => Severity::Info, // won't reach here
88+
}
89+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub mod layer;

0 commit comments

Comments
 (0)