module upgrades for go-service

CHANGELOG.md

@@ -359,6 +359,12 @@ IMPROVEMENTS:
 * Improve the json metadata output for use with Hive DDL and query engines like AWS Athena
 * Removed undecorated logs from the metadata key hierarchy, use the experiment output only
 
+# 0.14.3
+
+IMPROVEMENTS:
+
+* Go 1.16.6 support
+
 FIXES:
 
 * 

Dockerfile_developer

@@ -49,7 +49,7 @@ RUN \
     python3 get-pip.py pip==20.1 setuptools==44.0.0 wheel==0.35.1 && \
     pip3 install pyopenssl cryptography --upgrade
 
-ENV GO_VERSION 1.16.5
+ENV GO_VERSION 1.16.6
 
 RUN \
     cd /home/${USER} && \

Dockerfile_microk8s

@@ -7,7 +7,7 @@ MAINTAINER [email protected]
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
 
-ENV GO_VERSION 1.16.5
+ENV GO_VERSION 1.16.6
 
 RUN \
     curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \

Dockerfile_standalone

@@ -7,7 +7,7 @@ MAINTAINER [email protected]
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
 
-ENV GO_VERSION 1.16.5
+ENV GO_VERSION 1.16.6
 
 RUN \
     curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \

Dockerfile_workstation

@@ -7,7 +7,7 @@ MAINTAINER [email protected]
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND noninteractive
 
-ENV GO_VERSION 1.16.5
+ENV GO_VERSION 1.16.6
 
 RUN \
     mkdir -p /project/go && \

README.md

@@ -416,9 +416,9 @@ sudo dpkg -i trivy_0.18.3_Linux-64bit.deb
 This code based makes use of Go 1.16+.  The compiler can be found on the golang.org web site for downloading. On Ubuntu the following commands can be used:
 
 ```
-wget https://golang.org/dl/go1.16.5.linux-amd64.tar.gz
+wget https://golang.org/dl/go1.16.6.linux-amd64.tar.gz
 rm -rf go
-tar xzf go1.16.5.linux-amd64.tar.gz
+tar xzf go1.16.6.linux-amd64.tar.gz
 export GOROOT=`pwd`/go
 export PATH=`pwd`/go/bin:$PATH
 ```

cmd/runner/main.go

@@ -14,13 +14,12 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/leaf-ai/go-service/pkg/aws_gsc"
 	"github.com/leaf-ai/go-service/pkg/log"
 	"github.com/leaf-ai/go-service/pkg/process"
 	"github.com/leaf-ai/go-service/pkg/runtime"
 	"github.com/leaf-ai/go-service/pkg/server"
 
-	aws_ext "github.com/leaf-ai/studio-go-runner/internal/aws"
-
 	"github.com/leaf-ai/studio-go-runner/internal/cpu_resource"
 	"github.com/leaf-ai/studio-go-runner/internal/cuda"
 	"github.com/leaf-ai/studio-go-runner/internal/defense"
