Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Support all component health check #1094

Merged
merged 2 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions components/configstores/etcdv3/etcdv3.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package etcdv3

import (
Expand All @@ -22,6 +23,8 @@ import (

"mosn.io/pkg/utils"

"mosn.io/layotto/components/pkg/actuators"

"go.etcd.io/etcd/api/v3/mvccpb"
clientv3 "go.etcd.io/etcd/client/v3"
"mosn.io/pkg/log"
Expand All @@ -31,10 +34,22 @@ import (
)

const (
defaultGroup = "default"
defaultLabel = "default"
defaultGroup = "default"
defaultLabel = "default"
componentName = "configstore-etcdv3"
)

var (
once sync.Once
readinessIndicator *actuators.HealthIndicator
livenessIndicator *actuators.HealthIndicator
)

func init() {
readinessIndicator = actuators.NewHealthIndicator()
livenessIndicator = actuators.NewHealthIndicator()
}

type EtcdV3ConfigStore struct {
client *clientv3.Client
sync.RWMutex
Expand All @@ -56,6 +71,10 @@ func (c *EtcdV3ConfigStore) GetDefaultLabel() string {
}

func NewStore() configstores.Store {
once.Do(func() {
indicators := &actuators.ComponentsIndicator{ReadinessIndicator: readinessIndicator, LivenessIndicator: livenessIndicator}
actuators.SetComponentsIndicator(componentName, indicators)
})
return &EtcdV3ConfigStore{subscribeKey: make(map[string]string), watchRespCh: make(chan *configstores.SubscribeResp)}
}

Expand All @@ -71,6 +90,12 @@ func (c *EtcdV3ConfigStore) Init(config *configstores.StoreConfig) error {
DialTimeout: time.Duration(t) * time.Second,
})
c.storeName = config.StoreName
if err != nil {
readinessIndicator.ReportError(err.Error())
livenessIndicator.ReportError(err.Error())
}
readinessIndicator.SetStarted()
livenessIndicator.SetStarted()
return err
}

Expand Down
26 changes: 25 additions & 1 deletion components/configstores/nacos/configstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,24 @@ import (
"mosn.io/pkg/log"

"mosn.io/layotto/components/configstores"
"mosn.io/layotto/components/pkg/actuators"
)

const (
componentName = "configstore-nacos"
)

var (
once sync.Once
readinessIndicator *actuators.HealthIndicator
livenessIndicator *actuators.HealthIndicator
)

func init() {
readinessIndicator = actuators.NewHealthIndicator()
livenessIndicator = actuators.NewHealthIndicator()
}

type ConfigStore struct {
client config_client.IConfigClient
storeName string
Expand All @@ -41,6 +57,10 @@ type ConfigStore struct {
}

func NewStore() configstores.Store {
once.Do(func() {
indicators := &actuators.ComponentsIndicator{ReadinessIndicator: readinessIndicator, LivenessIndicator: livenessIndicator}
actuators.SetComponentsIndicator(componentName, indicators)
})
return &ConfigStore{}
}

Expand Down Expand Up @@ -91,10 +111,14 @@ func (n *ConfigStore) Init(config *configstores.StoreConfig) (err error) {
} else {
client, err = n.init(config.Address, timeoutMs, metadata)
}

if err != nil {
readinessIndicator.ReportError(err.Error())
livenessIndicator.ReportError(err.Error())
return err
}

readinessIndicator.SetStarted()
livenessIndicator.SetStarted()
n.client = client
// replace nacos sdk log
return n.setupLogger(metadata)
Expand Down
26 changes: 26 additions & 0 deletions components/cryption/aliyun/kms.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions components/cryption/aws/kms.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions components/delay_queue/azure/servicebus/servicebus.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package servicebus

import (
Expand Down
25 changes: 25 additions & 0 deletions components/file/aliyun/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ import (
"fmt"
"io"
"strconv"
"sync"

"mosn.io/layotto/components/pkg/actuators"

"github.com/aliyun/aliyun-oss-go-sdk/oss"

Expand All @@ -32,14 +35,30 @@ import (

const (
storageTypeKey = "storageType"
componentName = "file-aliyun"
)

var (
once sync.Once
readinessIndicator *actuators.HealthIndicator
livenessIndicator *actuators.HealthIndicator
)

func init() {
readinessIndicator = actuators.NewHealthIndicator()
livenessIndicator = actuators.NewHealthIndicator()
}

// AliyunFile is a binding for an AliCloud OSS storage bucketKey
type AliyunFile struct {
client *oss.Client
}

func NewAliyunFile() file.File {
once.Do(func() {
indicators := &actuators.ComponentsIndicator{ReadinessIndicator: readinessIndicator, LivenessIndicator: livenessIndicator}
actuators.SetComponentsIndicator(componentName, indicators)
})
oss := &AliyunFile{}
return oss
}
Expand All @@ -49,6 +68,8 @@ func (s *AliyunFile) Init(ctx context.Context, metadata *file.FileConfig) error
m := make([]*utils.OssMetadata, 0)
err := json.Unmarshal(metadata.Metadata, &m)
if err != nil {
readinessIndicator.ReportError(err.Error())
livenessIndicator.ReportError(err.Error())
return file.ErrInvalid
}

Expand All @@ -58,10 +79,14 @@ func (s *AliyunFile) Init(ctx context.Context, metadata *file.FileConfig) error
}
client, err := oss.New(v.Endpoint, v.AccessKeyID, v.AccessKeySecret)
if err != nil {
readinessIndicator.ReportError(err.Error())
livenessIndicator.ReportError(err.Error())
return err
}
s.client = client
}
readinessIndicator.SetStarted()
livenessIndicator.SetStarted()
return nil
}

Expand Down
24 changes: 24 additions & 0 deletions components/file/aws/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import (
"fmt"
"io"
"strings"
"sync"

"mosn.io/layotto/components/pkg/actuators"
"mosn.io/layotto/components/pkg/utils"

"github.com/aws/aws-sdk-go-v2/aws"
Expand All @@ -38,14 +40,30 @@ import (

const (
defaultCredentialsSource = "provider"
componentName = "file-aws"
)

var (
once sync.Once
readinessIndicator *actuators.HealthIndicator
livenessIndicator *actuators.HealthIndicator
)

func init() {
readinessIndicator = actuators.NewHealthIndicator()
livenessIndicator = actuators.NewHealthIndicator()
}

// AwsOss is a binding for aws oss storage.
type AwsOss struct {
client *s3.Client
}

func NewAwsFile() file.File {
once.Do(func() {
indicators := &actuators.ComponentsIndicator{ReadinessIndicator: readinessIndicator, LivenessIndicator: livenessIndicator}
actuators.SetComponentsIndicator(componentName, indicators)
})
return &AwsOss{}
}

Expand All @@ -54,6 +72,8 @@ func (a *AwsOss) Init(ctx context.Context, config *file.FileConfig) error {
m := make([]*utils.OssMetadata, 0)
err := json.Unmarshal(config.Metadata, &m)
if err != nil {
readinessIndicator.ReportError(err.Error())
livenessIndicator.ReportError(err.Error())
return errors.New("invalid config for aws oss")
}
for _, data := range m {
Expand All @@ -64,6 +84,10 @@ func (a *AwsOss) Init(ctx context.Context, config *file.FileConfig) error {
if err != nil {
continue
}
if client != nil {
readinessIndicator.SetStarted()
livenessIndicator.SetStarted()
}
a.client = client
}
return nil
Expand Down
Loading
Loading