Merge pull request #69 from instana/agent

Agent

.env

@@ -1,3 +1,3 @@
 # environment file for docker-compose
 REPO=robotshop
-TAG=2.0.2
+TAG=2.1.0

cart/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:14
 
 ENV INSTANA_AUTO_PROFILE true
 

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"
   }
 }

catalogue/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:14
 
 ENV INSTANA_AUTO_PROFILE true
 

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"
   }
 }

dispatch/Dockerfile

@@ -1,10 +1,10 @@
-FROM golang:1.14
+FROM golang:1.17
 
 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

dispatch/go.mod

@@ -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
-)

dispatch/go.sum

@@ -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=

docker-compose.yaml

@@ -12,13 +12,13 @@ services:
         max-size: "25m"
         max-file: "2"
   redis:
-    image: redis:4.0.6
+    image: redis:6.2-alpine
     networks:
       - robot-shop
     logging:
       <<: *logging
   rabbitmq:
-    image: rabbitmq:3.7-management-alpine
+    image: rabbitmq:3.8-management-alpine
     networks:
       - robot-shop
     logging:

load-gen/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.9
 
 # Some default values
 ENV HOST="http://localhost:8080/" \

mongo/Dockerfile

@@ -1,4 +1,4 @@
-FROM mongo:3.6.1
+FROM mongo:5
 
 COPY *.js /docker-entrypoint-initdb.d/
 

mysql/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql:5.7.30
+FROM mysql:5.7
 
 VOLUME /data
 

payment/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.9
 
 EXPOSE 8080
 USER root

user/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10
+FROM node:14
 
 ENV INSTANA_AUTO_PROFILE true
 

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"
   }
 }