Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 1 addition & 3 deletions include/OtelDefaults.h
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,11 @@ struct OTelResourceConfig {
// -------------------------------------------------------------------------------------------------

/** Default resource for general use (metrics/logs/etc.) */
static inline OTelResourceConfig& defaultResource() {
inline OTelResourceConfig& defaultResource() {
static OTelResourceConfig rc;
return rc;
}


} // namespace OTel

#endif // OTEL_DEFAULTS_H

6 changes: 6 additions & 0 deletions src/OtelMetrics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ static void addPointAttributes(JsonArray& attrArray,
}

static void addCommonResource(JsonObject& resource) {
auto &res = OTel::defaultResource();
if (!res.attrs.empty()) {
res.addResourceAttributes(resource);
return;
}

JsonArray rattrs = resource["attributes"].to<JsonArray>();
addResAttr(rattrs, "service.name", defaultServiceName());
addResAttr(rattrs, "service.instance.id", defaultServiceInstanceId());
Expand Down