-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
feat(opentelemetry): add opentelemetry variables #8871
Merged
monkeyDluffy6017
merged 10 commits into
apache:master
from
lework:add_opentelemetry_variables
Sep 21, 2023
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
0ddfa37
feat(opentelemetry): add opentelemetry variables
48e3e69
feat: add opentelemetry test
3dfa96b
feat: use ngx_tpl.lua generate variables
807663e
fix: code lint error
c7fb26a
fix: ci test error
ecaf2c2
fix: ci lint error
e6a677f
Merge remote-tracking branch 'remotes/origin/master' into add_opentel…
b1bf997
Merge branch 'apache:master' into add_opentelemetry_variables
lework 520e974
refactor: resolve merge conflicts
monkeyDluffy6017 0b3c38d
refactor: add configuration to config-default.yaml
monkeyDluffy6017 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,7 @@ local type = type | |
local pairs = pairs | ||
local ipairs = ipairs | ||
local unpack = unpack | ||
local string_format = string.format | ||
|
||
local lrucache = core.lrucache.new({ | ||
type = 'plugin', count = 128, ttl = 24 * 60 * 60, | ||
|
@@ -112,6 +113,11 @@ local attr_schema = { | |
}, | ||
default = {}, | ||
}, | ||
set_ngx_var = { | ||
type = "boolean", | ||
description = "set nginx variables", | ||
default = false, | ||
}, | ||
}, | ||
} | ||
|
||
|
@@ -332,6 +338,17 @@ function _M.rewrite(conf, api_ctx) | |
kind = span_kind.server, | ||
attributes = attributes, | ||
}) | ||
|
||
if plugin_info.set_ngx_var then | ||
local span_context = ctx:span():context() | ||
ngx_var.opentelemetry_context_traceparent = string_format("00-%s-%s-%02x", | ||
span_context.trace_id, | ||
span_context.span_id, | ||
span_context.trace_flags) | ||
ngx_var.opentelemetry_trace_id = span_context.trace_id | ||
ngx_var.opentelemetry_span_id = span_context.span_id | ||
Comment on lines
+344
to
+349
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would be better to use |
||
end | ||
|
||
api_ctx.otel_context_token = ctx:attach() | ||
|
||
-- inject trace context into the headers of upstream HTTP request | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
#!/usr/bin/env bash | ||
|
||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
. ./t/cli/common.sh | ||
|
||
echo ' | ||
plugins: | ||
- opentelemetry | ||
plugin_attr: | ||
opentelemetry: | ||
set_ngx_var: true | ||
' > conf/config.yaml | ||
|
||
make init | ||
|
||
if ! grep "set \$opentelemetry_context_traceparent '';" conf/nginx.conf > /dev/null; then | ||
echo "failed: opentelemetry_context_traceparent not found in nginx.conf" | ||
exit 1 | ||
fi | ||
|
||
if ! grep "set \$opentelemetry_trace_id '';" conf/nginx.conf > /dev/null; then | ||
echo "failed: opentelemetry_trace_id not found in nginx.conf" | ||
exit 1 | ||
fi | ||
|
||
if ! grep "set \$opentelemetry_span_id '';" conf/nginx.conf > /dev/null; then | ||
echo "failed: opentelemetry_span_id not found in nginx.conf" | ||
exit 1 | ||
fi | ||
|
||
|
||
echo "passed: opentelemetry_set_ngx_var configuration is validated" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,170 @@ | ||
# | ||
# Licensed to the Apache Software Foundation (ASF) under one or more | ||
# contributor license agreements. See the NOTICE file distributed with | ||
# this work for additional information regarding copyright ownership. | ||
# The ASF licenses this file to You under the Apache License, Version 2.0 | ||
# (the "License"); you may not use this file except in compliance with | ||
# the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
use t::APISIX 'no_plan'; | ||
|
||
repeat_each(1); | ||
no_long_string(); | ||
no_root_location(); | ||
log_level("info"); | ||
|
||
add_block_preprocessor(sub { | ||
my ($block) = @_; | ||
|
||
if (!$block->extra_yaml_config) { | ||
my $extra_yaml_config = <<_EOC_; | ||
plugins: | ||
- http-logger | ||
- opentelemetry | ||
plugin_attr: | ||
opentelemetry: | ||
set_ngx_var: true | ||
batch_span_processor: | ||
max_export_batch_size: 1 | ||
inactive_timeout: 0.5 | ||
_EOC_ | ||
$block->set_value("extra_yaml_config", $extra_yaml_config); | ||
} | ||
|
||
my $upstream_server_config = $block->upstream_server_config // <<_EOC_; | ||
set \$opentelemetry_context_traceparent ""; | ||
set \$opentelemetry_trace_id ""; | ||
set \$opentelemetry_span_id ""; | ||
access_log logs/error.log opentelemetry_log; | ||
_EOC_ | ||
|
||
$block->set_value("upstream_server_config", $upstream_server_config); | ||
|
||
my $http_config = $block->http_config // <<_EOC_; | ||
log_format opentelemetry_log '{"time": "\$time_iso8601","opentelemetry_context_traceparent": "\$opentelemetry_context_traceparent","opentelemetry_trace_id": "\$opentelemetry_trace_id","opentelemetry_span_id": "\$opentelemetry_span_id","remote_addr": "\$remote_addr","uri": "\$uri"}'; | ||
_EOC_ | ||
|
||
$block->set_value("http_config", $http_config); | ||
|
||
if (!$block->extra_init_by_lua) { | ||
my $extra_init_by_lua = <<_EOC_; | ||
-- mock exporter http client | ||
local client = require("opentelemetry.trace.exporter.http_client") | ||
client.do_request = function() | ||
ngx.log(ngx.INFO, "opentelemetry export span") | ||
return "ok" | ||
end | ||
_EOC_ | ||
|
||
$block->set_value("extra_init_by_lua", $extra_init_by_lua); | ||
} | ||
|
||
|
||
if (!$block->request) { | ||
$block->set_value("request", "GET /t"); | ||
} | ||
|
||
$block; | ||
}); | ||
|
||
run_tests; | ||
|
||
__DATA__ | ||
|
||
=== TEST 1: add plugin metadata | ||
--- config | ||
location /t { | ||
content_by_lua_block { | ||
local t = require("lib.test_admin").test | ||
local code, body = t('/apisix/admin/plugin_metadata/http-logger', | ||
ngx.HTTP_PUT, | ||
[[{ | ||
"log_format": { | ||
"opentelemetry_context_traceparent": "$opentelemetry_context_traceparent", | ||
"opentelemetry_trace_id": "$opentelemetry_trace_id", | ||
"opentelemetry_span_id": "$opentelemetry_span_id" | ||
} | ||
}]] | ||
) | ||
if code >= 300 then | ||
ngx.status = code | ||
return body | ||
end | ||
|
||
local code, body = t('/apisix/admin/routes/1', | ||
ngx.HTTP_PUT, | ||
[[{ | ||
"plugins": { | ||
"http-logger": { | ||
"uri": "http://127.0.0.1:1980/log", | ||
"batch_max_size": 1, | ||
"max_retry_count": 1, | ||
"retry_delay": 2, | ||
"buffer_duration": 2, | ||
"inactive_timeout": 2, | ||
"concat_method": "new_line" | ||
}, | ||
"opentelemetry": { | ||
"sampler": { | ||
"name": "always_on" | ||
} | ||
} | ||
}, | ||
"upstream": { | ||
"nodes": { | ||
"127.0.0.1:1982": 1 | ||
}, | ||
"type": "roundrobin" | ||
}, | ||
"uri": "/hello" | ||
}]] | ||
) | ||
|
||
if code >=300 then | ||
ngx.status = code | ||
end | ||
ngx.say(body) | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
passed | ||
|
||
|
||
|
||
=== TEST 2: trigger opentelemetry with open set variables | ||
--- request | ||
GET /hello | ||
--- response_body | ||
hello world | ||
--- wait: 1 | ||
--- grep_error_log eval | ||
qr/opentelemetry export span/ | ||
--- grep_error_log_out | ||
opentelemetry export span | ||
--- error_log eval | ||
qr/request log: \{.*"opentelemetry_context_traceparent":"00-\w{32}-\w{16}-01".*\}/ | ||
|
||
|
||
|
||
=== TEST 3: trigger opentelemetry with disable set variables | ||
--- yaml_config | ||
plugin_attr: | ||
opentelemetry: | ||
set_ngx_var: false | ||
--- request | ||
GET /hello | ||
--- response_body | ||
hello world | ||
--- error_log eval | ||
qr/request log: \{.*"opentelemetry_context_traceparent":"".*\}/ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.