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.

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: add sential to cwgo-pkg #7

Closed
wants to merge 83 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
b196d00
combine logging for kitex and hertz
smx-Morgan Jul 23, 2024
878aba7
combine logging for kitex and hertz V2
smx-Morgan Jul 23, 2024
e1e40e6
combine logging for kitex and hertz V2
smx-Morgan Jul 23, 2024
ae5509f
combine metrics
smx-Morgan Jul 23, 2024
a0fc887
otel V2
smx-Morgan Jul 27, 2024
446d328
logging down
smx-Morgan Jul 28, 2024
4685ebb
logging V2
smx-Morgan Jul 30, 2024
9e71cff
Merge pull request #1 from smx-Morgan/mainV3
smx-Morgan Jul 30, 2024
b3729e2
propagtor V1
smx-Morgan Jul 31, 2024
6597632
propagtor V2
smx-Morgan Aug 1, 2024
89c2ad3
fix
smx-Morgan Aug 1, 2024
f5b2114
可观测组件整合 V2
smx-Morgan Aug 2, 2024
c55b0a3
抽象otel和promth共性逻辑
smx-Morgan Aug 4, 2024
327a8f9
抽象otel和promth共性逻辑 update
smx-Morgan Aug 4, 2024
af34e39
Merge pull request #2 from smx-Morgan/mainV3
smx-Morgan Aug 4, 2024
55b9056
fix bug
smx-Morgan Aug 4, 2024
830ef57
fix Reference Path
smx-Morgan Aug 4, 2024
a0801d1
add promProvider
smx-Morgan Aug 8, 2024
bd21d3f
add labelControl
smx-Morgan Aug 12, 2024
8b63a53
fix bugs
smx-Morgan Aug 12, 2024
0e8ecb7
fix format
smx-Morgan Aug 12, 2024
458b34a
fix CI
smx-Morgan Aug 15, 2024
446e393
fix labelControl name, fix promProvider,promTracer
smx-Morgan Aug 16, 2024
d5dbc22
fix labelControl name, fix promProvider,promTracer
smx-Morgan Aug 16, 2024
9cfcc20
move Measure build to promProvider
smx-Morgan Aug 17, 2024
7b61315
Unified Label Standard
smx-Morgan Aug 19, 2024
7430b81
fix CI
smx-Morgan Aug 19, 2024
2961603
fix CI bugs
smx-Morgan Aug 19, 2024
29621e2
fix CI bugs
smx-Morgan Aug 19, 2024
611aefc
fix CI bug
smx-Morgan Aug 20, 2024
afa535b
fix remove registry from tracer
smx-Morgan Aug 20, 2024
a406cd2
fix CI gofumpt
smx-Morgan Aug 20, 2024
7770544
fix change name to telemetry
smx-Morgan Aug 20, 2024
bbedf5e
fix remove promtracer
smx-Morgan Aug 21, 2024
991e025
fix tracer
smx-Morgan Aug 26, 2024
f1ad26b
fix file_name
smx-Morgan Aug 26, 2024
a9c2581
remove labelcontrol
smx-Morgan Aug 27, 2024
c3889ae
Standardized code
smx-Morgan Aug 30, 2024
e022803
add recorder for retry
smx-Morgan Aug 30, 2024
5a96cf2
update test
smx-Morgan Sep 2, 2024
57a8f2d
fix Data Race
smx-Morgan Sep 2, 2024
0e50950
fix Data Race
smx-Morgan Sep 2, 2024
95901c1
remove promProvider test add example
smx-Morgan Sep 2, 2024
be0e2ea
fix format
smx-Morgan Sep 2, 2024
2358778
move go.mod to telemetry
smx-Morgan Sep 3, 2024
d6cfb97
update makefile
smx-Morgan Sep 3, 2024
0a83f00
update makefile, update file name
smx-Morgan Sep 3, 2024
3de654b
update makefile,update labels
smx-Morgan Sep 4, 2024
3c59ee5
update measure structure
smx-Morgan Sep 7, 2024
971f968
update measure structure
smx-Morgan Sep 8, 2024
f662adb
update formate
smx-Morgan Sep 9, 2024
ced4246
update TelemetryProvider
smx-Morgan Sep 16, 2024
634b01d
update Code Formatting
smx-Morgan Sep 16, 2024
91f7ee3
update build name func
smx-Morgan Sep 16, 2024
7f07ace
Optimize logical structure
smx-Morgan Sep 17, 2024
54b55b6
Support simultaneous monitoring of HTTP and RPC
smx-Morgan Sep 19, 2024
8d527a0
remove measure form promProvider
smx-Morgan Sep 26, 2024
a3d2728
update labels
smx-Morgan Sep 29, 2024
3ccb78c
otel log component compatible with Kitex
smx-Morgan Sep 30, 2024
bc37466
fix path
smx-Morgan Oct 3, 2024
9d2204d
replace logging to hlog
smx-Morgan Oct 8, 2024
644816b
Replace logging with hlog
smx-Morgan Oct 8, 2024
d311634
fix
smx-Morgan Oct 8, 2024
0ebc361
fix
smx-Morgan Oct 8, 2024
8fa3353
fix log && Optimize promProvider
smx-Morgan Oct 8, 2024
9c72b1b
update example for promProvider
smx-Morgan Oct 8, 2024
1e6d032
update go work and fix CI
smx-Morgan Oct 8, 2024
42937e7
fix log
smx-Morgan Oct 8, 2024
5697728
Fix duplicate naming for prometheus
smx-Morgan Oct 8, 2024
3580afa
fix ci
smx-Morgan Oct 8, 2024
cd07dd7
update server
smx-Morgan Oct 9, 2024
133c326
update to metadata, support shell
smx-Morgan Oct 11, 2024
0e71ce3
update CI
smx-Morgan Oct 11, 2024
278a6e0
add examples and support shell
smx-Morgan Oct 12, 2024
77c616b
fix bugs remove the Local dependencies
smx-Morgan Oct 12, 2024
b935878
fix CI
smx-Morgan Oct 12, 2024
b6d6c17
fix CI
smx-Morgan Oct 12, 2024
6f2a8d2
fix ci & add counter to otelkitex
smx-Morgan Oct 14, 2024
1dba93f
fix unit test ci
smx-Morgan Oct 14, 2024
4631375
fix unit test ci
smx-Morgan Oct 14, 2024
72bfeb2
fix unit test ci
smx-Morgan Oct 14, 2024
ee809cb
opensergo
smx-Morgan Oct 15, 2024
89c98d9
Merge branch 'master' into master-cache
smx-Morgan Oct 15, 2024
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
Prev Previous commit
Next Next commit
update server
smx-Morgan committed Oct 9, 2024
commit cd07dd76f8963502030270c7242e9de139d23cac
2 changes: 1 addition & 1 deletion example/promProvider/main.go
Original file line number Diff line number Diff line change
@@ -41,8 +41,8 @@ func main() {
promprovider.WithHttpServer(), // Activate Kitex monitoring
promprovider.WithRPCServer(), // Activate Hertz monitoring
)

