Update envoy and update configs (#195)

* Update envoy and update configs * Use gcc-4.9 for travis * Use bazel 0.4.5 * Fix SHA of lightstep-tracer-common
istio · Mar 22, 2017 · 61a53a4 · 61a53a4
1 parent d2bc18a
commit 61a53a4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 51 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,27 @@
 sudo: required
-dist: xenial
+
+dist: trusty
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.9
+    - g++-4.9
+    - wget
 
 branches:
   except:
   - stable
 
-lang: go
-
-go:
-  - 1.7.x
+language: cpp
 
 jdk:
   - oraclejdk8
 
 env:
-  - BAZEL_VERSION=0.4.3
-
-addons:
-  apt:
-    packages:
-      - wget
+  - BAZEL_VERSION=0.4.5
 
 cache:
   directories:
@@ -39,7 +41,7 @@ before_install:
 
 script:
   - script/check-style
-  - bazel --output_base=${HOME}/bazel/outbase test //...
+  - CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 bazel --output_base=${HOME}/bazel/outbase test //...
 
 notifications:
   slack: istio-dev:wEEEbaabdP5ieCgDOFetA9nX
diff --git a/src/envoy/mixer/envoy.conf.template b/src/envoy/mixer/envoy.conf.template
@@ -1,7 +1,7 @@
 {
   "listeners": [
     {
-      "port": ${PORT},
+      "address": "tcp://0.0.0.0:${PORT}",
       "bind_to_port": true,
       "filters": [
         {
@@ -58,7 +58,7 @@
       ]
     },
     {
-      "port": 7070,
+      "address": "tcp://0.0.0.0:7070",
       "bind_to_port": true,
       "filters": [
         {
@@ -112,7 +112,7 @@
   ],
   "admin": {
     "access_log_path": "/dev/stdout",
-    "port": 9001
+    "address": "tcp://0.0.0.0:9001"
   },
   "cluster_manager": {
     "clusters": [

diff --git a/src/envoy/mixer/integration_test/envoy.conf b/src/envoy/mixer/integration_test/envoy.conf
@@ -1,7 +1,7 @@
 {
   "listeners": [
     {
-      "port": 29090,
+      "address": "tcp://0.0.0.0:29090",
       "bind_to_port": true,
       "filters": [
         {
@@ -59,7 +59,7 @@
       ]
     },
     {
-      "port": 27070,
+      "address": "tcp://0.0.0.0:27070",
       "bind_to_port": true,
       "filters": [
         {
@@ -113,7 +113,7 @@
   ],
   "admin": {
     "access_log_path": "/dev/stdout",
-    "port": 29001
+    "address": "tcp://0.0.0.0:29001"
   },
   "cluster_manager": {
     "clusters": [

diff --git a/src/envoy/repositories.bzl b/src/envoy/repositories.bzl
@@ -235,25 +235,6 @@ def lightstep_repositories(bind=True):
     BUILD = """
 load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
-genrule(
-    name = "envoy_carrier_pb",
-    srcs = ["src/c++11/envoy/envoy_carrier.proto"],
-    outs = ["lightstep/envoy_carrier.proto"],
-    cmd = "cp $(SRCS) $@",
-)
-
-cc_proto_library(
-    name = "envoy_carrier_proto",
-    srcs = ["lightstep/envoy_carrier.proto"],
-    include = ".",
-    deps = [
-        "//external:cc_wkt_protos",
-    ],
-    protoc = "//external:protoc",
-    default_runtime = "//external:protobuf",
-    visibility = ["//visibility:public"],
-)
-
 cc_library(
     name = "lightstep_core",
     srcs = [
@@ -266,7 +247,7 @@ cc_library(
         "src/c++11/lightstep/impl.h",
         "src/c++11/lightstep/options.h",
         "src/c++11/lightstep/propagation.h",
-        "src/c++11/lightstep/envoy.h",
+        "src/c++11/lightstep/carrier.h",
         "src/c++11/lightstep/span.h",
         "src/c++11/lightstep/tracer.h",
         "src/c++11/lightstep/util.h",
@@ -275,7 +256,7 @@ cc_library(
         "src/c++11/mapbox_variant/variant.hpp",
     ],
     copts = [
-        "-DPACKAGE_VERSION='\\"0.19\\"'",
+        "-DPACKAGE_VERSION='\\"0.36\\"'",
         "-Iexternal/lightstep_git/src/c++11/lightstep",
         "-Iexternal/lightstep_git/src/c++11/mapbox_variant",
     ],
@@ -285,44 +266,50 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "@lightstep_common_git//:collector_proto",
-        ":envoy_carrier_proto",
+        "@lightstep_common_git//:lightstep_carrier_proto",
         "//external:protobuf",
     ],
 )"""
 
     COMMON_BUILD = """
 load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
-genrule(
-    name = "collector_pb",
+cc_proto_library(
+    name = "collector_proto",
     srcs = ["collector.proto"],
-    outs = ["lightstep/collector.proto"],
-    cmd = "cp $(SRCS) $@",
+    include = ".",
+    deps = [
+        "//external:cc_wkt_protos",
+    ],
+    protoc = "//external:protoc",
+    default_runtime = "//external:protobuf",
+    visibility = ["//visibility:public"],
 )
 
 cc_proto_library(
-    name = "collector_proto",
-    srcs = ["lightstep/collector.proto"],
+    name = "lightstep_carrier_proto",
+    srcs = ["lightstep_carrier.proto"],
     include = ".",
     deps = [
         "//external:cc_wkt_protos",
     ],
     protoc = "//external:protoc",
     default_runtime = "//external:protobuf",
     visibility = ["//visibility:public"],
-)"""
+)
+"""
 
     native.new_git_repository(
         name = "lightstep_common_git",
         remote = "https://github.com/lightstep/lightstep-tracer-common.git",
-        commit = "8d932f7f76cd286691e6179621d0012b0ff1e6aa",
+        commit = "cbbecd671c1ae1f20ae873c5da688c8c14d04ec3",
         build_file_content = COMMON_BUILD,
     )
 
     native.new_git_repository(
         name = "lightstep_git",
         remote = "https://github.com/lightstep/lightstep-tracer-cpp.git",
-        commit = "5a71d623cac17a059041b04fabca4ed86ffff7cc",
+        commit = "f1dc8f3dfd529350e053fd21273e627f409ae428", # 0.36
         build_file_content = BUILD,
     )
 
@@ -751,7 +738,6 @@ cc_test(
     native.new_git_repository(
         name = "envoy_git",
         remote = "https://github.com/lyft/envoy.git",
-        commit = "b72309da41fba0c1222a72262b83bedc7294df65", # Mar 13 2017
+        commit = "09f078b016da908ba8b861857f2a12a43933ba40", # Mar 21 2017
         build_file_content = BUILD,
     )
-