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

Setting client span attributes #187

Open
wants to merge 13 commits into
base: webserver-dev
Choose a base branch
from
Open

Setting client span attributes #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8b8b4a1
Set span status according to http semantics
gnm444 May 24, 2022
4a37f8c
Set span status changes part-2
gnm444 May 24, 2022
5b030f2
Set span status according to http semantics spaces
gnm444 May 24, 2022
490a33e
Review comments addressed for span status
gnm444 May 27, 2022
2f7b6f5
Moved error status from Apache hooks to Request processing engine
gnm444 May 30, 2022
180b502
Fixed unit test failure
gnm444 Jun 2, 2022
7184fcf
Fixed meerge conflict with main
gnm444 Jun 2, 2022
8a4d1b0
Setting client span attributes
gnm444 Jul 8, 2022
eb4b986
Set client span attributes
gnm444 Jul 13, 2022
facae25
Merge branch 'open-telemetry:main' into main
gnm444 Jul 13, 2022
bb5e480
Merge branch 'main' into client-attr
gnm444 Jul 13, 2022
86e5882
Set client span attributes in Ngnix
gnm444 Jul 15, 2022
0b71f09
Adding changes to client span attributes
gnm444 Jul 29, 2022
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
7 changes: 6 additions & 1 deletion instrumentation/otel-webserver-module/include/core/api/Payload.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,14 @@ struct InteractionPayload
std::string phaseName;
bool resolveBackends;

std::string target;
std::string scheme;
std::string host;

InteractionPayload() {}

InteractionPayload(std::string module, std::string phase, bool b) : moduleName(module), phaseName(phase), resolveBackends(b)
InteractionPayload(std::string module, std::string phase, bool b, std::string aTarget, std::string aScheme, std::string aHost)
: moduleName(module), phaseName(phase), resolveBackends(b), target(aTarget), scheme(aScheme), host(aHost)
{}
};

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/otel-webserver-module/include/core/api/opentelemetry_ngx_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void initDependency();
void populatePayload(request_payload* req_payload, void* payload, int count);
APPD_SDK_STATUS_CODE opentelemetry_core_init(APPD_SDK_ENV_RECORD* env, unsigned numberOfRecords, struct cNode *rootCN);
APPD_SDK_STATUS_CODE startRequest(const char* wscontext, request_payload* req_payload, APPD_SDK_HANDLE_REQ* reqHandle, int count);
APPD_SDK_STATUS_CODE startModuleInteraction(const char* req_handle_key, const char* module_name, const char* stage, bool resolveBackends, APPD_SDK_ENV_RECORD* propagationHeaders, int* ix);
APPD_SDK_STATUS_CODE startModuleInteraction(const char* req_handle_key, const char* module_name, const char* stage, bool resolveBackends, APPD_SDK_ENV_RECORD* propagationHeaders, int* ix, const char* target, const char* scheme, const char* host);
APPD_SDK_STATUS_CODE stopModuleInteraction(const char* req_handle_key, const char* backendName, const char* backendType, unsigned int err_code, const char* msg);
APPD_SDK_STATUS_CODE endRequest(APPD_SDK_HANDLE_REQ req_handle_key, const char* errMsg);

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/otel-webserver-module/src/apache/ApacheHooks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ APPD_SDK_STATUS_CODE ApacheHooks::appd_startInteraction(
}

std::unique_ptr<appd::core::InteractionPayload> payload(new
appd::core::InteractionPayload(module, stage, resolveBackends));
appd::core::InteractionPayload(module, stage, resolveBackends, r->server->server_hostname, ap_run_http_scheme(r), r->hostname));

// Create propagationHeaders to be populated in startInteraction.
std::unordered_map<std::string, std::string> propagationHeaders;
Expand Down
3 changes: 3 additions & 0 deletions instrumentation/otel-webserver-module/src/core/api/RequestProcessingEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ APPD_SDK_STATUS_CODE RequestProcessingEngine::startInteraction(
std::string spanName = payload->moduleName + "_" + payload->phaseName;
keyValueMap["interactionType"] = "EXIT_CALL";
auto interactionSpan = m_sdkWrapper->CreateSpan(spanName, SpanKind::CLIENT, keyValueMap);
interactionSpan->AddAttribute("http.target", payload->target);
interactionSpan->AddAttribute("http.scheme", payload->scheme);
interactionSpan->AddAttribute("http.host", payload->host);
LOG4CXX_TRACE(mLogger, "Client Span started with SpanName: " << spanName
<< " Span Id: " << interactionSpan.get());
m_sdkWrapper->PopulatePropagationHeaders(propagationHeaders);
Expand Down
5 changes: 2 additions & 3 deletions instrumentation/otel-webserver-module/src/core/api/opentelemetry_ngx_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,13 @@ APPD_SDK_STATUS_CODE endRequest(APPD_SDK_HANDLE_REQ req_handle_key, const char*
return res;
}

APPD_SDK_STATUS_CODE startModuleInteraction(const char* req_handle_key, const char* module_name, const char* stage, bool resolveBackends, APPD_SDK_ENV_RECORD* propagationHeaders, int *ix)
APPD_SDK_STATUS_CODE startModuleInteraction(const char* req_handle_key, const char* module_name, const char* stage, bool resolveBackends, APPD_SDK_ENV_RECORD* propagationHeaders, int *ix, const char* target, const char* scheme, const char* host)
{
APPD_SDK_STATUS_CODE res = APPD_SUCCESS;
std::unordered_map<std::string, std::string> pHeaders;
std::string module(module_name);
std::string m_stage(stage);

std::unique_ptr<appd::core::InteractionPayload> payload(new appd::core::InteractionPayload(module, m_stage, resolveBackends));
std::unique_ptr<appd::core::InteractionPayload> payload(new appd::core::InteractionPayload(module, m_stage, resolveBackends, target, scheme, host));
res = wsAgent.startInteraction((APPD_SDK_HANDLE_REQ)req_handle_key, payload.get(), pHeaders);

if (APPD_ISSUCCESS(res))
Expand Down
3 changes: 2 additions & 1 deletion instrumentation/otel-webserver-module/src/nginx/ngx_http_opentelemetry_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,8 @@ static APPD_SDK_STATUS_CODE otel_startInteraction(ngx_http_request_t* r, const c
}
ngx_writeTrace(r->connection->log, __func__, "Starting a new module interaction for: %s", module_name);
int ix = 0;
res = startModuleInteraction(ctx->otel_req_handle_key, module_name, "", resolveBackends, propagationHeaders, &ix);
// Todo : In the below line $scheme is Ngnix variable, need to findn correct way to retrieve this
res = startModuleInteraction(ctx->otel_req_handle_key, module_name, "", resolveBackends, propagationHeaders, &ix, (const char*)(r->unparsed_uri.data), "$scheme", (const char*)(r->headers_in.host->value.data));

if (APPD_ISSUCCESS(res))
{
Expand Down