From a13dbd2e728e458a4bb110744f006c0277ca471f Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Tue, 21 Mar 2017 16:28:52 -0700 Subject: [PATCH 1/4] Update envoy and update configs --- src/envoy/mixer/envoy.conf.template | 6 +-- src/envoy/mixer/integration_test/envoy.conf | 6 +-- src/envoy/repositories.bzl | 52 ++++++++------------- 3 files changed, 25 insertions(+), 39 deletions(-) diff --git a/src/envoy/mixer/envoy.conf.template b/src/envoy/mixer/envoy.conf.template index 86aa0e1dc33..d11a1dc1c7f 100644 --- 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": [ { @@ -57,7 +57,7 @@ ] }, { - "port": 7070, + "address": "tcp://0.0.0.0:7070", "bind_to_port": true, "filters": [ { @@ -111,7 +111,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 index 2083d7f4e5a..ba2e2b37d04 100644 --- 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": [ { @@ -57,7 +57,7 @@ ] }, { - "port": 27070, + "address": "tcp://0.0.0.0:27070", "bind_to_port": true, "filters": [ { @@ -111,7 +111,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 index 5a74586ddc8..64a1cf667a7 100644 --- 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,7 +266,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "@lightstep_common_git//:collector_proto", - ":envoy_carrier_proto", + "@lightstep_common_git//:lightstep_carrier_proto", "//external:protobuf", ], )""" @@ -293,16 +274,21 @@ cc_library( 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", @@ -310,19 +296,20 @@ cc_proto_library( 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 = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded", 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, ) - From 50b7a169a7435a5bf5522466468871e0c283ca71 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 22 Mar 2017 13:51:39 -0700 Subject: [PATCH 2/4] Use gcc-4.9 for travis --- .travis.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 418e24d2dee..a42d700f744 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,21 @@ 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 @@ -16,11 +23,6 @@ jdk: env: - BAZEL_VERSION=0.4.3 -addons: - apt: - packages: - - wget - cache: directories: - $HOME/bazel/install @@ -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 From 75cdfcf5cf0f97f6a500b23ee74d514bdca3f76f Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 22 Mar 2017 14:55:31 -0700 Subject: [PATCH 3/4] Use bazel 0.4.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a42d700f744..b2c2e63a881 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ jdk: - oraclejdk8 env: - - BAZEL_VERSION=0.4.3 + - BAZEL_VERSION=0.4.5 cache: directories: From 50fecc6d639fb2e7a5514c48d2b76af07ed98104 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 22 Mar 2017 16:01:09 -0700 Subject: [PATCH 4/4] Fix SHA of lightstep-tracer-common --- src/envoy/repositories.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/envoy/repositories.bzl b/src/envoy/repositories.bzl index 64a1cf667a7..bb150928ba0 100644 --- a/src/envoy/repositories.bzl +++ b/src/envoy/repositories.bzl @@ -302,7 +302,7 @@ cc_proto_library( native.new_git_repository( name = "lightstep_common_git", remote = "https://github.com/lightstep/lightstep-tracer-common.git", - commit = "fe1f65f4a221746f9fffe8bf544c81d4e1b8aded", + commit = "cbbecd671c1ae1f20ae873c5da688c8c14d04ec3", build_file_content = COMMON_BUILD, )