Commit graph

399 commits

Author SHA1 Message Date
Ahmet Alp Balkan
02b2018b0e
recommendationservice: compile deps from requirements.in (#135)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2019-01-30 00:24:07 -08:00
Megan O'Keefe
1d045de655 productcatalog: introduce configurable latency (#134) 2019-01-29 16:08:24 -08:00
Ahmet Alp Balkan
3da0ae3b31
hack: polish scripts (#133)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2019-01-29 14:05:37 -08:00
Megan O'Keefe
1d452f449a Adds make-release script, static k8s manifests (#132)
Closes #75.  

### Changelog 

Adds 4 scripts to the `hack/` directory for building/pushing images, injecting images tags into static manifests, and tagging new releases. See [hack/README.md](https://github.com/m-okeefe/microservices-demo/tree/release-script/hack). 

**Note**: since we have not pushed images yet, the images in the `./release/` manifests are still set to the skaffold defaults (eg. `adservice`).
2019-01-29 11:23:33 -08:00
Ahmet Alp Balkan
ea424cb9f7
add skaffold version note
Fixes #127
2019-01-22 12:30:30 -08:00
rghetia
3812cf741d fix typo in Stackdriver init method name. (#130) 2019-01-22 10:37:03 -08:00
sebright
2ef073f600 adservice: Add "time" field to JSON log entries. (#129)
The Log4j JsonLayout puts the log entry timestamp in a field named "instant" by
default, but the Stackdriver Logging agent does not understand that field.  The
logging agent instead uses the time that it received the log entry, which is
less accurate and has only second-level precision.

This commit adds a key-value pair to the JsonLayout pattern that can be
understood by the logging agent.  It uses a "time" key as described in
https://cloud.google.com/logging/docs/agent/configuration#timestamp-processing
and formats the timestamp as described in the Protocol Buffer JSON mapping,
https://developers.google.com/protocol-buffers/docs/proto3#json.

Allowing the Stackdriver Logging agent to read the more accurate timestamps
inserted by Log4j is especially important in the adservice, because the logs are
correlated with traces, and it is important to see where each message was logged
on the timeline of the trace.
2019-01-22 09:56:50 -08:00
rghetia
54f0a8d058 add jaeger support for productcatalog and shipping. (#126) 2019-01-22 09:56:39 -08:00
Ahmet Alp Balkan
10dfd04ab1
README: use GKE add-on for Istio instructions (#121)
I also edited some irrelevant parts of the file, don't mind those.

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2019-01-15 10:14:33 -08:00
Ahmet Alp Balkan
8deb49e5ec
Update README.md 2019-01-14 14:42:13 -08:00
Oussema CHERNI
dcdd657d82 Fix broken doc link (#122) 2019-01-14 08:12:52 -08:00
Dave Stanke
791a2822ad Update skaffold to v0.20.0 (to support newer skaffold config) (#123) 2019-01-14 08:11:18 -08:00
Dustin Ingram
aaf2f8717d Simplify package management for python services (#120)
This PR does a few things:

1. **Removes unnecessary Python dependencies currently being installed for `emailservice`**

    There are quite a few packages being installed that aren't actual dependencies.

2. **Removes a number of related, also unnecessary system-level dependencies for `emailservice`**

    These were a result of the Python dependencies that are unnecessary.

3. **Pins all of the sub-dependencies for `loadgenerator`**

    This is good practice to ensure that things don't break one day in the future when a newer version of an unpinned sub-dependenency is released.

4. **Compile all Python dependencies from `requirements.in` files**

    This is mostly bookkeeping. It allows us to only specify the top-level dependencies we care about in the requirements.in files, which are then compiled to frozen dependencies in the requirements.txt files. This ensures that we only install the dependencies we need, and that we're not missing any unpinned sub-dependencies. It also makes it more clear where our sub-dependencies are coming from.

5. **Switch to -slim images from -alpine**

    Python's built distribution format (wheel) is incompatible with alpine-based images, causing dependencies like `grpcio` to be compiled from scratch, rather than from a pre-built wheel.

    This should improve or possibly fi​x #58, while keeping the image size roughly the same:

    ```
    emailservice          latest           d1b818eabe05        6 seconds ago       286MB
    loadgenerator         latest           4d9b5acbfbbb        6 seconds ago       125MB
    ```
2019-01-11 14:59:27 -08:00
Ahmet Alp Balkan
823e993104
update skaffold manifest to clear warnings (#117)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2019-01-10 10:35:17 -08:00
rghetia
2b074f7ff3
Add jaeger export to checkoutservice. (#116)
* Add jaeger export to checkoutservice.

* fix review comments.
2019-01-10 10:25:07 -08:00
rghetia
33ca3b63d8
Unify jaeger enabling method for adservice. (#115) 2019-01-09 05:42:54 -08:00
rghetia
85c7131d43 Add jaeger support for frontend. (#113) 2019-01-08 11:08:20 -08:00
Ahmet Alp Balkan
27e1b03c26
Add conference videos 2019-01-08 10:51:36 -08:00
rghetia
d944092100 Add Jaeger support for Adservice. (#111)
This is the first service that exports to jaeger. Others to follow.
Requires jaeger to be instantiated using 

- helm install --name jaeger stable/jaeger-operator
- kubectl apply -f jaeger.yaml

=== jaeger.yaml Content ===
apiVersion: io.jaegertracing/v1alpha1
kind: Jaeger
metadata:
  name: jaeger

Above steps will be added to README in subsequent PR.
2019-01-03 12:56:06 -08:00
Ahmet Alp Balkan
94ed247c0b
Update README.md 2019-01-03 11:25:03 -08:00
Ahmet Alp Balkan
90e43a8744
move img/ to docs/img (#110)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2019-01-02 13:34:01 -08:00
charlesbaer
d966bc7c5d Minor update to README.md (#104)
Added the --region to gcloud container clusters create
2018-12-18 10:06:19 -08:00
Théo Chamley
c91dca764f Toggle bug in ProductCatalogService for demos (#85)
Fixes #84.
2018-12-17 11:06:49 -08:00
Chris Kleinknecht
5272a4d821 Re-enable opencensus python (#103)
Enables tracing in the email and recommendation services, which was disabled in 316db88 because of a memory leak in the stackdriver exporter.

We fixed the leak in https://github.com/googleapis/google-cloud-python/pull/6856. The fix is included in the [0.1.10 release of opencensus-python](https://github.com/census-instrumentation/opencensus-python/releases/tag/v0.1.10).

With this diff, traces show up as expected in stackdriver while running the demo on GKE. Using an `opencensus-python` package version before `0.1.10` causes the email and recommendation services to leak memory until they OOM. Memory use is back to normal (i.e. roughly constant) using the new package version.
2018-12-11 16:15:51 -08:00
Dave Stanke
cb241e197d Clarify description of cloudbuild.yaml (#102) 2018-12-03 14:59:18 -08:00
Dave Stanke
8dabe7ff94 remove gcr repo name from images (#98)
This removes hardcoded GCP project name from images and requires an explicit repository flag to skaffold. Also updating the cloudbuild.yaml for staging with the gcr.io/k8s-skaffold/skaffold image.

Fixes #17.
2018-12-03 14:19:12 -08:00
rghetia
d69f1a4f25 increase reporting interval. (#96)
also fixed a bug in SD export registration in Ads.
2018-11-14 11:49:17 -08:00
Ahmet Alp Balkan
424692befa
upgrade skaffold to 0.18 (#97)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-11-14 11:21:23 -08:00
Ahmet Alp Balkan
8b5d64b61f
README: add disk space + IP troubleshooting (#95)
fixes #94

Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-11-07 14:52:31 -08:00
Ahmet Alp Balkan
547cbc1213
support skaffold 0.17
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-11-05 16:09:19 -08:00
sebright
b221f61f4f adservice: upgrade opencensus-java to 0.17.0. (#93)
0.17.0 is the first stable version of opencensus-contrib-log-correlation-log4j2.
This commit also updates log4j2.xml to work with the new version.
2018-11-05 09:45:34 -08:00
davidstanke
9b055cabfb update requests package (#92) 2018-10-29 20:39:44 -07:00
Romain Vrignaud
52a9d346f6 Adservice: Add libc6-compat runtime dependency (#90)
Fixes #89
2018-10-29 09:57:43 -07:00
Colin Nelson
a79a443892 Ignore .vs (#86)
Fixes #83
2018-10-23 14:44:29 -07:00
Ahmet Alp Balkan
781b6df8a0
Update README.md 2018-10-22 10:03:38 -07:00
Ahmet Alp Balkan
73ebd4debb
use stock gcb image for skaffold (#81)
cc: @davidstanke
2018-10-17 15:15:28 -07:00
davidstanke
a815e029ab Add GCB cloudbuild.yaml config for CD to staging (#79) 2018-10-16 13:25:57 -07:00
Ahmet Alp Balkan
51da4930ae
Fix build for skaffold 0.16 (#77)
Closes #76.
2018-10-15 09:03:28 -07:00
Ahmet Alp Balkan
3b6d3864a0
grpc: bump health-probe to v0.2.0 (#71)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-10-09 15:54:55 -07:00
Ahmet Alp Balkan
dd0e26806d
README: add istio mTLS instructions (#73)
Signed-off-by: Ahmet Alp Balkan <ahmetb@google.com>
2018-10-09 11:50:14 -07:00
Ahmet Alp Balkan
c6b825f846
Run skaffold fix (#72)
Upgrade skaffold version + manifest.
2018-10-09 10:52:47 -07:00
Colin Nelson
34227a64a6 currencyservice: Optimized Docker image with multi stage builds, and using alpine as a base image. (#70) 2018-10-09 10:43:06 -07:00
Colin Nelson
571285d9aa Optimized adservice Image Size (#67)
* adservice: Reduced docker image size to ~165MB
(down from ~886MB) by switching to alpine and
using multi stage builds

* adservice: Changed install of glibc in builder to not require untrusted packages

* adservice: Refactored Dockerfile to be a multi stage build. The 'build' step runs from openjdk:8-slim, but the final image is alpine based. We can get away from this since java runs in a vm & the architecture of the images doesn't change between biuld steps
2018-10-09 10:42:49 -07:00
Yoshi Yamaguchi
7f40378ecc log: change log format to JSON payload for better log in Stackdriver (#66)
change the log format in Python and Node.js services.

Effected services are currencyservice, emailservice, paymentservice,
and recommendationservice. Loadgenerator is left as is because of
the diffculty to change the log format and log target in locust.

ref. #47
2018-10-05 11:23:45 -07:00
Ahmet Alp Balkan
2771a03727
k8s: start using grpc health check for cartservice (#63) 2018-10-01 23:20:42 -07:00
sebright
848d4bbe90 adservice: enable structured logging and OpenCensus log correlation (#59)
This commit enables OpenCensus log correlation using
opencensus-contrib-log-correlation-log4j2
(https://github.com/census-instrumentation/opencensus-java/tree/master/contrib/log_correlation/log4j2).
The library inserts the trace ID, span ID, and sampling decision into every
Log4j log event.  This commit includes other changes to make the tracing data
available in the logs, in a format that can be interpreted by the Stackdriver
Logging agent:

- Convert all adservice log statements from java.util.logging to Log4j.

- Specify a JSON format for Log4j output.  This is related to issue #47.

- Add the trace ID, span ID, and sampling decision to the JSON format.  Trace
  ID and span ID use special keys that the Stackdriver Logging agent uses to
  populate the tracing data fields in the LogEntry uploaded to Stackdriver
  (https://cloud.google.com/logging/docs/agent/configuration#special_fields_in_structured_payloads).
  However, Stackdriver won't be able to link the traces and log entries until
  fluent-plugin-google-cloud can automatically format the trace ID with the
  format expected by Stackdriver
  (https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud/issues/239,
  https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud/pull/260).

This commit also upgrades OpenCensus to 0.16.1 in order to use
opencensus-contrib-log-correlation-log4j2.
2018-10-01 22:45:09 -07:00
sebright
dc7effd601 adservice: find relevant ads by category (#61)
The ad service now returns ads matching the categories of the product that is
currently displayed.  Changes in this commit:

- List all products' categories in products.json.

- Pass the current product's categories from the frontend to the ad service when
  looking up ads.

- Store a statically initialized multimap from product category to ad in the ad
  service.

- Return all ads matching the given categories when handling an ads request.
  The ad service continues to return random ads when no categories are given or
  no ads match the categories.
2018-10-01 22:44:56 -07:00
sebright
86c8c06cc1 pb: add "categories" field to Product (#60)
This field can be used as the context keys to look up relevant ads in the ad
service.

/cc @rghetia 

I also ran the genproto.sh scripts for the Java and Go services and included those changes in the second commit.  I encountered an issue when I ran genproto.sh for the recommendation service, and I'm still looking into it.
2018-10-01 21:33:25 -07:00
Ahmet Alp Balkan
34f8fb18aa
Add development principles (#56) 2018-09-30 16:49:08 -07:00
Ahmet Alp Balkan
be65dd1fcd
cartservice: fix health Check() method signature (#57)
- Use the method provided in HealthBase
- Use the same version of GrpcHealth as Grpc core.

Fixes #50.
2018-09-28 12:52:06 -07:00