@@ -396,7 +395,7 @@ func EntryPoint(ctx context.Context, cancel context.CancelFunc, doneC chan struc
 
 	logger.Info("version", "git_hash", gitHash)
 
-	if aws, err := aws_ext.IsAWS(); aws {
+	if aws, err := aws_gsc.IsAWS(); aws {
 		logger.Info("AWS detected")
 	} else {
 		if err == nil {

cmd/runner/sqs.go

@@ -20,11 +20,13 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sqs"
+
 	"github.com/prometheus/client_golang/prometheus"
 
+	"github.com/leaf-ai/go-service/pkg/aws_gsc"
 	"github.com/leaf-ai/go-service/pkg/server"
 	"github.com/leaf-ai/go-service/pkg/types"
-	aws_int "github.com/leaf-ai/studio-go-runner/internal/aws"
+
 	"github.com/leaf-ai/studio-go-runner/internal/task"
 	aws_ext "github.com/leaf-ai/studio-go-runner/pkg/aws"
 
@@ -39,9 +41,9 @@ var (
 type awsCred struct {
 }
 
-func (*awsCred) validate(ctx context.Context, filenames []string) (cred *aws_int.AWSCred, err kv.Error) {
+func (*awsCred) validate(ctx context.Context, filenames []string) (cred *aws_gsc.AWSCred, err kv.Error) {
 
-	cred, err = aws_int.AWSExtractCreds(filenames)
+	cred, err = aws_gsc.AWSExtractCreds(filenames, "default")
 	if err != nil {
 		return cred, err
 	}

docs/aws_k8s.md

@@ -53,7 +53,7 @@ In order to make use of StudioML environment variable based templates you should
 
 <pre><code><b>export AWS_ACCOUNT=`aws sts get-caller-identity --query Account --output text`
 aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin $AWS_ACCOUNT.dkr.ecr.us-west-2.amazonaws.com
-export AWS_ACCESS_KEY=xxx
+export AWS_ACCESS_KEY_ID=xxx
 export AWS_SECRET_ACCESS_KEY=xxx
 export AWS_DEFAULT_REGION=xxx
 sudo ntpdate ntp.ubuntu.com
@@ -288,7 +288,7 @@ nstance failed.",
   "AutoScalingGroupARN": "arn:aws:autoscaling:us-west-2:...:autoScalingGroup:74dd6499-6426-488f-98eb-35e5bea961cc:autoScalingGroupName/eksctl
 -test-eks-nodegroup-1-gpu-spot-p2-xlarge-NodeGroup-HKH7E4GCQ3GP"
 }
-```
+</code></pre>
 
 The jq command was used to select the first, or latest scaling acitivity.  The failed scaling attempt was due to the availability zones specified having no capacity.  TGhe fix would be to modify the node group definition inside the cluster.yaml file and redeploy the cluster in zones that have availability of the instance types being used.
 

docs/interface.md

@@ -24,6 +24,9 @@ Table of Contents
     * [experiment ↠ max_duration](#experiment--max_duration)
     * [experiment ↠ filename](#experiment--filename)
     * [experiment ↠ project](#experiment--project)
+    * [experiment ↠ project_version](#experiment--project_version)
+    * [experiment ↠ author](#experiment--author)
+    * [experiment ↠ project_experiment](#experiment--project_experiment)
     * [experiment ↠ artifacts](#experiment--artifacts)
     * [experiment ↠ artifacts ↠ [label] ↠ bucket](#experiment--artifacts--label--bucket)
     * [experiment ↠ artifacts ↠ [label] ↠ credentials](#experiment--artifacts--label--credentials)

docs/metadata.md

@@ -204,7 +204,7 @@ tStamp = datetime.datetime.utcnow().replace(tzinfo=datetime.timezone.utc).isofor
 print('[{"op": "add", "path": "/studioml/log/-", "value": {"ts": "{0}", "msg:"Example log message"}}]', tStamp)
 ```
 
-It is of course tedious if you have to decorate every log entry with a time stamp so as a convineance the go runner does have an option which will auto decorate an standard output and standard error messages with json directives for inclusion in the MLOps logs, --schema-logs.  Standard practiuve for using this option is to include it in your deployment configuration as an environment variable.
+It is of course tedious if you have to decorate every log entry with a time stamp so as a convineance the go runner does have an option which will auto decorate an standard output and standard error messages with json directives for inclusion in the MLOps logs, --schema-logs.  Standard practice for using this option is to include it in your deployment configuration as an environment variable.
 
 # Storage platforms and query capabilities
 
@@ -293,7 +293,7 @@ For more information please see, https://docs.aws.amazon.com/athena/latest/ug/wo
 
 # LEAF UI and extensible MLOps lifecycle metadata
 
-The requirements of MLOps requires that high order, or metadata unrelated to the StudioML operations be also stored and made accessible to downstream tooling.
+The demands of MLOps requires that high order, or metadata unrelated to the StudioML operations be also stored and made accessible to downstream tooling.
 
 In order to do this additional S3 root keys are leveraged by the LEAF UI and LEAF servers, for example s3://karl-mutch-rmq/leaf.  The UI places additional json blobs into the bucket to represent LEAF level project and experiment metadata, this can be directly or via the mdserver.  The LEAF applications should define their own DDL schemas for this purpose.
 

go.mod

@@ -5,10 +5,10 @@ go 1.16
 require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/Masterminds/sprig/v3 v3.2.2
-	github.com/Rhymond/go-money v1.0.2
+	github.com/Rhymond/go-money v1.0.3
 	github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
 	github.com/awnumar/memguard v0.22.2
-	github.com/aws/aws-sdk-go v1.39.0
+	github.com/aws/aws-sdk-go v1.40.8
 	github.com/cenkalti/backoff/v4 v4.1.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.7.1
@@ -30,7 +30,7 @@ require (
 	github.com/karlmutch/base62 v0.0.0-20150408093626-b80cdc656a7a
 	github.com/karlmutch/ccache v2.0.3-0.20180726214243-573f5233780c+incompatible
 	github.com/karlmutch/circbuf v0.0.0-20150827004946-bbbad097214e
-	github.com/karlmutch/duat v0.0.0-20210225015104-bcfa908c74fb
+	github.com/karlmutch/duat v0.0.0-20210724203722-1478286d90ae
 	github.com/karlmutch/envflag v0.0.0-20210224011628-e09410f046e9
 	github.com/karlmutch/go-cache v2.0.0+incompatible
 	github.com/karlmutch/go-nvml v0.0.0-20200203202551-277366df5c37
@@ -41,7 +41,7 @@ require (
 	github.com/karlmutch/vtclean v0.0.0-20170504063817-d14193dfc626
 	github.com/karlseguin/expect v1.0.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
-	github.com/leaf-ai/go-service v0.0.0-20210524171939-49dd5f03976b
+	github.com/leaf-ai/go-service v0.0.0-20210710181027-310b9d21f861
 	github.com/lthibault/jitterbug v2.0.0+incompatible
 	github.com/makasim/amqpextra v0.16.4
 	github.com/mholt/archiver/v3 v3.5.0
@@ -52,7 +52,7 @@ require (
 	github.com/montanaflynn/stats v0.6.6 // indirect
 	github.com/odg0318/aws-ec2-price v0.0.0-20200327030318-88202a04e06d
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/otiai10/copy v1.2.0
+	github.com/otiai10/copy v1.6.0
 	github.com/prometheus/client_golang v1.10.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.23.0
@@ -69,9 +69,9 @@ require (
 	github.com/valyala/fastjson v1.6.3
 	github.com/ventu-io/go-shortid v0.0.0-20201117134242-e59966efd125 // indirect
 	go.opentelemetry.io/otel v0.16.0
-	go.uber.org/atomic v1.8.0
-	golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+	go.uber.org/atomic v1.9.0
+	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985
 	golang.org/x/term v0.0.0-20210422114643-f5beecf764ed // indirect
 	golang.org/x/tools v0.1.3 // indirect
 	google.golang.org/genproto v0.0.0-20210224155714-063164c882e6 // indirect

go.sum

@@ -87,8 +87,8 @@ github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/Rhymond/go-money v1.0.2 h1:KklB66H3VlpNMkm8T5BH/MROK88o7q9CCn1hl853TzI=
-github.com/Rhymond/go-money v1.0.2/go.mod h1:iHvCuIvitxu2JIlAlhF0g9jHqjRSr+rpdOs7Omqlupg=
+github.com/Rhymond/go-money v1.0.3 h1:uPv3ZrrV1s7Phzr3hG/3PeykYrlrKlyo0B29nxd/Fao=
+github.com/Rhymond/go-money v1.0.3/go.mod h1:iHvCuIvitxu2JIlAlhF0g9jHqjRSr+rpdOs7Omqlupg=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/sarama v1.27.2/go.mod h1:g5s5osgELxgM+Md9Qni9rzo7Rbt+vvFQI4bt/Mc93II=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
@@ -132,9 +132,9 @@ github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQ
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.35.20/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/aws/aws-sdk-go v1.37.18/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.38.45/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
-github.com/aws/aws-sdk-go v1.39.0 h1:74BBwkEmiqBbi2CGflEh34l0YNtIibTjZsibGarkNjo=
-github.com/aws/aws-sdk-go v1.39.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
+github.com/aws/aws-sdk-go v1.39.4/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
+github.com/aws/aws-sdk-go v1.40.8 h1:LBeBOKdgxaR1tknlENTBhcN8CjutpofbMJPtl/6Yug4=
+github.com/aws/aws-sdk-go v1.40.8/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/bcicen/jstream v1.0.1/go.mod h1:9ielPxqFry7Y4Tg3j4BfjPocfJ3TbsRtXOAYXYmRuAQ=
 github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
@@ -541,8 +541,8 @@ github.com/karlmutch/ccache v2.0.3-0.20180726214243-573f5233780c+incompatible/go
 github.com/karlmutch/circbuf v0.0.0-20150827004946-bbbad097214e h1:O6QxM8OviW1FrcByTAupWu326T5J+jH+M/CvwmOFcR8=
 github.com/karlmutch/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:Qt7npjuWnHIOc3fM6mHwpy6q3PpvWh2FV+gSzg51GMU=
 github.com/karlmutch/deepcopier v0.0.0-20171107155558-ca99b135e50f/go.mod h1:Esd/+GBZV8foU4qOhCuDu5CBjm3GkZUBo9QIs0vXRmI=
-github.com/karlmutch/duat v0.0.0-20210225015104-bcfa908c74fb h1:J2Vy/6Gyv9wNDlYJXDDo3NmJGVhmolr+jPQEqNoqnvA=
-github.com/karlmutch/duat v0.0.0-20210225015104-bcfa908c74fb/go.mod h1:vt/kL3JyInWos2o0pTJj5uIJyGOv7DF5ZPZkp1RmWRY=
+github.com/karlmutch/duat v0.0.0-20210724203722-1478286d90ae h1:ljgDbLgmFK+W3B0HRQbtLjUPfiJ61sWTDineyqoJisk=
+github.com/karlmutch/duat v0.0.0-20210724203722-1478286d90ae/go.mod h1:vt/kL3JyInWos2o0pTJj5uIJyGOv7DF5ZPZkp1RmWRY=
 github.com/karlmutch/durafmt v0.0.0-20180520121703-7b7ae1e72ead/go.mod h1:HWmuV2Z6ghHc3wGuQNhGG1jI9QqXZ1ZRfHRNG2l1jiE=
 github.com/karlmutch/envflag v0.0.0-20160830095501-ae3268980a29/go.mod h1:HCSJtRcU+YI1lWzCbrzb+9uAbwuAjGQ+g73Xznrnm/4=
 github.com/karlmutch/envflag v0.0.0-20210224011628-e09410f046e9 h1:8woJcp3LvepwYgcflpLf6UfE8kZqC/BIywDWPMXEv6g=
@@ -611,8 +611,8 @@ github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leaf-ai/go-service v0.0.0-20210524171939-49dd5f03976b h1:qeb3Dt+iLSTsYG4l1vEodtQGIlT/VDSUQfs+2vQ22S4=
-github.com/leaf-ai/go-service v0.0.0-20210524171939-49dd5f03976b/go.mod h1:jAo3rjz46CJPOIiVRF2aCY9HUXlCepbDFT8GveR8s4Y=
+github.com/leaf-ai/go-service v0.0.0-20210710181027-310b9d21f861 h1:SvEshFzX5ZaVx0/mVjpsHS/MHOAoenxNpCcZUlfQjmY=
+github.com/leaf-ai/go-service v0.0.0-20210710181027-310b9d21f861/go.mod h1:h3ruHBGJ7M8T2IztkXADnvbFZ1TwTjTejMs/fIpjtu0=
 github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
@@ -784,13 +784,13 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
-github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
+github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ=
+github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
 github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
-github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc=
-github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
+github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E=
+github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -879,7 +879,6 @@ github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAm
 github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil v3.21.4+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.6+incompatible h1:mmZtAlWSd8U2HeRTjswbnDLPxqsEoK01NK+GZ1P+nEM=
 github.com/shirou/gopsutil v3.21.6+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil/v3 v3.21.1/go.mod h1:igHnfak0qnw1biGeI2qKQvu0ZkwvEkUcCLlYhZzdr/4=
@@ -1016,9 +1015,9 @@ go.opentelemetry.io/otel/sdk v0.16.0/go.mod h1:Jb0B4wrxerxtBeapvstmAZvJGQmvah4dH
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4=
 go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
@@ -1057,8 +1056,8 @@ golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1143,9 +1142,9 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210521195947-fe42d452be8f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=