Skip to content

Update envoy and update configs #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lizan merged 5 commits into from
Mar 22, 2017
Merged

Update envoy and update configs #195

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a13dbd2
Update envoy and update configs
lizan Mar 21, 2017
50b7a16
Use gcc-4.9 for travis
lizan Mar 22, 2017
33994e8
Merge remote-tracking branch 'upstream/master' into envoy_170321
lizan Mar 22, 2017
75cdfcf
Use bazel 0.4.5
lizan Mar 22, 2017
50fecc6
Fix SHA of lightstep-tracer-common
lizan Mar 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/envoy/mixer/envoy.conf.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"listeners": [
{
"port": ${PORT},
"address": "tcp://0.0.0.0:${PORT}",
"bind_to_port": true,
"filters": [
{
Expand Down Expand Up @@ -57,7 +57,7 @@
]
},
{
"port": 7070,
"address": "tcp://0.0.0.0:7070",
"bind_to_port": true,
"filters": [
{
Expand Down Expand Up @@ -111,7 +111,7 @@
],
"admin": {
"access_log_path": "/dev/stdout",
"port": 9001
"address": "tcp://0.0.0.0:9001"
},
"cluster_manager": {
"clusters": [
Expand Down
6 changes: 3 additions & 3 deletions src/envoy/mixer/integration_test/envoy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"listeners": [
{
"port": 29090,
"address": "tcp://0.0.0.0:29090",
"bind_to_port": true,
"filters": [
{
Expand Down Expand Up @@ -57,7 +57,7 @@
]
},
{
"port": 27070,
"address": "tcp://0.0.0.0:27070",
"bind_to_port": true,
"filters": [
{
Expand Down Expand Up @@ -111,7 +111,7 @@
],
"admin": {
"access_log_path": "/dev/stdout",
"port": 29001
"address": "tcp://0.0.0.0:29001"
},
"cluster_manager": {
"clusters": [
Expand Down
52 changes: 19 additions & 33 deletions src/envoy/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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",
Expand All @@ -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",
],
Expand All @@ -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 = "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,
)

Expand Down Expand Up @@ -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,
)