Create TCS Handler in ecs-agent model #3731
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Realmonia marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| package reporter | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "io" | ||
| "time" | ||
|
|
||
| "github.com/aws/amazon-ecs-agent/agent/api" | ||
| "github.com/aws/amazon-ecs-agent/agent/config" | ||
| "github.com/aws/amazon-ecs-agent/agent/engine" | ||
| "github.com/aws/amazon-ecs-agent/agent/version" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/doctor" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/eventstream" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/logger" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/logger/field" | ||
| tcshandler "github.com/aws/amazon-ecs-agent/ecs-agent/tcs/handler" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/utils/retry" | ||
| "github.com/aws/amazon-ecs-agent/ecs-agent/wsclient" | ||
| "github.com/aws/aws-sdk-go/aws/credentials" | ||
| "github.com/cihub/seelog" | ||
| ) | ||
|
|
||
| const ( | ||
| // The maximum time to wait between heartbeats without disconnecting | ||
| defaultHeartbeatTimeout = 1 * time.Minute | ||
| defaultHeartbeatJitter = 1 * time.Minute | ||
| // Default websocket client disconnection timeout initiated by agent | ||
| defaultDisconnectionTimeout = 15 * time.Minute | ||
| defaultDisconnectionJitter = 30 * time.Minute | ||
| ) | ||
|
|
||
| type DockerTelemetrySession struct { | ||
| s tcshandler.TelemetrySession | ||
| ecsClient api.ECSClient | ||
| containerInstanceArn string | ||
| } | ||
|
|
||
| func (session *DockerTelemetrySession) Start(ctx context.Context) error { | ||
| backoff := retry.NewExponentialBackoff(time.Second, 1*time.Minute, 0.2, 2) | ||
| for { | ||
| endpoint, tcsError := discoverPollEndpoint(session.containerInstanceArn, session.ecsClient) | ||
| if tcsError == nil { | ||
| tcsError = session.s.StartTelemetrySession(ctx, endpoint) | ||
| } | ||
| switch tcsError { | ||
| case context.Canceled, context.DeadlineExceeded: | ||
| return tcsError | ||
| case io.EOF, nil: | ||
| logger.Info("TCS Websocket connection closed for a valid reason") | ||
| backoff.Reset() | ||
| default: | ||
| seelog.Errorf("Error: lost websocket connection with ECS Telemetry service (TCS): %v", tcsError) | ||
| time.Sleep(backoff.Duration()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func NewDockerTelemetrySession( | ||
Realmonia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| containerInstanceArn string, | ||
| credentialProvider *credentials.Credentials, | ||
| cfg *config.Config, | ||
| deregisterInstanceEventStream *eventstream.EventStream, | ||
| ecsClient api.ECSClient, | ||
| taskEngine engine.TaskEngine, | ||
| metricsChannel <-chan ecstcs.TelemetryMessage, | ||
| healthChannel <-chan ecstcs.HealthMessage, | ||
| doctor *doctor.Doctor) *DockerTelemetrySession { | ||
| ok, cfgParseErr := isContainerHealthMetricsDisabled(cfg) | ||
| if cfgParseErr != nil { | ||
| seelog.Warnf("Error starting metrics session: %v", cfgParseErr) | ||
| return nil | ||
| } | ||
| if ok { | ||
| seelog.Warnf("Metrics were disabled, not starting the telemetry session") | ||
| return nil | ||
| } | ||
|
|
||
| agentVersion, agentHash, containerRuntimeVersion := generateVersionInfo(taskEngine) | ||
| if cfg == nil { | ||
| logger.Error("Config is empty in the tcs session parameter") | ||
| return nil | ||
| } | ||
|
|
||
| session := tcshandler.NewTelemetrySession( | ||
| containerInstanceArn, | ||
| cfg.Cluster, | ||
| agentVersion, | ||
| agentHash, | ||
| containerRuntimeVersion, | ||
| "", // this will be overridden by DockerTelemetrySession.Start() | ||
| cfg.DisableMetrics.Enabled() && cfg.DisableDockerHealthCheck.Enabled(), | ||
| credentialProvider, | ||
| &wsclient.WSClientMinAgentConfig{ | ||
| AWSRegion: cfg.AWSRegion, | ||
| AcceptInsecureCert: cfg.AcceptInsecureCert, | ||
| DockerEndpoint: cfg.DockerEndpoint, | ||
| IsDocker: true, | ||
| }, | ||
| deregisterInstanceEventStream, | ||
| defaultHeartbeatTimeout, | ||
| defaultHeartbeatJitter, | ||
| defaultDisconnectionTimeout, | ||
| defaultDisconnectionJitter, | ||
| nil, | ||
| metricsChannel, | ||
| healthChannel, | ||
| doctor, | ||
| ) | ||
| return &DockerTelemetrySession{session, ecsClient, containerInstanceArn} | ||
| } | ||
|
|
||
| func generateVersionInfo(taskEngine engine.TaskEngine) (string, string, string) { | ||
| agentVersion := version.Version | ||
| agentHash := version.GitHashString() | ||
| var containerRuntimeVersion string | ||
| if dockerVersion, getVersionErr := taskEngine.Version(); getVersionErr == nil { | ||
| containerRuntimeVersion = dockerVersion | ||
| } | ||
|
|
||
| return agentVersion, agentHash, containerRuntimeVersion | ||
| } | ||
|
|
||
| func discoverPollEndpoint(containerInstanceArn string, ecsClient api.ECSClient) (string, error) { | ||
| tcsEndpoint, err := ecsClient.DiscoverTelemetryEndpoint(containerInstanceArn) | ||
| if err != nil { | ||
| logger.Error("tcs: unable to discover poll endpoint", logger.Fields{ | ||
| field.Error: err, | ||
| }) | ||
| } | ||
| return tcsEndpoint, err | ||
| } | ||
|
|
||
| func isContainerHealthMetricsDisabled(cfg *config.Config) (bool, error) { | ||
| if cfg != nil { | ||
| return cfg.DisableMetrics.Enabled() && cfg.DisableDockerHealthCheck.Enabled(), nil | ||
| } | ||
| return false, errors.New("config is empty in the tcs session parameter") | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry I missed it before, but why are we still using the old handler instead of the new shared one in ecs-agent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops! Looks like there is a PR open yet to be merged. Will wait for it.