Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest rust stable, adopt pendantic clippy, other tidyings #13

Merged
merged 10 commits into from
Nov 30, 2023
27 changes: 12 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
[package]
name = "tracing-axiom"
version = "0.4.0"
authors = ["Arne Bahlo <[email protected]>"]
version = "0.5.0"
authors = ["Arne Bahlo <[email protected]>", "Darach Ennis <[email protected]>"]
darach marked this conversation as resolved.
Show resolved Hide resolved
edition = "2021"
rust-version = "1.60"
rust-version = "1.73"
license = "MIT OR Apache-2.0"
description = "The tracing layer for shipping traces to Axiom"
homepage = "https://axiom.co"
repository = "https://github.com/axiomhq/tracing-axiom"
documentation = "https://docs.rs/tracing-axiom"
keywords = ["tracing", "axiom", "instrumentation"]
keywords = ["tracing", "axiom", "instrumentation", "opentelemetry"]
readme = "README.md"
include = ["src/**/*.rs", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
resolver = "2"

[dependencies]
opentelemetry = { version = "0.17", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.10", features = ["prost", "tokio", "http-proto"] }
opentelemetry-http = { version = "0.6", features = ["reqwest"] }
opentelemetry = { version = "0.20", features = ["rt-tokio"] }
opentelemetry-otlp = { version = "0.13", features = ["prost", "tokio", "http-proto", "reqwest-client" ] }
tracing-core = { version = "0.1", default-features = false, features = ["std"] }
tracing-opentelemetry = { version = "0.17", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false, features = ["smallvec", "std"] }
tracing-opentelemetry = { version = "0.21", default-features = false }
tracing-subscriber = { version = "0.3", default-features = false, features = ["smallvec", "std", "registry", "fmt", "json" ] }
reqwest = { version = "0.11", default-features = false }
thiserror = "1"
url = "2"
opentelemetry-semantic-conventions = "0.9"
opentelemetry-semantic-conventions = "0.12"
url = "2.4.1"

[dev-dependencies]
tokio = "1"
tracing = "0.1"
opentelemetry = { version = "0.17", features = ["rt-tokio"] }
axiom-rs = "0.3"
uuid = { version = "1", features = ["v4"] }
tracing = { version = "0.1", features = [ "log" ] }
opentelemetry = { version = "0.20", features = ["rt-tokio"] }

[features]
default = ["default-tls"]
Expand Down
12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# :warning: EXPERIMENTAL :warning:

This is still experimental. Traces are ingested raw into Axiom and there's no nice way to view them (yet).

----

![tracing-axiom: The official Rust tracing layer for Axiom](.github/images/banner-dark.svg#gh-dark-mode-only)
![tracing-axiom: The official Rust tracing layer for Axiom](.github/images/banner-light.svg#gh-light-mode-only)
Expand Down Expand Up @@ -40,11 +35,12 @@ Then create an API token with ingest permission into that dataset in

Now you can set up tracing in one line like this:

```rust
```rust,no_run
#[tokio::main]
async fn main() {
let _guard = tracing_axiom::init(); // or try_init() if you want to handle errors
async fn main() -> Result<(), Box<dyn std::error::Error>> {
tracing_axiom::init()?;
say_hello();
Ok(())
}

#[tracing::instrument]
Expand Down
40 changes: 40 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
# Ensure we do not use any libraries that have licenses incompatible ASL-2 / MIT
#

[licenses]
unlicensed = "deny"
default = "deny"
copyleft = "deny"
allow = [
# "0BSD",
"Apache-2.0",
# "BSD-2-Clause",
"BSD-3-Clause",
"BSL-1.0",
# "CC0-1.0",
# "ISC",
"MIT",
# "OpenSSL",
"Unicode-DFS-2016",
"Zlib"
]

exceptions = [
# MPL-2.0 are added case-by-case to make sure we are in compliance. To be in
# compliance we cannot be modifying the source files.
]

[licenses.private]
ignore = true

[[licenses.clarify]]
name = "ring"
version = "*"
expression = "MIT AND ISC AND OpenSSL"
license-files = [
{ path = "LICENSE", hash = 0xbd0eed23 }
]

[advisories]
ignore = [ ]
Loading