Skip to content

fix otel crate api breakage #186

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.

Sign up for GitHub

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

Merged
paultag merged 1 commit into from
Nov 14, 2024
Merged

fix otel crate api breakage #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions src/bin/machine-api/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use anyhow::Result;
use clap::{Parser, Subcommand};
use opentelemetry::{trace::TracerProvider, KeyValue};
use opentelemetry_otlp::WithExportConfig;
use opentelemetry_sdk::Resource;
use opentelemetry::trace::TracerProvider;
use tracing_subscriber::prelude::*;

mod config;
Expand Down Expand Up @@ -129,19 +127,12 @@
)
};

let otlp_host = match std::env::var("OTEL_EXPORTER_OTLP_ENDPOINT") {
Ok(val) => val,
Err(_) => "http://localhost:4317".to_string(),
};

let provider = opentelemetry_otlp::new_pipeline()
.tracing()
.with_exporter(opentelemetry_otlp::new_exporter().tonic().with_endpoint(otlp_host))
.with_trace_config(
opentelemetry_sdk::trace::Config::default()
.with_resource(Resource::new(vec![KeyValue::new("service.name", "machine-api")])),
let provider = opentelemetry_sdk::trace::TracerProvider::builder()
.with_batch_exporter(
opentelemetry_otlp::SpanExporter::builder().with_tonic().build()?,
opentelemetry_sdk::runtime::Tokio,

Check warning on line 133 in src/bin/machine-api/main.rs

View check run for this annotation

Codecov / codecov/patch

src/bin/machine-api/main.rs#L130-L133 

Added lines #L130 - L133 were not covered by tests
)
.install_batch(opentelemetry_sdk::runtime::Tokio)?;
.build();

Check warning on line 135 in src/bin/machine-api/main.rs

View check run for this annotation

Codecov / codecov/patch

src/bin/machine-api/main.rs#L135 

Added line #L135 was not covered by tests

opentelemetry::global::set_tracer_provider(provider.clone());
let tracer = provider.tracer("tracing-otel-subscriber");
Expand Down
2 changes: 1 addition & 1 deletion src/server/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pub async fn create_server(
/// Get the OpenAPI specification for the server.
pub fn get_openapi(api: &mut ApiDescription<Arc<Context>>) -> Result<serde_json::Value> {
// Create the API schema.
let mut definition = api.openapi("machine-api", clap::crate_version!());
let mut definition = api.openapi("machine-api", clap::crate_version!().parse()?);
definition
.description("")
.contact_url("https://zoo.dev")
Expand Down