Skip to content

Commit c6c3edd

Browse files
committed
enable mqtt debug info
Signed-off-by: Wei Liu <liuweixa@redhat.com>
1 parent 1efea8e commit c6c3edd

32 files changed

Lines changed: 668 additions & 312 deletions

File tree

go.mod

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/bwmarrin/snowflake v0.3.0
77
github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20240413090539-7fef29478991
88
github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20241008145627-6bcc075b5b6c
9-
github.com/cloudevents/sdk-go/v2 v2.15.3-0.20240911135016-682f3a9684e4
9+
github.com/cloudevents/sdk-go/v2 v2.16.1
1010
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
12-
github.com/eclipse/paho.golang v0.21.0
12+
github.com/eclipse/paho.golang v0.22.0
1313
github.com/evanphx/json-patch/v5 v5.9.11
1414
github.com/golang/protobuf v1.5.4
1515
github.com/google/cel-go v0.23.2
@@ -25,7 +25,7 @@ require (
2525
github.com/prometheus/client_golang v1.22.0
2626
github.com/prometheus/client_model v0.6.1
2727
github.com/spf13/pflag v1.0.5
28-
github.com/stretchr/testify v1.10.0
28+
github.com/stretchr/testify v1.11.0
2929
golang.org/x/oauth2 v0.27.0
3030
google.golang.org/grpc v1.68.1
3131
google.golang.org/protobuf v1.36.5
@@ -86,7 +86,7 @@ require (
8686
golang.org/x/sys v0.31.0 // indirect
8787
golang.org/x/term v0.30.0 // indirect
8888
golang.org/x/text v0.23.0 // indirect
89-
golang.org/x/time v0.9.0 // indirect
89+
golang.org/x/time v0.12.0 // indirect
9090
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
9191
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
9292
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
@@ -99,3 +99,5 @@ require (
9999
sigs.k8s.io/randfill v1.0.0 // indirect
100100
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
101101
)
102+
103+
replace github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 => github.com/skeeey/ce-sdk-go/protocol/mqtt_paho/v2 v2.0.0-20250917052632-f6859c7a861e

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
2626
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
2727
github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20240413090539-7fef29478991 h1:3/pjormyqkSjF2GHQehTELZ9oqlER4GrJZiVUIk8Fy8=
2828
github.com/cloudevents/sdk-go/protocol/kafka_confluent/v2 v2.0.0-20240413090539-7fef29478991/go.mod h1:xiar5+gk13WqyAUQ/cpcxcjD1IhLe/PeilSfCdPcfMU=
29-
github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20241008145627-6bcc075b5b6c h1:CU7OKO6vJQLp8ghHkyhnkcPw37wdhfK1LzV7L2pNm4w=
30-
github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2 v2.0.0-20241008145627-6bcc075b5b6c/go.mod h1:FwZuQ17vf240KYoiIuz0ffRssLYR36Wvq2KJFYWVn88=
31-
github.com/cloudevents/sdk-go/v2 v2.15.3-0.20240911135016-682f3a9684e4 h1:Ov6mO9A4hHpuTWNeYJgQUI42rHr4AgJIc9BB/N9fzDs=
32-
github.com/cloudevents/sdk-go/v2 v2.15.3-0.20240911135016-682f3a9684e4/go.mod h1:lL7kSWAE/V8VI4Wh0jbL2v/jvqsm6tjmaQBSvxcv4uE=
29+
github.com/cloudevents/sdk-go/v2 v2.16.1 h1:G91iUdqvl88BZ1GYYr9vScTj5zzXSyEuqbfE63gbu9Q=
30+
github.com/cloudevents/sdk-go/v2 v2.16.1/go.mod h1:v/kVOaWjNfbvc6tkhhlkhvLapj8Aa8kvXiH5GiOHCKI=
3331
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
3432
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0 h1:icCHutJouWlQREayFwCc7lxDAhws08td+W3/gdqgZts=
3533
github.com/confluentinc/confluent-kafka-go/v2 v2.3.0/go.mod h1:/VTy8iEpe6mD9pkCH5BhijlUl8ulUXymKv1Qig5Rgb8=
@@ -50,8 +48,8 @@ github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKoh
5048
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
5149
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
5250
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
53-
github.com/eclipse/paho.golang v0.21.0 h1:cxxEReu+iFbA5RrHfRGxJOh8tXZKDywuehneoeBeyn8=
54-
github.com/eclipse/paho.golang v0.21.0/go.mod h1:GHF6vy7SvDbDHBguaUpfuBkEB5G6j0zKxMG4gbh6QRQ=
51+
github.com/eclipse/paho.golang v0.22.0 h1:JhhUngr8TBlyUZDZw/L6WVayPi9qmSmdWeki48i5AVE=
52+
github.com/eclipse/paho.golang v0.22.0/go.mod h1:9ZiYJ93iEfGRJri8tErNeStPKLXIGBHiqbHV74t5pqI=
5553
github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
5654
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
5755
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -223,6 +221,8 @@ github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
223221
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
224222
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
225223
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
224+
github.com/skeeey/ce-sdk-go/protocol/mqtt_paho/v2 v2.0.0-20250917052632-f6859c7a861e h1:FmfBCdx3lFzh7cocVtZgysa/Ax9p/MZOXXZt8lgFMH0=
225+
github.com/skeeey/ce-sdk-go/protocol/mqtt_paho/v2 v2.0.0-20250917052632-f6859c7a861e/go.mod h1:uGZIO7gmadwSmzHXpemf29e7wdvsceJOUZF2zVtT4Mw=
226226
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
227227
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
228228
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
@@ -240,8 +240,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
240240
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
241241
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
242242
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
243-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
244-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
243+
github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8=
244+
github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
245245
github.com/testcontainers/testcontainers-go v0.14.0 h1:h0D5GaYG9mhOWr2qHdEKDXpkce/VlvaYOCzTRi6UBi8=
246246
github.com/testcontainers/testcontainers-go v0.14.0/go.mod h1:hSRGJ1G8Q5Bw2gXgPulJOLlEBaYJHeBSOkQM5JLG+JQ=
247247
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
@@ -316,8 +316,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
316316
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
317317
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
318318
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
319-
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
320-
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
319+
golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
320+
golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
321321
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
322322
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
323323
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package mqtt
22

33
import (
4-
"fmt"
5-
64
"github.com/eclipse/paho.golang/paho/log"
75
"k8s.io/klog/v2"
86
)
@@ -13,15 +11,9 @@ type PahoDebugLogger struct {
1311
var _ log.Logger = &PahoDebugLogger{}
1412

1513
func (l *PahoDebugLogger) Println(v ...interface{}) {
16-
fmt.Println("-------------")
17-
fmt.Println(v...)
18-
fmt.Println("-------------")
1914
klog.V(4).Info(v...)
2015
}
2116

2217
func (l *PahoDebugLogger) Printf(format string, v ...interface{}) {
23-
fmt.Println("-------------")
24-
fmt.Printf(format, v...)
25-
fmt.Println("-------------")
2618
klog.V(4).Infof(format, v...)
2719
}

pkg/cloudevents/generic/options/mqtt/options.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -225,19 +225,16 @@ func (o *MQTTOptions) GetCloudEventsProtocol(
225225
return nil, err
226226
}
227227

228-
// setting a pinger with debug enabled
229-
fmt.Println("---------------enable debug--------------")
230-
pinger := paho.NewDefaultPinger()
231-
pinger.SetDebug(&PahoDebugLogger{})
232-
233228
config := &paho.ClientConfig{
234229
ClientID: clientID,
235230
Conn: netConn,
236231
OnClientError: errorHandler,
237-
PingHandler: pinger,
238232
}
239233

240-
opts := []cloudeventsmqtt.Option{cloudeventsmqtt.WithConnect(o.GetMQTTConnectOption(clientID))}
234+
opts := []cloudeventsmqtt.Option{
235+
cloudeventsmqtt.WithConnect(o.GetMQTTConnectOption(clientID)),
236+
cloudeventsmqtt.WithDebugLogger(&PahoDebugLogger{}),
237+
}
241238
opts = append(opts, clientOpts...)
242239
return cloudeventsmqtt.New(ctx, config, opts...)
243240
}

vendor/github.com/cloudevents/sdk-go/protocol/mqtt_paho/v2/option.go

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/binding/test/transformer.go

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/event/content_type.go

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/event/event_marshal.go

Lines changed: 12 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/event/event_unmarshal.go

Lines changed: 11 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cloudevents/sdk-go/v2/event/eventcontext_v03.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)