Skip to content

Commit 21eb3e9

Browse files
aphralGaphralG
committed
Merge branch 'v3' into start-subscribe-after-connection-created
2 parents 8d19a2f + 8eea4b8 commit 21eb3e9

30 files changed

+131
-578
lines changed

‎internal/collector/otel_collector_plugin.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ const (
3333
// 2024-11-06T17:19:24+00:00 ---> Nov 6 17:19:24
3434
// 2024-11-16T17:19:24+00:00 ---> Nov 16 17:19:24
3535
timestampConversionExpression = `'EXPR(let timestamp = split(split(body, ">")[1], " ")[0]; ` +
36-
`let newTimestamp = timestamp matches "(\\d{4})-(\\d{2})-(0\\d{1})T(\\d{2}):(\\d{2}):(\\d{2}).*" ` +
37-
`? date(timestamp).Format("Jan 2 15:04:05") : date(timestamp).Format("Jan 02 15:04:05"); ` +
36+
`let newTimestamp = ` +
37+
`timestamp matches "(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})([+-]\\d{2}:\\d{2}|Z)" ` +
38+
`? (let utcTime = ` +
39+
`date(timestamp).UTC(); utcTime.Format("Jan 2 15:04:05")) : date(timestamp).Format("Jan 02 15:04:05"); ` +
3840
`split(body, ">")[0] + ">" + newTimestamp + " " + split(body, " ", 2)[1])'`
3941
)
4042

‎internal/command/command_plugin.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
1616
"github.com/nginx/agent/v3/internal/bus"
1717
"github.com/nginx/agent/v3/internal/config"
18-
"github.com/nginx/agent/v3/internal/datasource/proto"
1918
"github.com/nginx/agent/v3/internal/grpc"
2019
"github.com/nginx/agent/v3/internal/logger"
2120
pkgConfig "github.com/nginx/agent/v3/pkg/config"
21+
"github.com/nginx/agent/v3/pkg/id"
2222
)
2323