provider.Serve(":9090", "/metrics-demo")
// promprovider.Server(":9090", "/metrics-demo", provider)

labels := []label.CwLabel{
{Key: "http_method", Value: "/test"},
9 changes: 9 additions & 0 deletions telemetry/instrumentation/otellogrus/hook.go
Original file line number Diff line number Diff line change
@@ -38,6 +38,15 @@ type TraceHookConfig struct {
errorSpanLevel logrus.Level
}

// NewTraceHookConfig Constructor, used to create TraceHookConfig
func NewTraceHookConfig(recordStackTraceInSpan bool, enableLevels []logrus.Level, errorSpanLevel logrus.Level) *TraceHookConfig {
return &TraceHookConfig{
recordStackTraceInSpan: recordStackTraceInSpan,
enableLevels: enableLevels,
errorSpanLevel: errorSpanLevel,
}
}

// TraceHook trace hook
type TraceHook struct {
cfg *TraceHookConfig
2 changes: 1 addition & 1 deletion telemetry/instrumentation/otellogrus/logger.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import (
"github.com/cloudwego-contrib/cwgo-pkg/log/logging/logrus"
)

// Logger an alias to github.com/otelhertz-contrib/logger/otellogrus Logger
// Logger an alias to github.com/hertz-contrib/logger/otellogrus Logger
type Logger = logrus.Logger

// NewLogger create logger with otel hook
8 changes: 8 additions & 0 deletions telemetry/provider/promprovider/promprovider.go
Original file line number Diff line number Diff line change
@@ -148,3 +148,11 @@ func buildName(name, protocol, service string) string {
}
return fmt.Sprintf("%s_%s", protocol, service)
}

func Server(addr, path string, p provider.Provider) {
if promProv, ok := p.(*promProvider); ok {
promProv.Serve(addr, path)
} else {
hlog.Info("HERTZ: Server should put promProvider")
}
}
2 changes: 2 additions & 0 deletions telemetry/provider/telemetryProvider/example/main.go
Original file line number Diff line number Diff line change
@@ -43,6 +43,8 @@ func main() {
)
defer provider.Shutdown(context.Background())

promprovider.Server(":9090", "/prometheus", provider)

labels := []label.CwLabel{
{Key: "http_method", Value: "/test"},
{Key: "statusCode", Value: "200"},