mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-11 18:16:24 +05:00
47af22c724
`ClientConnector` is no longer defined within `rpcclient` in its latest
version. It has been changed to be obtained from the `cgrates/birpc`
library instead.
Replaced `net/rpc` with `cgrates/birpc` and `net/rpc/jsonrpc` with
`cgrates/birpc/jsonrpc` libraries.
The implementations of `CallBiRPC()` and `Handlers()` were removed,
along with the methods associated with them.
The `rpcclient.BIRPCConector` and the methods prefixed with `BiRPC` were
removed from the `BiRPClient` interface.
The `BiRPClient` interface was renamed to `BIRPCClient`, although not
sure if needed (seems useful just to test if the structure is correct).
`rpcclient.BiRPCConector` has been replaced with `context.ClientConnector`,
which is now passed alongside `context.Context` within the same struct
(`cgrates/birpc/context.Context`). Consequently, functions that were
previously relying on it are now receiving the context instead. The
changes were made in the following functions:
- `engine/connmanager.go` - `*ConnManager.Call`
- `engine/connmanager.go` - `*ConnManager.getConn`
- `engine/connmanager.go` - `*ConnManager.getConnWithConfig`
- `engine/libengine.go` - `NewRPCPool`
- `engine/libengine.go` - `NewRPCConnection`
- `agents/libagents.go` - `processRequest`
Compilation errors related to the `rpcclient.NewRPCClient` function were
resolved by adding the missing `context`, `max_reconnect_interval`, and
`delayFunc` parameters. Additionally, context was added to all calls made
by the client. An effort was made to avoid passing hardcoded values as
much as possible, and extra flags were added where necessary for cgr
binaries.
The `max_reconnect_interval` parameter is now passed from parent
functions, which required adjustments to the function signature.
A new context field was added to all agent objects to ensure access to
it before sending it to the `connmanager's Call`, effectively replacing
`birpcclient`. Although an alternative would have been to create the
new service and add it to the context right before passing it to the
handlers, the chosen approach is definitely more comfortable.
With the addition of a context field for the SIP servers agents, an
additional error needed to be handled, coming from the creation of the
service. Agent constructors within the services package log errors as
they occur and return. Alternate solutions considered were either
shutting down the engine instead of returning, or just logging the
occurrence as a warning, particularly when the `ctx.Client` isn't
required, especially in cases where bidirectional connections are not
needed. For the latter option, it's crucial to return the object with
the error rather than nil or to make the error nil immediately after
logging.
Context has been integrated into all internal Call implementations to
ensure the objects conform to the `birpc.ClientConnector` interface.
These implementations will be removed in the near future as all service
objects are being wrapped in a `birpc.Service` type that satisfies the
`birpc.ClientConnector` interface. Currently, they are being retained
as a reference in case of any unexpected issues that arise.
Ensured that the `birpc.Service` wrapped service objects are passed to
the internal channel getters rather than the objects themselves.
Add context.TODO() to all \*ConnManager.Call function calls. To be
replaced with the context passed to the Method, when available.
For all `*ConnManager.Call` function calls, `context.TODO()` has been
added. This will be replaced with the context passed to the method when
it becomes available.
The value returned by StringGetOpts is now passed directly to the
FirstNonEmpty function, instead of being assigned to a variable
first.
The implementation of the `*AnalyzerService.GetInternalBiRPCCodec`
function has been removed from the services package. Additionally,
the AnalyzerBiRPCConnector type definition and its associated methods
have been removed.
The codec implementation has been revised to include the following
changes:
- `rpc.ServerCodec` -> `birpc.ServerCodec`;
- `rpc2.ServerCodec` -> `birpc.BirpcCodec`;
- `rpc2.Request` -> `birpc.Request`;
- `rpc2.Response` -> `birpc.Response`;
- The constructors for json and gob birpc codecs in `cenkalti/rpc`
have been replaced with ones from the `birpc/jsonrpc` library;
- The gob codec implementation has been removed in favor of the
version already implemented in the birpc external library.
The server implementation has been updated with the following changes:
- A field that represents a simple RPC server has been added to the
Server struct;
- Both the simple and bidirectional RPC servers are now initialized
inside the Server constructor, eliminating the need for nil checks;
- Usage of `net/rpc` and `cenkalti/rpc2` has been replaced with
`cgrates/birpc`;
- Additional `(Bi)RPCUnregisterName` methods have been added;
- The implementations for (bi)json/gob servers have been somewhat
simplified.
Before deleting the Call functions and using the `birpc.NewService`
method to register the methods for all cgrates components, update the
Call functions to satisfy the `birpc.ClientConnector` interface. This
way it will be a bit safer. Had to be done for SessionS though.
The `BiRPCCall` method has been removed from coreutils.go. The
`RPCCall` and `APIerRPCCall` methods are also to be removed in the
future.
Ensured that all methods for `SessionSv1` and `SessionS` have the
correct function signature with context. The same adjustments were made
for the session dispatcher methods and for the `SessionSv1Interface`.
Also removed sessionsbirpc.go and smgbirpc.go files.
Implemented the following methods to help with the registration of
methods across all subsystems:
- `NewServiceWithName`;
- `NewDispatcherService` for all dispatcher methods;
- `NewService` for the remaining methods that are already named
correctly.
Compared to the constructor from the external library, these also make
sure that the naming of the methods is consistent with our constants.
Added context to the Call methods for the mock client connectors (used
in tests).
Removed unused rpc fields from inside the following services:
- EeS
- LoaderS
- ResourceS
- RouteS
- StatS
- ThresholdS
- SessionS
- CoreS
Updated the methods implementing the logic for API methods to align
with the latest changes, ensuring consistency and correctness. The
modifications include:
- Adjusting the function signature to the new format
(ctx, args, reply).
- Prefixing names with 'V*' to indicate that they are utilized by
or registered as APIs.
- Containing the complete logic within the methods, enabling APIs
to call them and return their reply directly.
The subsystems affected by these changes are detailed as follows:
- CoreS: Additional methods were implementing utilizing the
existing ones. Though modifying them directly was possible, certain
methods (e.g., StopCPUProfiling()) were used elsewhere and not as
RPC requests.
- CDRs: Renamed V1CountCDRs to V1GetCDRsCount.
- StatS: V1GetQueueFloatMetrics, V1GetQueueStringMetrics,
V1GetStatQueue accept different arguments compared to API functions
(opted to register StatSv1 instead).
- ResourceS: Renamed V1ResourcesForEvent to V1GetResourcesForEvent
to align with API naming.
- DispatcherS: Renamed V1GetProfilesForEvent to
DispatcherSv1GetProfilesForEvent.
- For the rest, adding context to the function signature was enough.
In the unit tests, wrapping the object within a biprc.Service is now
ensured before passing it to the internal connections map under the
corresponding key.
Some tests that are covering error cases, are also checking the other
return value besides the error. That check has been removed since it
is redundant.
Revised the RPC/BiRPC clients' constructors (for use in tests)
A different approach has been chosen for the handling of ping methods
within subsystems. Instead of defining the same structure in every file,
the ping methods were added inside the Service constructor function.
Though the existing Ping methods were left as they were, they will be
removed in the future.
An additional method has been implemented to register the Ping method
from outside of the engine package.
Implemented Sleep and CapsError methods for SessionS (before they were
exclusively for bidirectional use, I believe).
A specific issue has been fixed within the CapsError SessionSv1 API
implementation, which is designed to overwrite methods that cannot be
allocated due to the threshold limit being reached. Previously, it was
deallocating when writing the response, even when a spot hadn't been
allocated in the first place (due to the cap being hit). The reason
behind this, especially why the test was passing before, still needs
to be looked into, as the problem should have occurred from before.
Implement `*SessionSv1.RegisterInternalBiJSONConn` method in apier.
All agent methods have been registered under the SessionSv1 name. For
the correct method names, the leading "V1" prefix has been trimmed
using the `birpc.NewServiceWithMethodsRename` function.
Revise the RegisterRpcParams function to populate the parameters
while relying on the `*birpc.Service` type instead. This will
automatically also deal with the validation. At the moment,
any error encountered is logged without being returned. Might
be changed in the future.
Inside the cgrRPCAction function, `mapstructure.Decode`'s output parameter
is now guaranteed to always be a pointer.
Updated go.mod and go.sum.
Fixed some typos.
127 lines
5.5 KiB
Modula-2
127 lines
5.5 KiB
Modula-2
module github.com/cgrates/cgrates
|
|
|
|
go 1.21
|
|
|
|
// replace github.com/cgrates/radigo => ../radigo
|
|
|
|
// replace github.com/cgrates/rpcclient => ../rpcclient
|
|
|
|
// replace github.com/cgrates/fsock => ../fsock
|
|
|
|
// replace github.com/cgrates/kamevapi => ../kamevapi
|
|
|
|
// replace github.com/cgrates/aringo => ../aringo
|
|
|
|
require (
|
|
github.com/Azure/go-amqp v0.18.1
|
|
github.com/antchfx/xmlquery v1.3.3
|
|
github.com/aws/aws-sdk-go v1.36.24
|
|
github.com/blevesearch/bleve v1.0.14
|
|
github.com/cgrates/aringo v0.0.0-20220525160735-b5990313d99e
|
|
github.com/cgrates/baningo v0.0.0-20210413080722-004ffd5e429f
|
|
github.com/cgrates/birpc v1.3.1-0.20211117095917-5b0ff29f3084
|
|
github.com/cgrates/fsock v0.0.0-20230123160954-12cae14030cc
|
|
github.com/cgrates/kamevapi v0.0.0-20220525160402-5b8036487a6c
|
|
github.com/cgrates/ltcache v0.0.0-20210405185848-da943e80c1ab
|
|
github.com/cgrates/radigo v0.0.0-20210902121842-ea2f9a730627
|
|
github.com/cgrates/rpcclient v0.0.0-20230605090759-8bb5188b73e5
|
|
github.com/cgrates/sipingo v1.0.1-0.20200514112313-699ebc1cdb8e
|
|
github.com/cgrates/ugocodec v0.0.0-20201023092048-df93d0123f60
|
|
github.com/creack/pty v1.1.11
|
|
github.com/dgrijalva/jwt-go v3.2.0+incompatible
|
|
github.com/elastic/elastic-transport-go/v8 v8.0.0-20230329154755-1a3c63de0db6
|
|
github.com/elastic/go-elasticsearch/v8 v8.8.0
|
|
github.com/ericlagergren/decimal v0.0.0-20191206042408-88212e6cfca9
|
|
github.com/fiorix/go-diameter/v4 v4.0.2
|
|
github.com/fsnotify/fsnotify v1.4.9
|
|
github.com/go-sql-driver/mysql v1.5.0
|
|
github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75
|
|
github.com/mediocregopher/radix/v3 v3.8.1
|
|
github.com/miekg/dns v1.1.54
|
|
github.com/mitchellh/mapstructure v1.4.0
|
|
github.com/nats-io/nats.go v1.11.0
|
|
github.com/nyaruka/phonenumbers v1.0.75
|
|
github.com/peterh/liner v1.2.1
|
|
github.com/rabbitmq/amqp091-go v1.5.0
|
|
github.com/segmentio/kafka-go v0.4.8
|
|
go.mongodb.org/mongo-driver v1.11.0
|
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
|
|
golang.org/x/net v0.10.0
|
|
golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5
|
|
google.golang.org/api v0.36.0
|
|
gorm.io/driver/mysql v1.0.3
|
|
gorm.io/driver/postgres v1.0.6
|
|
gorm.io/gorm v1.20.11
|
|
)
|
|
|
|
require (
|
|
cloud.google.com/go v0.75.0 // indirect
|
|
github.com/RoaringBitmap/roaring v0.5.5 // indirect
|
|
github.com/antchfx/xpath v1.1.11 // indirect
|
|
github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
|
|
github.com/blevesearch/mmap-go v1.0.2 // indirect
|
|
github.com/blevesearch/segment v0.9.0 // indirect
|
|
github.com/blevesearch/snowballstem v0.9.0 // indirect
|
|
github.com/blevesearch/zap/v11 v11.0.14 // indirect
|
|
github.com/blevesearch/zap/v12 v12.0.14 // indirect
|
|
github.com/blevesearch/zap/v13 v13.0.6 // indirect
|
|
github.com/blevesearch/zap/v14 v14.0.5 // indirect
|
|
github.com/blevesearch/zap/v15 v15.0.3 // indirect
|
|
github.com/cenkalti/hub v1.0.1 // indirect
|
|
github.com/couchbase/ghistogram v0.1.0 // indirect
|
|
github.com/couchbase/moss v0.1.0 // indirect
|
|
github.com/couchbase/vellum v1.0.2 // indirect
|
|
github.com/frankban/quicktest v1.11.3 // indirect
|
|
github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a // indirect
|
|
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
|
|
github.com/golang/protobuf v1.5.2 // indirect
|
|
github.com/golang/snappy v0.0.2 // indirect
|
|
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
|
|
github.com/ishidawataru/sctp v0.0.0-20191218070446-00ab2ac2db07 // indirect
|
|
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
|
|
github.com/jackc/pgconn v1.8.0 // indirect
|
|
github.com/jackc/pgio v1.0.0 // indirect
|
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
|
github.com/jackc/pgproto3/v2 v2.0.7 // indirect
|
|
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
|
|
github.com/jackc/pgtype v1.6.2 // indirect
|
|
github.com/jackc/pgx/v4 v4.10.1 // indirect
|
|
github.com/jinzhu/inflection v1.0.0 // indirect
|
|
github.com/jinzhu/now v1.1.1 // indirect
|
|
github.com/jmespath/go-jmespath v0.4.0 // indirect
|
|
github.com/klauspost/compress v1.13.6 // indirect
|
|
github.com/kr/pretty v0.2.1 // indirect
|
|
github.com/lib/pq v1.8.0 // indirect
|
|
github.com/mattn/go-runewidth v0.0.10 // indirect
|
|
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
|
|
github.com/mschoch/smat v0.2.0 // indirect
|
|
github.com/nats-io/nats-server/v2 v2.2.6 // indirect
|
|
github.com/nats-io/nkeys v0.3.0 // indirect
|
|
github.com/nats-io/nuid v1.0.1 // indirect
|
|
github.com/philhofer/fwd v1.1.1 // indirect
|
|
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
|
|
github.com/pkg/errors v0.9.1 // indirect
|
|
github.com/rivo/uniseg v0.2.0 // indirect
|
|
github.com/steveyen/gtreap v0.1.0 // indirect
|
|
github.com/syndtr/goleveldb v1.0.0 // indirect
|
|
github.com/tinylib/msgp v1.1.5 // indirect
|
|
github.com/willf/bitset v1.1.11 // indirect
|
|
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
|
|
github.com/xdg-go/scram v1.1.1 // indirect
|
|
github.com/xdg-go/stringprep v1.0.3 // indirect
|
|
github.com/xdg/stringprep v1.0.1-0.20180714160509-73f8eece6fdc // indirect
|
|
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
|
|
go.etcd.io/bbolt v1.3.5 // indirect
|
|
go.opencensus.io v0.22.5 // indirect
|
|
golang.org/x/mod v0.10.0 // indirect
|
|
golang.org/x/sync v0.2.0 // indirect
|
|
golang.org/x/sys v0.8.0 // indirect
|
|
golang.org/x/text v0.9.0 // indirect
|
|
golang.org/x/tools v0.9.3 // indirect
|
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
|
|
google.golang.org/appengine v1.6.7 // indirect
|
|
google.golang.org/genproto v0.0.0-20210111234610-22ae2b108f89 // indirect
|
|
google.golang.org/grpc v1.34.1 // indirect
|
|
google.golang.org/protobuf v1.28.0 // indirect
|
|
)
|