Skip to content

Commit 215605f

Browse files
sruehlsruehl
committed
feat(plc4go/spi): add transactionInfo to RequestTransaction
1 parent fdf8e84 commit 215605f

29 files changed

+196
-190
lines changed

‎plc4go/internal/ads/DiscoveryMessageCodec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func (m *DiscoveryMessageCodec) GetCodec() spi.MessageCodec {
5454
return m
5555
}
5656

57-
func (m *DiscoveryMessageCodec) Send(ctx context.Context, interactionId string, message spi.Message) error {
58-
m.log.Trace().Str("interactionId", interactionId).Msg("Sending message")
57+
func (m *DiscoveryMessageCodec) Send(ctx context.Context, interactionInfo string, message spi.Message) error {
58+
m.log.Trace().Str("interactionInfo", interactionInfo).Msg("Sending message")
5959
// Cast the message to the correct type of struct
6060
tcpPaket := message.(model.AdsDiscovery)
6161
// Serialize the request

‎plc4go/internal/ads/MessageCodec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ func (m *MessageCodec) GetCodec() spi.MessageCodec {
6767
return m
6868
}
6969

70-
func (m *MessageCodec) Send(ctx context.Context, interactionId string, message spi.Message) error {
71-
m.log.Trace().Str("interactionId", interactionId).Msg("Sending message")
70+
func (m *MessageCodec) Send(ctx context.Context, interactionInfo string, message spi.Message) error {
71+
m.log.Trace().Str("interactionInfo", interactionInfo).Msg("Sending message")
7272
// Cast the message to the correct type of struct
7373
tcpPaket := message.(model.AmsTCPPacket)
7474
// Serialize the request

‎plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (m *ApplicationLayerMessageCodec) IsRunning() bool {
112112
return m.messageCode.IsRunning()
113113
}
114114

115-
func (m *ApplicationLayerMessageCodec) Send(ctx context.Context, interactionId string, message spi.Message) error {
115+
func (m *ApplicationLayerMessageCodec) Send(ctx context.Context, interactionInfo string, message spi.Message) error {
116116
address, err := pdu.NewAddress(comp.NewArgs(m.remoteAddress))
117117
if err != nil {
118118
return err
@@ -141,12 +141,12 @@ func (m *ApplicationLayerMessageCodec) Send(ctx context.Context, interactionId s
141141
return nil
142142
}
143143

144-
func (m *ApplicationLayerMessageCodec) Expect(ctx context.Context, interactionId string, acceptsMessage spi.AcceptsMessage, handleMessage spi.HandleMessage, handleError spi.HandleError) {
144+
func (m *ApplicationLayerMessageCodec) Expect(ctx context.Context, interactionInfo string, acceptsMessage spi.AcceptsMessage, handleMessage spi.HandleMessage, handleError spi.HandleError) {
145145
// TODO: implement me
146146
panic("not yet implemented")
147147
}
148148

149-
func (m *ApplicationLayerMessageCodec) SendRequest(ctx context.Context, interactionId string, message spi.Message, acceptsMessage spi.AcceptsMessage, handleMessage spi.HandleMessage, handleError spi.HandleError) error {
149+
func (m *ApplicationLayerMessageCodec) SendRequest(ctx context.Context, interactionInfo string, message spi.Message, acceptsMessage spi.AcceptsMessage, handleMessage spi.HandleMessage, handleError spi.HandleError) error {
150150
address, err := pdu.NewAddress(comp.NewArgs(m.remoteAddress))
151151
if err != nil {
152152
return err

‎plc4go/internal/bacnetip/MessageCodec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ func (m *MessageCodec) GetCodec() spi.MessageCodec {
5050
return m
5151
}
5252

53-
func (m *MessageCodec) Send(ctx context.Context, interactionId string, message spi.Message) error {
54-
m.log.Trace().Str("interactionId", interactionId).Msg("Sending message")
53+
func (m *MessageCodec) Send(ctx context.Context, interactionInfo string, message spi.Message) error {
54+
m.log.Trace().Str("interactionInfo", interactionInfo).Msg("Sending message")
5555
// Cast the message to the correct type of struct
5656
bvlcPacket := message.(model.BVLC)
5757
// Serialize the request

‎plc4go/internal/bacnetip/Reader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ func (m *Reader) Read(ctx context.Context, readRequest apiModel.PlcReadRequest)
134134
)
135135

136136
// Start a new request-transaction (Is ended in the response-handler)
137-
transaction := m.tm.StartTransaction()
137+
transaction := m.tm.StartTransaction("read")
138138
transaction.Submit(func(transactionContext context.Context, transaction transactions.RequestTransaction) {
139139
ctx, cancel := context.WithCancel(ctx)
140140
context.AfterFunc(transactionContext, cancel)

‎plc4go/internal/cbus/CBusMessageMapper_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,7 @@ func TestMapEncodedReply(t *testing.T) {
14231423
t.Cleanup(func() {
14241424
assert.NoError(t, transactionManager.Close())
14251425
})
1426-
transaction := transactionManager.StartTransaction()
1426+
transaction := transactionManager.StartTransaction(t.Name())
14271427
t.Logf("Submitting No-Op to transaction\n%v", transaction)
14281428
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
14291429
// NO-OP
@@ -1500,7 +1500,7 @@ func TestMapEncodedReply(t *testing.T) {
15001500
t.Cleanup(func() {
15011501
assert.NoError(t, transactionManager.Close())
15021502
})
1503-
transaction := transactionManager.StartTransaction()
1503+
transaction := transactionManager.StartTransaction(t.Name())
15041504
t.Logf("Submitting No-Op to transaction %v", transaction)
15051505
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
15061506
// NO-OP
@@ -1594,7 +1594,7 @@ func TestMapEncodedReply(t *testing.T) {
15941594
t.Cleanup(func() {
15951595
assert.NoError(t, transactionManager.Close())
15961596
})
1597-
transaction := transactionManager.StartTransaction()
1597+
transaction := transactionManager.StartTransaction(t.Name())
15981598
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
15991599
// NO-OP
16001600
})
@@ -1677,7 +1677,7 @@ func TestMapEncodedReply(t *testing.T) {
16771677
t.Cleanup(func() {
16781678
assert.NoError(t, transactionManager.Close())
16791679
})
1680-
transaction := transactionManager.StartTransaction()
1680+
transaction := transactionManager.StartTransaction(t.Name())
16811681
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
16821682
// NO-OP
16831683
})
@@ -1743,7 +1743,7 @@ func TestMapEncodedReply(t *testing.T) {
17431743
t.Cleanup(func() {
17441744
assert.NoError(t, transactionManager.Close())
17451745
})
1746-
transaction := transactionManager.StartTransaction()
1746+
transaction := transactionManager.StartTransaction(t.Name())
17471747
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
17481748
// NO-OP
17491749
})
@@ -1812,7 +1812,7 @@ func TestMapEncodedReply(t *testing.T) {
18121812
t.Cleanup(func() {
18131813
assert.NoError(t, transactionManager.Close())
18141814
})
1815-
transaction := transactionManager.StartTransaction()
1815+
transaction := transactionManager.StartTransaction(t.Name())
18161816
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
18171817
// NO-OP
18181818
})
@@ -1900,7 +1900,7 @@ func TestMapEncodedReply(t *testing.T) {
19001900
t.Cleanup(func() {
19011901
assert.NoError(t, transactionManager.Close())
19021902
})
1903-
transaction := transactionManager.StartTransaction()
1903+
transaction := transactionManager.StartTransaction(t.Name())
19041904
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
19051905
// NO-OP
19061906
})
@@ -2006,7 +2006,7 @@ func TestMapEncodedReply(t *testing.T) {
20062006
t.Cleanup(func() {
20072007
assert.NoError(t, transactionManager.Close())
20082008
})
2009-
transaction := transactionManager.StartTransaction()
2009+
transaction := transactionManager.StartTransaction(t.Name())
20102010
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
20112011
// NO-OP
20122012
})
@@ -2076,7 +2076,7 @@ func TestMapEncodedReply(t *testing.T) {
20762076
t.Cleanup(func() {
20772077
assert.NoError(t, transactionManager.Close())
20782078
})
2079-
transaction := transactionManager.StartTransaction()
2079+
transaction := transactionManager.StartTransaction(t.Name())
20802080
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
20812081
// NO-OP
20822082
})
@@ -2142,7 +2142,7 @@ func TestMapEncodedReply(t *testing.T) {
21422142
t.Cleanup(func() {
21432143
assert.NoError(t, transactionManager.Close())
21442144
})
2145-
transaction := transactionManager.StartTransaction()
2145+
transaction := transactionManager.StartTransaction(t.Name())
21462146
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
21472147
// NO-OP
21482148
})
@@ -2208,7 +2208,7 @@ func TestMapEncodedReply(t *testing.T) {
22082208
t.Cleanup(func() {
22092209
assert.NoError(t, transactionManager.Close())
22102210
})
2211-
transaction := transactionManager.StartTransaction()
2211+
transaction := transactionManager.StartTransaction(t.Name())
22122212
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
22132213
// NO-OP
22142214
})
@@ -2274,7 +2274,7 @@ func TestMapEncodedReply(t *testing.T) {
22742274
t.Cleanup(func() {
22752275
assert.NoError(t, transactionManager.Close())
22762276
})
2277-
transaction := transactionManager.StartTransaction()
2277+
transaction := transactionManager.StartTransaction(t.Name())
22782278
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
22792279
// NO-OP
22802280
})
@@ -2340,7 +2340,7 @@ func TestMapEncodedReply(t *testing.T) {
23402340
t.Cleanup(func() {
23412341
assert.NoError(t, transactionManager.Close())
23422342
})
2343-
transaction := transactionManager.StartTransaction()
2343+
transaction := transactionManager.StartTransaction(t.Name())
23442344
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
23452345
// NO-OP
23462346
})
@@ -2426,7 +2426,7 @@ func TestMapEncodedReply(t *testing.T) {
24262426
t.Cleanup(func() {
24272427
assert.NoError(t, transactionManager.Close())
24282428
})
2429-
transaction := transactionManager.StartTransaction()
2429+
transaction := transactionManager.StartTransaction(t.Name())
24302430
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
24312431
// NO-OP
24322432
})
@@ -2492,7 +2492,7 @@ func TestMapEncodedReply(t *testing.T) {
24922492
t.Cleanup(func() {
24932493
assert.NoError(t, transactionManager.Close())
24942494
})
2495-
transaction := transactionManager.StartTransaction()
2495+
transaction := transactionManager.StartTransaction(t.Name())
24962496
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
24972497
// NO-OP
24982498
})
@@ -2558,7 +2558,7 @@ func TestMapEncodedReply(t *testing.T) {
25582558
t.Cleanup(func() {
25592559
assert.NoError(t, transactionManager.Close())
25602560
})
2561-
transaction := transactionManager.StartTransaction()
2561+
transaction := transactionManager.StartTransaction(t.Name())
25622562
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
25632563
// NO-OP
25642564
})
@@ -2624,7 +2624,7 @@ func TestMapEncodedReply(t *testing.T) {
26242624
t.Cleanup(func() {
26252625
assert.NoError(t, transactionManager.Close())
26262626
})
2627-
transaction := transactionManager.StartTransaction()
2627+
transaction := transactionManager.StartTransaction(t.Name())
26282628
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
26292629
// NO-OP
26302630
})
@@ -2690,7 +2690,7 @@ func TestMapEncodedReply(t *testing.T) {
26902690
t.Cleanup(func() {
26912691
assert.NoError(t, transactionManager.Close())
26922692
})
2693-
transaction := transactionManager.StartTransaction()
2693+
transaction := transactionManager.StartTransaction(t.Name())
26942694
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
26952695
// NO-OP
26962696
})
@@ -2756,7 +2756,7 @@ func TestMapEncodedReply(t *testing.T) {
27562756
t.Cleanup(func() {
27572757
assert.NoError(t, transactionManager.Close())
27582758
})
2759-
transaction := transactionManager.StartTransaction()
2759+
transaction := transactionManager.StartTransaction(t.Name())
27602760
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
27612761
// NO-OP
27622762
})
@@ -2838,7 +2838,7 @@ func TestMapEncodedReply(t *testing.T) {
28382838
t.Cleanup(func() {
28392839
assert.NoError(t, transactionManager.Close())
28402840
})
2841-
transaction := transactionManager.StartTransaction()
2841+
transaction := transactionManager.StartTransaction(t.Name())
28422842
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
28432843
// NO-OP
28442844
})
@@ -2904,7 +2904,7 @@ func TestMapEncodedReply(t *testing.T) {
29042904
t.Cleanup(func() {
29052905
assert.NoError(t, transactionManager.Close())
29062906
})
2907-
transaction := transactionManager.StartTransaction()
2907+
transaction := transactionManager.StartTransaction(t.Name())
29082908
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
29092909
// NO-OP
29102910
})
@@ -2970,7 +2970,7 @@ func TestMapEncodedReply(t *testing.T) {
29702970
t.Cleanup(func() {
29712971
assert.NoError(t, transactionManager.Close())
29722972
})
2973-
transaction := transactionManager.StartTransaction()
2973+
transaction := transactionManager.StartTransaction(t.Name())
29742974
transaction.Submit(func(context.Context, transactions.RequestTransaction) {
29752975
// NO-OP
29762976
})

‎plc4go/internal/cbus/MessageCodec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func (m *MessageCodec) Disconnect() error {
9898
return err
9999
}
100100

101-
func (m *MessageCodec) Send(ctx context.Context, interactionId string, message spi.Message) error {
102-
m.log.Trace().Str("interactionId", interactionId).Interface("message", message).Msg("Sending message")
101+
func (m *MessageCodec) Send(ctx context.Context, interactionInfo string, message spi.Message) error {
102+
m.log.Trace().Str("interactionInfo", interactionInfo).Interface("message", message).Msg("Sending message")
103103
// Cast the message to the correct type of struct
104104
cbusMessage, ok := message.(readWriteModel.CBusMessage)
105105
if !ok {

‎plc4go/internal/cbus/MessageCodec_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func TestMessageCodec_Send(t *testing.T) {
4848
monitoredSALs chan readWriteModel.MonitoredSAL
4949
}
5050
type args struct {
51-
ctx context.Context
52-
interactionId string
53-
message spi.Message
51+
ctx context.Context
52+
interactionInfo string
53+
message spi.Message
5454
}
5555
tests := []struct {
5656
name string

‎plc4go/internal/cbus/Reader.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (m *Reader) readSync(ctx context.Context, readRequest apiModel.PlcReadReque
126126

127127
func (m *Reader) createMessageTransactionAndWait(ctx context.Context, messageToSend readWriteModel.CBusMessage, addResponseCode func(name string, responseCode apiModel.PlcResponseCode), tagName string, addPlcValue func(name string, plcValue apiValues.PlcValue)) {
128128
// Start a new request-transaction (Is ended in the response-handler)
129-
transaction := m.tm.StartTransaction()
129+
transaction := m.tm.StartTransaction("read")
130130
transaction.Submit(func(transactionContext context.Context, transaction transactions.RequestTransaction) {
131131
ctx, cancel := context.WithCancel(ctx)
132132
context.AfterFunc(transactionContext, cancel)

‎plc4go/internal/cbus/Writer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (m *Writer) Write(ctx context.Context, writeRequest apiModel.PlcWriteReques
112112
}
113113
tagNameCopy := tagName
114114
// Start a new request-transaction (Is ended in the response-handler)
115-
transaction := m.tm.StartTransaction()
115+
transaction := m.tm.StartTransaction("write")
116116
transaction.Submit(func(transactionContext context.Context, transaction transactions.RequestTransaction) {
117117
ctx, cancel := context.WithCancel(ctx)
118118
context.AfterFunc(transactionContext, cancel)

0 commit comments

Comments
 (0)