-
Notifications
You must be signed in to change notification settings - Fork 250
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
Add: Webconsole tracing #2304
Open
jonesyang12
wants to merge
5
commits into
TencentBlueKing:master
Choose a base branch
from
jonesyang12:webconsole-tracing
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add: Webconsole tracing #2304
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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 |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making Blueking Container Service available. | ||
| * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * http://opensource.org/licenses/MIT | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| package config | ||
|
|
||
| // TracingConf tracing config | ||
| type TracingConf struct { | ||
| Enabled bool `yaml:"enabled"` | ||
| Endpoint string `yaml:"endpoint"` | ||
| Token string `yaml:"token"` | ||
| ResourceAttrs map[string]string `yaml:"resource_attrs"` | ||
| } | ||
|
|
||
| // Init : tracing init | ||
| func (c *TracingConf) Init() { | ||
| c.Enabled = false | ||
| c.Token = "" | ||
| c.Endpoint = "" | ||
| c.ResourceAttrs = nil | ||
| } |
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,21 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making Blueking Container Service available. | ||
| * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * http://opensource.org/licenses/MIT | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| package tracing | ||
|
|
||
| const ( | ||
| ServiceName = "bcs-webconsole" | ||
| RequestIDKey = "requestID" | ||
| TracerName = "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" | ||
| RequestIDHeaderKey = "X-Request-Id" | ||
| ) |
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,64 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making Blueking Container Service available. | ||
| * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * http://opensource.org/licenses/MIT | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| package tracing | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "go.opentelemetry.io/otel/attribute" | ||
|
|
||
| "github.com/Tencent/bk-bcs/bcs-common/pkg/otel/trace" | ||
| configTracing "github.com/Tencent/bk-bcs/bcs-services/bcs-webconsole/console/config" | ||
| ) | ||
|
|
||
| // InitTracing init tracing | ||
| func InitTracing(op *configTracing.TracingConf) (func(context.Context) error, error) { | ||
| if !op.Enabled { | ||
| return nil, nil | ||
| } | ||
| var opts []trace.Option | ||
|
|
||
| if op.Endpoint != "" { | ||
| opts = append( | ||
| opts, | ||
| trace.OTLPEndpoint(op.Endpoint), | ||
| ) | ||
| } | ||
| attrs := make([]attribute.KeyValue, 0) | ||
|
|
||
| if op.Token != "" { | ||
| attrs = append(attrs, attribute.String("bk.data.token", op.Token)) | ||
| } | ||
|
|
||
| if op.ResourceAttrs != nil { | ||
| attrs = append(attrs, newResource(op.ResourceAttrs)...) | ||
| } | ||
|
|
||
| opts = append(opts, trace.ResourceAttrs(attrs)) | ||
|
|
||
| tracer, err := trace.InitTracingProvider(ServiceName, opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return tracer, nil | ||
| } | ||
|
|
||
| func newResource(attrs map[string]string) []attribute.KeyValue { | ||
| attrValues := make([]attribute.KeyValue, 0) | ||
| for k, v := range attrs { | ||
| attrValues = append(attrValues, attribute.String(k, v)) | ||
| } | ||
| return attrValues | ||
| } |
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 |
|---|---|---|
|
|
@@ -57,3 +57,11 @@ etcd: | |
| ca: "" | ||
| cert: "" | ||
| key: "" | ||
|
|
||
| tracing: | ||
| enabled: false | ||
| endpoint: "" | ||
| token: "" | ||
| resource_attrs: | ||
| k1: "" | ||
| k2: "" | ||
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
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.
不仅仅是自身的，第三方调用的也需要加tracing