2424
var _ bus.Plugin = (*CommandPlugin)(nil)
@@ -294,7 +294,7 @@ func (cp *CommandPlugin) createDataPlaneResponse(correlationID string, status mp
294294
) *mpi.DataPlaneResponse {
295295
return &mpi.DataPlaneResponse{
296296
MessageMeta: &mpi.MessageMeta{
297-
MessageId: proto.GenerateMessageID(),
297+
MessageId: id.GenerateMessageID(),
298298
CorrelationId: correlationID,
299299
Timestamp: timestamppb.Now(),
300300
},

‎internal/command/command_plugin_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"time"
1313

1414
pkg "github.com/nginx/agent/v3/pkg/config"
15+
"github.com/nginx/agent/v3/pkg/id"
1516

16-
"github.com/nginx/agent/v3/internal/datasource/proto"
1717
"google.golang.org/protobuf/types/known/timestamppb"
1818

1919
"github.com/nginx/agent/v3/internal/bus/busfakes"
@@ -372,7 +372,7 @@ func TestMonitorSubscribeChannel(t *testing.T) {
372372
func Test_createDataPlaneResponse(t *testing.T) {
373373
expected := &mpi.DataPlaneResponse{
374374
MessageMeta: &mpi.MessageMeta{
375-
MessageId: proto.GenerateMessageID(),
375+
MessageId: id.GenerateMessageID(),
376376
CorrelationId: "dfsbhj6-bc92-30c1-a9c9-85591422068e",
377377
Timestamp: timestamppb.Now(),
378378
},

‎internal/command/command_service.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020

2121
mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
2222
"github.com/nginx/agent/v3/internal/config"
23-
"github.com/nginx/agent/v3/internal/datasource/proto"
2423
"github.com/nginx/agent/v3/internal/grpc"
2524
"github.com/nginx/agent/v3/internal/logger"
25+
"github.com/nginx/agent/v3/pkg/id"
2626

2727
"google.golang.org/protobuf/types/known/timestamppb"
2828

@@ -85,7 +85,7 @@ func (cs *CommandService) UpdateDataPlaneStatus(
8585

8686
request := &mpi.UpdateDataPlaneStatusRequest{
8787
MessageMeta: &mpi.MessageMeta{
88-
MessageId: proto.GenerateMessageID(),
88+
MessageId: id.GenerateMessageID(),
8989
CorrelationId: correlationID,
9090
Timestamp: timestamppb.Now(),
9191
},
@@ -139,7 +139,7 @@ func (cs *CommandService) UpdateDataPlaneHealth(ctx context.Context, instanceHea
139139

140140
request := &mpi.UpdateDataPlaneHealthRequest{
141141
MessageMeta: &mpi.MessageMeta{
142-
MessageId: proto.GenerateMessageID(),
142+
MessageId: id.GenerateMessageID(),
143143
CorrelationId: correlationID,
144144
Timestamp: timestamppb.Now(),
145145
},
@@ -212,7 +212,7 @@ func (cs *CommandService) CreateConnection(
212212

213213
request := &mpi.CreateConnectionRequest{
214214
MessageMeta: &mpi.MessageMeta{
215-
MessageId: proto.GenerateMessageID(),
215+
MessageId: id.GenerateMessageID(),
216216
CorrelationId: correlationID,
217217
Timestamp: timestamppb.Now(),
218218
},
@@ -311,7 +311,7 @@ func (cs *CommandService) sendResponseForQueuedConfigApplyRequests(
311311
for i := 0; i < indexOfConfigApplyRequest; i++ {
312312
newResponse := response
313313

314-
newResponse.GetMessageMeta().MessageId = proto.GenerateMessageID()
314+
newResponse.GetMessageMeta().MessageId = id.GenerateMessageID()
315315

316316
request := cs.configApplyRequestQueue[instanceID][i]
317317
newResponse.GetMessageMeta().CorrelationId = request.GetMessageMeta().GetCorrelationId()
@@ -504,7 +504,7 @@ func (cs *CommandService) checkIfInstanceExists(
504504

505505
response := &mpi.DataPlaneResponse{
506506
MessageMeta: &mpi.MessageMeta{
507-
MessageId: proto.GenerateMessageID(),
507+
MessageId: id.GenerateMessageID(),
508508
CorrelationId: request.GetMessageMeta().GetCorrelationId(),
509509
Timestamp: timestamppb.Now(),
510510
},

‎internal/config/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"strconv"
1818
"strings"
1919

20+
uuidLibrary "github.com/nginx/agent/v3/pkg/id"
2021
selfsignedcerts "github.com/nginx/agent/v3/pkg/tls"
21-
uuidLibrary "github.com/nginx/agent/v3/pkg/uuid"
2222
"github.com/spf13/cobra"
2323
flag "github.com/spf13/pflag"
2424
"github.com/spf13/viper"

‎internal/datasource/proto/message.go‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎internal/datasource/proto/response.go‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright (c) F5, Inc.
2+
//
3+
// This source code is licensed under the Apache License, Version 2.0 license found in the
4+
// LICENSE file in the root directory of this source tree.
5+
6+
package proto
7+
8+
import (
9+
mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
10+
agentid "github.com/nginx/agent/v3/pkg/id"
11+
"google.golang.org/protobuf/types/known/timestamppb"
12+
)
13+
14+
func CreateDataPlaneResponse(correlationID string, status mpi.CommandResponse_CommandStatus,
15+
message, instanceID, err string,
16+
) *mpi.DataPlaneResponse {
17+
return &mpi.DataPlaneResponse{
18+
MessageMeta: &mpi.MessageMeta{
19+
MessageId: agentid.GenerateMessageID(),
20+
CorrelationId: correlationID,
21+
Timestamp: timestamppb.Now(),
22+
},
23+
CommandResponse: &mpi.CommandResponse{
24+
Status: status,
25+
Message: message,
26+
Error: err,
27+
},
28+
InstanceId: instanceID,
29+
}
30+
}

‎internal/file/file_manager_service.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"sync"
1717
"sync/atomic"
1818

19-
"github.com/nginx/agent/v3/internal/datasource/proto"
2019
"github.com/nginx/agent/v3/internal/model"
2120

2221
"github.com/cenkalti/backoff/v4"
@@ -26,6 +25,7 @@ import (
2625
"github.com/nginx/agent/v3/internal/grpc"
2726
"github.com/nginx/agent/v3/internal/logger"
2827
"github.com/nginx/agent/v3/pkg/files"
28+
"github.com/nginx/agent/v3/pkg/id"
2929
"google.golang.org/protobuf/types/known/timestamppb"
3030

3131
backoffHelpers "github.com/nginx/agent/v3/internal/backoff"
@@ -104,7 +104,7 @@ func (fms *FileManagerService) UpdateOverview(
104104

105105
request := &mpi.UpdateOverviewRequest{
106106
MessageMeta: &mpi.MessageMeta{
107-
MessageId: proto.GenerateMessageID(),
107+
MessageId: id.GenerateMessageID(),
108108
CorrelationId: correlationID,
109109
Timestamp: timestamppb.Now(),
110110
},
@@ -224,7 +224,7 @@ func (fms *FileManagerService) UpdateFile(
224224
Contents: contents,
225225
},
226226
MessageMeta: &mpi.MessageMeta{
227-
MessageId: proto.GenerateMessageID(),
227+
MessageId: id.GenerateMessageID(),
228228
CorrelationId: correlationID,
229229
Timestamp: timestamppb.Now(),
230230
},
@@ -382,7 +382,7 @@ func (fms *FileManagerService) fileUpdate(ctx context.Context, file *mpi.File) e
382382
getFile := func() (*mpi.GetFileResponse, error) {
383383
return fms.fileServiceClient.GetFile(ctx, &mpi.GetFileRequest{
384384
MessageMeta: &mpi.MessageMeta{
385-
MessageId: proto.GenerateMessageID(),
385+
MessageId: id.GenerateMessageID(),
386386
CorrelationId: logger.GetCorrelationID(ctx),
387387
Timestamp: timestamppb.Now(),
388388
},

‎internal/file/file_plugin.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
"log/slog"
1212

1313
"github.com/nginx/agent/v3/pkg/files"
14+
"github.com/nginx/agent/v3/pkg/id"
1415

1516
mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
1617
"github.com/nginx/agent/v3/internal/bus"
1718
"github.com/nginx/agent/v3/internal/config"
18-
"github.com/nginx/agent/v3/internal/datasource/proto"
1919
"github.com/nginx/agent/v3/internal/grpc"
2020
"github.com/nginx/agent/v3/internal/logger"
2121
"github.com/nginx/agent/v3/internal/model"
@@ -319,7 +319,7 @@ func (fp *FilePlugin) handleConfigUploadRequest(ctx context.Context, msg *bus.Me
319319

320320
response := &mpi.DataPlaneResponse{
321321
MessageMeta: &mpi.MessageMeta{
322-
MessageId: proto.GenerateMessageID(),
322+
MessageId: id.GenerateMessageID(),
323323
CorrelationId: correlationID,
324324
Timestamp: timestamppb.Now(),
325325
},
@@ -343,7 +343,7 @@ func (fp *FilePlugin) createDataPlaneResponse(correlationID string, status mpi.C
343343
) *mpi.DataPlaneResponse {
344344
return &mpi.DataPlaneResponse{
345345
MessageMeta: &mpi.MessageMeta{
346-
MessageId: proto.GenerateMessageID(),
346+
MessageId: id.GenerateMessageID(),
347347
CorrelationId: correlationID,
348348
Timestamp: timestamppb.Now(),
349349
},

‎internal/file/file_plugin_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import (
1313
"time"
1414

1515
"github.com/nginx/agent/v3/internal/bus/busfakes"
16-
"github.com/nginx/agent/v3/internal/datasource/proto"
17-
1816
"google.golang.org/protobuf/types/known/timestamppb"
1917

2018
mpi "github.com/nginx/agent/v3/api/grpc/mpi/v1"
@@ -24,6 +22,7 @@ import (
2422
"github.com/nginx/agent/v3/internal/grpc/grpcfakes"
2523
"github.com/nginx/agent/v3/internal/model"
2624
"github.com/nginx/agent/v3/pkg/files"
25+
"github.com/nginx/agent/v3/pkg/id"
2726
"github.com/nginx/agent/v3/test/helpers"
2827
"github.com/nginx/agent/v3/test/protos"
2928
"github.com/nginx/agent/v3/test/types"
@@ -445,7 +444,7 @@ func TestFilePlugin_Process_ConfigApplyRollbackCompleteTopic(t *testing.T) {
445444

446445
expectedResponse := &mpi.DataPlaneResponse{
447446
MessageMeta: &mpi.MessageMeta{
448-
MessageId: proto.GenerateMessageID(),
447+
MessageId: id.GenerateMessageID(),
449448
CorrelationId: "dfsbhj6-bc92-30c1-a9c9-85591422068e",
450449
Timestamp: timestamppb.Now(),
451450
},

0 commit comments

Comments
 (0)