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.

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

Fix stackdriver resources #149

Merged
merged 4 commits into from
Jan 16, 2025
Merged

Fix stackdriver resources #149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95a27f5
stackdriver: update resource mappings
valkum Jan 10, 2025
8f740ef
stackdriver: remove outdated service.name mapping
valkum Jan 10, 2025
b950e35
stackdriver: fix resource attributes
valkum Jan 10, 2025
00f2955
Merge branch 'main' into fix-stackdriver-resources
cijothomas Jan 16, 2025
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
40 changes: 25 additions & 15 deletions opentelemetry-stackdriver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@

let count_clone = pending_count.clone();
let resource = Arc::new(RwLock::new(None));
let ctx_resource = resource.clone();

Check warning on line 223 in opentelemetry-stackdriver/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-stackdriver/src/lib.rs#L223 

Added line #L223 was not covered by tests
let future = async move {
let trace_client = TraceServiceClient::new(trace_channel);
let authorizer = &authenticator;
Expand All @@ -229,7 +230,7 @@
let log_client = log_client.clone();
let pending_count = count_clone.clone();
let scopes = scopes.clone();
let resource = resource.clone();
let resource = ctx_resource.clone();

Check warning on line 233 in opentelemetry-stackdriver/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-stackdriver/src/lib.rs#L233 

Added line #L233 was not covered by tests
ExporterContext {
trace_client,
log_client,
Expand All @@ -248,7 +249,7 @@
pending_count,
maximum_shutdown_duration: maximum_shutdown_duration
.unwrap_or_else(|| Duration::from_secs(5)),
resource: Arc::new(RwLock::new(None)),
resource,

Check warning on line 252 in opentelemetry-stackdriver/src/lib.rs

View check run for this annotation

Codecov / codecov/patch

opentelemetry-stackdriver/src/lib.rs#L252 

Added line #L252 was not covered by tests
};

Ok((exporter, future))
Expand Down Expand Up @@ -772,8 +773,7 @@
// Map conventional OpenTelemetry keys to their GCP counterparts.
//
// https://cloud.google.com/trace/docs/trace-labels
const KEY_MAP: [(&str, &str); 16] = [
(semconv::resource::SERVICE_NAME, GCP_SERVICE_NAME),
const KEY_MAP: [(&str, &str); 19] = [
(HTTP_PATH, GCP_HTTP_PATH),
(semconv::attribute::HTTP_HOST, "/http/host"),
("http.request.header.host", "/http/host"),
Expand All @@ -786,10 +786,27 @@
(semconv::attribute::HTTP_USER_AGENT, "/http/user_agent"),
(semconv::attribute::USER_AGENT_ORIGINAL, "/http/user_agent"),
(semconv::attribute::HTTP_STATUS_CODE, "/http/status_code"),
// https://cloud.google.com/trace/docs/trace-labels#canonical-gke
(
semconv::attribute::HTTP_RESPONSE_STATUS_CODE,
"/http/status_code",
),
(
semconv::attribute::K8S_CLUSTER_NAME,
"g.co/r/k8s_container/cluster_name",
),
(
semconv::attribute::K8S_NAMESPACE_NAME,
"g.co/r/k8s_container/namespace",
),
(
semconv::attribute::K8S_POD_NAME,
"g.co/r/k8s_container/pod_name",
),
(
semconv::attribute::K8S_CONTAINER_NAME,
"g.co/r/k8s_container/container_name",
),
(semconv::trace::HTTP_ROUTE, "/http/route"),
(HTTP_PATH, GCP_HTTP_PATH),
];
Expand Down Expand Up @@ -826,7 +843,6 @@
}
const TRACE_APPEND: &str = "https://www.googleapis.com/auth/trace.append";
const LOGGING_WRITE: &str = "https://www.googleapis.com/auth/logging.write";
const GCP_SERVICE_NAME: &str = "g.co/gae/app/module";
const MAX_ATTRIBUTES_PER_SPAN: usize = 32;

#[cfg(test)]
Expand Down Expand Up @@ -920,19 +936,13 @@
actual.attribute_map.get("/http/status_code"),
Some(&AttributeValue::from(Value::I64(200))),
);
assert_eq!(
actual.attribute_map.get("g.co/gae/app/module"),
Some(&AttributeValue::from(Value::String(
"Test Service Name".into()
))),
);
}

#[test]
fn test_too_many() {
let resources = Resource::new([KeyValue::new(
semcov::resource::SERVICE_NAME,
"Test Service Name",
semconv::attribute::USER_AGENT_ORIGINAL,
"Test Service Name UA",
)]);
let mut attributes = Vec::with_capacity(32);
for i in 0..32 {
Expand All @@ -946,9 +956,9 @@
assert_eq!(actual.attribute_map.len(), 32);
assert_eq!(actual.dropped_attributes_count, 1);
assert_eq!(
actual.attribute_map.get("g.co/gae/app/module"),
actual.attribute_map.get("/http/user_agent"),
Some(&AttributeValue::from(Value::String(
"Test Service Name".into()
"Test Service Name UA".into()
))),
);
}
Expand Down
Loading