From 7316800e1f9ed24542d75f53a1336fcf058d81d6 Mon Sep 17 00:00:00 2001
From: Steve Waterworth <s@steveww.org>
Date: Tue, 31 Aug 2021 12:01:55 +0100
Subject: [PATCH] update agent versions

---
 .env                   |  2 +-
 cart/package.json      |  2 +-
 catalogue/package.json |  2 +-
 dispatch/Dockerfile    |  6 +++---
 dispatch/go.mod        |  8 --------
 dispatch/go.sum        | 25 -------------------------
 user/package.json      |  2 +-
 7 files changed, 7 insertions(+), 40 deletions(-)
 delete mode 100644 dispatch/go.mod
 delete mode 100644 dispatch/go.sum

diff --git a/.env b/.env
index 022a376..29e346e 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 # environment file for docker-compose
 REPO=robotshop
-TAG=2.0.2
+TAG=2.0.3
diff --git a/cart/package.json b/cart/package.json
index 3fe6c94..a5130d5 100644
--- a/cart/package.json
+++ b/cart/package.json
@@ -16,7 +16,7 @@
       "pino": "^5.10.8",
       "express-pino-logger": "^4.0.0",
       "pino-pretty": "^2.5.0",
-      "@instana/collector": "^1.98.1",
+      "@instana/collector": "^1.132.2",
       "prom-client": "^11.5.3"
   }
 }
diff --git a/catalogue/package.json b/catalogue/package.json
index e5726ca..3f7ec5c 100644
--- a/catalogue/package.json
+++ b/catalogue/package.json
@@ -15,6 +15,6 @@
       "pino": "^5.10.8",
       "express-pino-logger": "^4.0.0",
       "pino-pretty": "^2.5.0",
-      "@instana/collector": "^1.98.1"
+      "@instana/collector": "^1.132.2"
   }
 }
diff --git a/dispatch/Dockerfile b/dispatch/Dockerfile
index f134dbf..c3f1a9d 100644
--- a/dispatch/Dockerfile
+++ b/dispatch/Dockerfile
@@ -2,9 +2,9 @@ FROM golang:1.14
 
 WORKDIR /go/src/app
 
-COPY . .
+COPY *.go .
 
-RUN go get -d -v ./...
-RUN go install -v ./...
+RUN go mod init dispatch && go get
+RUN go install
 
 CMD dispatch
diff --git a/dispatch/go.mod b/dispatch/go.mod
deleted file mode 100644
index 817f67c..0000000
--- a/dispatch/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module github.com/instana/robot-shop/dispatch
-
-go 1.14
-
-require (
-	github.com/instana/go-sensor v1.13.1 // indirect
-	github.com/streadway/amqp v1.0.0 // indirect
-)
diff --git a/dispatch/go.sum b/dispatch/go.sum
deleted file mode 100644
index 5d935ea..0000000
--- a/dispatch/go.sum
+++ /dev/null
@@ -1,25 +0,0 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/instana/go-sensor v1.13.1 h1:9txDn4B9s2sSRDe30WZs5jxK/Isdk56w/AOxIIa/vRo=
-github.com/instana/go-sensor v1.13.1/go.mod h1:lDfZvfAyo5DWJ2AvOHINRTUTG5TMdZNnwXXcFRtfZBE=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/looplab/fsm v0.1.0 h1:Qte7Zdn/5hBNbXzP7yxVU4OIFHWXBovyTT2LaBTyC20=
-github.com/looplab/fsm v0.1.0/go.mod h1:m2VaOfDHxqXBBMgc26m6yUOwkFn8H2AlJDE+jd/uafI=
-github.com/opentracing/basictracer-go v1.0.0 h1:YyUAhaEfjoWXclZVJ9sGoNct7j4TVk7lZWlQw5UXuoo=
-github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
-github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
-github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/user/package.json b/user/package.json
index 723dccd..023f7e8 100644
--- a/user/package.json
+++ b/user/package.json
@@ -16,6 +16,6 @@
       "pino": "^5.10.8",
       "express-pino-logger": "^4.0.0",
       "pino-pretty": "^2.5.0",
-      "@instana/collector": "^1.98.1"
+      "@instana/collector": "^1.132.2"
   }
 }