mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-11 18:16:24 +05:00
Upgraded NATS server version in ansible role. upgraded go.mod nats version due to an issue caused by version mismatch between driver and server (uncertain). Increased amount of sleep in tests after starting a NATS server with jetstream enabled from 50ms to 100ms. ## *NatsER.Serve - Replaced ChanQueueSubscribe with QueueSubscribe for Core NATS consumer to handle the message processing directly. - Since QueueSubscribe is now used regardless of jetstream status, the message handler has been assigned to a separate variable that can be reused. - The message handler is now dealing with the message processing directly, therefore the select case listening for the channel which is feeding NATS messages can be removed together with the channel itself and the select. Currently, the goroutine within Serve only has to block until the rdrExit chan is closed. - Moved the resource check inside the handler right before starting the message processing goroutine. ## ers.getProcessedOptions - Renamed function from getProcessOptions to getProcessedOptions. - Initially, the EventExporterOpts struct was always initialized to be non-nil which meant exporting processed messages by the reader was always enabled by force. Function has been updated to initialize it only once when the first Processed option that was set is found. - Created init function for all types of opts structs to avoid repetition. ## *NatsEE.parseOpts - Renamed function from parseOpt to parseOpts. - Updated function to return early in case of nil opts struct to reduce nesting. - The nested jetstream status and maxwait conditions nil verification have been merged into one condition. - Handled the error coming from GetNatsOpts function. - NATS Subject assignment has been removed. It was redundant, since it had already been set from before this function was called. ## *NatsEE.Connect - Updated function to return early in case of non-nil nats.Conn value to reduce nesting. ## *NatsEE.ExportEvent - Use defer to release resources and RUnlock. ## *NatsEE.Close - Use defer to Unlock. - Update function to return early in case of nil nats.Conn value to reduce nesting. ## ees.GetNatsOpts - Chose switch over if else when parsing client certificate and keys opts. - Updated function to return the errors directly instead of assigning them to a separate variable right before returning. ## ers.GetNatsOpts - Passed the NATSROpts struct directly to the function. - Chose switch over if else when parsing client certificate and keys opts. - Updated function to return the errors directly instead of assigning them to a separate variable right before returning. Removed tab from commented natsJetStreamMaxWaitProcessed option value in config_defaults.go under ers section. Removed redundant NATS prefix from config.NATSROpts type field names. Added function in ers/lib_test.go to create a config file in /tmp based on a config string. Added integration test for ERs NATS.
259 lines
7.0 KiB
Go
259 lines
7.0 KiB
Go
/*
|
|
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
|
|
Copyright (C) ITsysCOM GmbH
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
*/
|
|
|
|
package ers
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"time"
|
|
|
|
"github.com/aws/aws-sdk-go/aws"
|
|
"github.com/aws/aws-sdk-go/aws/credentials"
|
|
"github.com/aws/aws-sdk-go/aws/session"
|
|
"github.com/aws/aws-sdk-go/service/s3"
|
|
"github.com/cgrates/cgrates/agents"
|
|
"github.com/cgrates/cgrates/config"
|
|
"github.com/cgrates/cgrates/ees"
|
|
"github.com/cgrates/cgrates/engine"
|
|
"github.com/cgrates/cgrates/utils"
|
|
)
|
|
|
|
// NewS3ER return a new s3 event reader
|
|
func NewS3ER(cfg *config.CGRConfig, cfgIdx int,
|
|
rdrEvents, partialEvents chan *erEvent, rdrErr chan error,
|
|
fltrS *engine.FilterS, rdrExit chan struct{}) (er EventReader, err error) {
|
|
|
|
rdr := &S3ER{
|
|
cgrCfg: cfg,
|
|
cfgIdx: cfgIdx,
|
|
fltrS: fltrS,
|
|
rdrEvents: rdrEvents,
|
|
partialEvents: partialEvents,
|
|
rdrExit: rdrExit,
|
|
rdrErr: rdrErr,
|
|
}
|
|
if concReq := rdr.Config().ConcurrentReqs; concReq != -1 {
|
|
rdr.cap = make(chan struct{}, concReq)
|
|
for i := 0; i < concReq; i++ {
|
|
rdr.cap <- struct{}{}
|
|
}
|
|
}
|
|
rdr.parseOpts(rdr.Config().Opts)
|
|
rdr.createPoster()
|
|
return rdr, nil
|
|
}
|
|
|
|
// S3ER implements EventReader interface for s3 message
|
|
type S3ER struct {
|
|
// sync.RWMutex
|
|
cgrCfg *config.CGRConfig
|
|
cfgIdx int // index of config instance within ERsCfg.Readers
|
|
fltrS *engine.FilterS
|
|
|
|
rdrEvents chan *erEvent // channel to dispatch the events created to
|
|
partialEvents chan *erEvent // channel to dispatch the partial events created to
|
|
rdrExit chan struct{}
|
|
rdrErr chan error
|
|
cap chan struct{}
|
|
|
|
awsRegion string
|
|
awsID string
|
|
awsKey string
|
|
awsToken string
|
|
bucket string
|
|
session *session.Session
|
|
|
|
poster *ees.S3EE
|
|
}
|
|
|
|
type s3Client interface {
|
|
ListObjectsV2Pages(input *s3.ListObjectsV2Input, fn func(*s3.ListObjectsV2Output, bool) bool) error
|
|
GetObject(input *s3.GetObjectInput) (*s3.GetObjectOutput, error)
|
|
DeleteObject(input *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error)
|
|
}
|
|
|
|
// Config returns the curent configuration
|
|
func (rdr *S3ER) Config() *config.EventReaderCfg {
|
|
return rdr.cgrCfg.ERsCfg().Readers[rdr.cfgIdx]
|
|
}
|
|
|
|
// Serve will start the gorutines needed to watch the s3 topic
|
|
func (rdr *S3ER) Serve() (err error) {
|
|
var sess *session.Session
|
|
cfg := aws.Config{Endpoint: aws.String(rdr.Config().SourcePath)}
|
|
if len(rdr.awsRegion) != 0 {
|
|
cfg.Region = aws.String(rdr.awsRegion)
|
|
}
|
|
if len(rdr.awsID) != 0 &&
|
|
len(rdr.awsKey) != 0 {
|
|
cfg.Credentials = credentials.NewStaticCredentials(rdr.awsID, rdr.awsKey, rdr.awsToken)
|
|
}
|
|
if sess, err = session.NewSessionWithOptions(session.Options{Config: cfg}); err != nil {
|
|
return
|
|
}
|
|
rdr.session = sess
|
|
|
|
if rdr.Config().RunDelay == time.Duration(0) { // 0 disables the automatic read, maybe done per API
|
|
return
|
|
}
|
|
go rdr.readLoop(s3.New(rdr.session)) // read until the connection is closed
|
|
return
|
|
}
|
|
|
|
func (rdr *S3ER) processMessage(body []byte) (err error) {
|
|
var decodedMessage map[string]any
|
|
if err = json.Unmarshal(body, &decodedMessage); err != nil {
|
|
return
|
|
}
|
|
|
|
agReq := agents.NewAgentRequest(
|
|
utils.MapStorage(decodedMessage), nil,
|
|
nil, nil, nil, rdr.Config().Tenant,
|
|
rdr.cgrCfg.GeneralCfg().DefaultTenant,
|
|
utils.FirstNonEmpty(rdr.Config().Timezone,
|
|
rdr.cgrCfg.GeneralCfg().DefaultTimezone),
|
|
rdr.fltrS, nil) // create an AgentRequest
|
|
var pass bool
|
|
if pass, err = rdr.fltrS.Pass(agReq.Tenant, rdr.Config().Filters,
|
|
agReq); err != nil || !pass {
|
|
return
|
|
}
|
|
if err = agReq.SetFields(rdr.Config().Fields); err != nil {
|
|
return
|
|
}
|
|
cgrEv := utils.NMAsCGREvent(agReq.CGRRequest, agReq.Tenant, utils.NestingSep, agReq.Opts)
|
|
rdrEv := rdr.rdrEvents
|
|
if _, isPartial := cgrEv.APIOpts[utils.PartialOpt]; isPartial {
|
|
rdrEv = rdr.partialEvents
|
|
}
|
|
rdrEv <- &erEvent{
|
|
cgrEvent: cgrEv,
|
|
rdrCfg: rdr.Config(),
|
|
}
|
|
return
|
|
}
|
|
|
|
func (rdr *S3ER) parseOpts(opts *config.EventReaderOpts) {
|
|
rdr.bucket = utils.DefaultQueueID
|
|
if awsOpts := opts.AWSOpts; awsOpts != nil {
|
|
if awsOpts.S3BucketID != nil {
|
|
rdr.bucket = *awsOpts.S3BucketID
|
|
}
|
|
if awsOpts.AWSRegion != nil {
|
|
rdr.awsRegion = *awsOpts.AWSRegion
|
|
}
|
|
if awsOpts.AWSKey != nil {
|
|
rdr.awsID = *awsOpts.AWSKey
|
|
}
|
|
if awsOpts.AWSSecret != nil {
|
|
rdr.awsKey = *awsOpts.AWSSecret
|
|
}
|
|
if awsOpts.AWSToken != nil {
|
|
rdr.awsToken = *awsOpts.AWSToken
|
|
}
|
|
}
|
|
}
|
|
|
|
func (rdr *S3ER) readLoop(scv s3Client) (err error) {
|
|
var keys []string
|
|
if err = scv.ListObjectsV2Pages(&s3.ListObjectsV2Input{Bucket: aws.String(rdr.bucket)},
|
|
func(lovo *s3.ListObjectsV2Output, _ bool) bool {
|
|
for _, objMeta := range lovo.Contents {
|
|
if objMeta.Key != nil {
|
|
keys = append(keys, *objMeta.Key)
|
|
}
|
|
}
|
|
return !rdr.isClosed()
|
|
}); err != nil {
|
|
rdr.rdrErr <- err
|
|
return
|
|
}
|
|
if rdr.isClosed() {
|
|
return
|
|
}
|
|
for _, key := range keys {
|
|
go rdr.readMsg(scv, key)
|
|
}
|
|
return
|
|
}
|
|
|
|
func (rdr *S3ER) createPoster() {
|
|
processedOpt := getProcessedOptions(rdr.Config().Opts)
|
|
if processedOpt == nil && len(rdr.Config().ProcessedPath) == 0 {
|
|
return
|
|
}
|
|
eeCfg := config.NewEventExporterCfg(rdr.Config().ID, "", utils.FirstNonEmpty(rdr.Config().ProcessedPath, rdr.Config().SourcePath),
|
|
rdr.cgrCfg.GeneralCfg().FailedPostsDir, rdr.cgrCfg.GeneralCfg().PosterAttempts, processedOpt)
|
|
rdr.poster = ees.NewS3EE(eeCfg, nil)
|
|
}
|
|
|
|
func (rdr *S3ER) isClosed() bool {
|
|
select {
|
|
case <-rdr.rdrExit:
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|
|
|
|
func (rdr *S3ER) readMsg(scv s3Client, key string) (err error) {
|
|
if rdr.Config().ConcurrentReqs != -1 {
|
|
<-rdr.cap // do not try to read if the limit is reached
|
|
defer func() { rdr.cap <- struct{}{} }()
|
|
}
|
|
if rdr.isClosed() {
|
|
return
|
|
}
|
|
|
|
obj, err := scv.GetObject(&s3.GetObjectInput{Bucket: &rdr.bucket, Key: &key})
|
|
if err != nil {
|
|
rdr.rdrErr <- err
|
|
return
|
|
}
|
|
var msg []byte
|
|
if msg, err = io.ReadAll(obj.Body); err != nil {
|
|
utils.Logger.Warning(
|
|
fmt.Sprintf("<%s> decoding message %s error: %s",
|
|
utils.ERs, key, err.Error()))
|
|
return
|
|
}
|
|
obj.Body.Close()
|
|
if err = rdr.processMessage(msg); err != nil {
|
|
utils.Logger.Warning(
|
|
fmt.Sprintf("<%s> processing message %s error: %s",
|
|
utils.ERs, key, err.Error()))
|
|
return
|
|
}
|
|
if _, err = scv.DeleteObject(&s3.DeleteObjectInput{Bucket: &rdr.bucket, Key: &key}); err != nil {
|
|
rdr.rdrErr <- err
|
|
return
|
|
}
|
|
|
|
if rdr.poster != nil { // post it
|
|
if err = ees.ExportWithAttempts(rdr.poster, msg, key); err != nil {
|
|
utils.Logger.Warning(
|
|
fmt.Sprintf("<%s> writing message %s error: %s",
|
|
utils.ERs, key, err.Error()))
|
|
return
|
|
}
|
|
}
|
|
return
|
|
}
|