Skip to content

Commit

Permalink
Merge pull request #49 from Kuadrant/tracing-otel
Browse files Browse the repository at this point in the history
  • Loading branch information
adam-cattermole authored Mar 25, 2024
2 parents 336d967 + c0bb113 commit eee0fbf
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 2 deletions.
39 changes: 37 additions & 2 deletions src/filter/http_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,44 @@ use crate::envoy::{
RateLimitDescriptor, RateLimitDescriptor_Entry, RateLimitRequest, RateLimitResponse,
RateLimitResponse_Code,
};
use crate::filter::http_context::TracingHeader::{Baggage, Traceparent, Tracestate};
use crate::utils::tokenize_with_escaping;
use log::{debug, info, warn};
use protobuf::Message;
use proxy_wasm::traits::{Context, HttpContext};
use proxy_wasm::types::Action;
use proxy_wasm::types::{Action, Bytes};
use std::rc::Rc;
use std::time::Duration;

const RATELIMIT_SERVICE_NAME: &str = "envoy.service.ratelimit.v3.RateLimitService";
const RATELIMIT_METHOD_NAME: &str = "ShouldRateLimit";

// tracing headers
pub enum TracingHeader {
Traceparent,
Tracestate,
Baggage,
}

impl TracingHeader {
fn all() -> [Self; 3] {
[Traceparent, Tracestate, Baggage]
}

fn as_str(&self) -> &'static str {
match self {
Traceparent => "traceparent",
Tracestate => "tracestate",
Baggage => "baggage",
}
}
}

pub struct Filter {
pub context_id: u32,
pub config: Rc<FilterConfig>,
pub response_headers_to_add: Vec<(String, String)>,
pub tracing_headers: Vec<(TracingHeader, Bytes)>,
}

impl Filter {
Expand Down Expand Up @@ -51,11 +74,17 @@ impl Filter {

let rl_req_serialized = Message::write_to_bytes(&rl_req).unwrap(); // TODO(rahulanand16nov): Error Handling

let rl_tracing_headers = self
.tracing_headers
.iter()
.map(|(header, value)| (header.as_str(), value.as_slice()))
.collect();

match self.dispatch_grpc_call(
rlp.service.as_str(),
RATELIMIT_SERVICE_NAME,
RATELIMIT_METHOD_NAME,
Vec::new(),
rl_tracing_headers,
Some(&rl_req_serialized),
Duration::from_secs(5),
) {
Expand Down Expand Up @@ -207,6 +236,12 @@ impl HttpContext for Filter {
fn on_http_request_headers(&mut self, _: usize, _: bool) -> Action {
info!("on_http_request_headers #{}", self.context_id);

for header in TracingHeader::all() {
match self.get_http_request_header_bytes(header.as_str()) {
Some(value) => self.tracing_headers.push((header, value)),
None => (),
}
}
match self
.config
.index
Expand Down
1 change: 1 addition & 0 deletions src/filter/root_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ impl RootContext for FilterRoot {
context_id,
config: Rc::clone(&self.config),
response_headers_to_add: Vec::default(),
tracing_headers: Vec::default(),
}))
}

Expand Down

0 comments on commit eee0fbf

Please sign in to comment.