(big segments #1) add basic big segments configuration for SDK clients (

#237)
launchdarkly · Apr 9, 2021 · 9a89ffb · 9a89ffb
1 parent 0ab1b8c
commit 9a89ffb
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 55 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -181,6 +181,10 @@ jobs:
       - run: |
           mkdir -p $CIRCLE_TEST_REPORTS
           mkdir -p $CIRCLE_ARTIFACTS
+      - run:
+          name: (TEMPORARY FOR FEATURE BRANCH) copy SSH configuration for getting prerelease dependencies
+          command: |
+            cp -r $HOME/.ssh temp_ssh
       - run:
           name: Run integration tests
           command: LD_API_TOKEN=`echo $<<parameters.ld_api_token_env_var>>` make integration-test | tee $CIRCLE_ARTIFACTS/report.txt
@@ -220,6 +224,10 @@ jobs:
       - setup_remote_docker  # start docker engine
       - run: sudo apt-get update
       - run: sudo apt-get install rpm
+      - run:
+          name: (TEMPORARY FOR FEATURE BRANCH) copy SSH configuration for getting prerelease dependencies
+          command: |
+            cp -r $HOME/.ssh temp_ssh
       - run: make release
       - run: make docker-smoke-test
       - store_artifacts:

diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,6 @@ build
 .vscode
 _testservice/testservice
 _testservice/*.pid
+
+temp_feature_branch_git_ssh_key
+temp_feature_branch_git_ssh_key.pub
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,8 @@ FROM golang:1.15.2-alpine as builder
 
 RUN apk --no-cache add \
     libc-dev \
+    # TEMPORARY FOR FEATURE BRANCH: we need to include git in order to use prerelease dependencies
+    git openssh-client \
  && rm -rf /var/cache/apk/*
 
 ARG SRC_DIR=/go/ld-relay
@@ -18,6 +20,13 @@ ENV CGO_ENABLED=0
 ENV GOOS=linux
 ENV GOPATH=/go
 
+# TEMPORARY FOR FEATURE BRANCH: allow fetching of prerelease dependencies - the SSH configuration
+# will be copied into the project directly by the CI script
+RUN mv temp_ssh ~/.ssh
+RUN chmod 400 ~/.ssh/id_rsa*
+RUN git config --global [email protected]:.insteadOf https://github.com/
+ENV GOPRIVATE=github.com/launchdarkly/*-private
+
 RUN go build -a -o ldr .
 
 FROM alpine:3.12.0

diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ build:
 	go build .
 
 test:
-	go test -run=not-a-real-test, -tags $(ALL_TEST_TAGS) ./...  # just ensures that the tests compile
+	go test -run=not-a-real-test -tags $(ALL_TEST_TAGS) ./...  # just ensures that the tests compile
 	go test -race -v $(OPTIONAL_TAGS_PARAM) ./...
 
 test-coverage: $(COVERAGE_PROFILE_RAW)
@@ -46,7 +46,7 @@ benchmarks: build
 
 $(COVERAGE_PROFILE_RAW): $(ALL_SOURCES)
 	@mkdir -p ./build
-	go test -run=not-a-real-test, -tags $(ALL_TEST_TAGS) ./...  # just ensures that the tests compile
+	go test -run=not-a-real-test -tags $(ALL_TEST_TAGS) ./...  # just ensures that the tests compile
 	go test $(OPTIONAL_TAGS_PARAM) -coverprofile $(COVERAGE_PROFILE_RAW) -coverpkg=./... ./...
 
 $(LINTER_VERSION_FILE):

diff --git a/go.mod b/go.mod
@@ -19,12 +19,12 @@ require (
 	github.com/hashicorp/consul/api v1.5.0
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0
-	github.com/launchdarkly/api-client-go v3.7.0+incompatible
+	github.com/launchdarkly/api-client-go v5.0.2+incompatible
 	github.com/launchdarkly/eventsource v1.6.2
 	github.com/launchdarkly/go-configtypes v1.1.0
 	github.com/launchdarkly/go-server-sdk-consul v1.0.0
 	github.com/launchdarkly/go-server-sdk-dynamodb v1.0.1
-	github.com/launchdarkly/go-server-sdk-redis-redigo v1.0.0
+	github.com/launchdarkly/go-server-sdk-redis-redigo v1.0.1-0.20210330003600-50e820610b2b
 	github.com/launchdarkly/go-test-helpers/v2 v2.2.0
 	github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c
 	github.com/philhofer/fwd v1.0.0 // indirect
@@ -35,9 +35,15 @@ require (
 	gopkg.in/DataDog/dd-trace-go.v1 v1.16.1 // indirect
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/launchdarkly/go-jsonstream.v1 v1.0.0
-	gopkg.in/launchdarkly/go-sdk-common.v2 v2.2.2
+	gopkg.in/launchdarkly/go-sdk-common.v2 v2.3.0
 	gopkg.in/launchdarkly/go-sdk-events.v1 v1.1.0
-	gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 v1.1.1
-	gopkg.in/launchdarkly/go-server-sdk.v5 v5.1.4
+	gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 v1.2.0
+	gopkg.in/launchdarkly/go-server-sdk.v5 v5.3.0
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )
+
+replace gopkg.in/launchdarkly/go-server-sdk.v5 => github.com/launchdarkly/go-server-sdk-private/v5 v5.2.2-0.20210326211533-83aa5606d774
+
+replace gopkg.in/launchdarkly/go-sdk-common.v2 => github.com/launchdarkly/go-sdk-common-private/v2 v2.2.3-0.20210323175925-2f53ef23e94c
+
+replace gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 => github.com/launchdarkly/go-server-sdk-evaluation-private v1.2.1-0.20210323201644-112b8c0df0c7
diff --git a/go.sum b/go.sum
@@ -35,7 +35,6 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
 github.com/go-redis/redis/v8 v8.8.0 h1:fDZP58UN/1RD3DjtTXP/fFZ04TFohSYhjZDkcDe2dnw=
 github.com/go-redis/redis/v8 v8.8.0/go.mod h1:F7resOH5Kdug49Otu24RjHWwgK7u9AmtqWMnCV1iP5Y=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
@@ -59,6 +58,7 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -112,16 +112,18 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0 h1:YnZmFjg0Nvk8851WTVWlqMC1ecJH07Ctz+Ezxx4u54g=
 github.com/kardianos/minwinsvc v0.0.0-20151122163309-cad6b2b879b0/go.mod h1:rUi0/YffDo1oXBOGn1KRq7Fr07LX48XEBecQnmwjsAo=
+github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003 h1:vJ0Snvo+SLMY72r5J4sEfkuE7AFbixEP2qRbEcum/wA=
+github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003/go.mod h1:zNBxMY8P21owkeogJELCLeHIt+voOSduHYTFUbwRAV8=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/launchdarkly/api-client-go v3.7.0+incompatible h1:RW/1xvKbnPTngkdZNJV/2+Or4ABpOtQgiYfF89k5tWE=
-github.com/launchdarkly/api-client-go v3.7.0+incompatible/go.mod h1:INGa7NUZYSwVozwPV7l6ikgD7pzSOpZvg9I5sqCZIWs=
-github.com/launchdarkly/eventsource v1.4.3 h1:G0s/nlctuI6Vz/BKpNLE2L/S4U0lQ/ghYqecPjUuQIA=
-github.com/launchdarkly/eventsource v1.4.3/go.mod h1:LHxSeb4OnqznNZxCSXbFghxS/CjIQfzHovNoAqbO/Wk=
+github.com/launchdarkly/api-client-go v5.0.2+incompatible h1:qH1B/UL7IphXTo1gEoCJP/UIbD6ujbV0taSZujttNJw=
+github.com/launchdarkly/api-client-go v5.0.2+incompatible/go.mod h1:INGa7NUZYSwVozwPV7l6ikgD7pzSOpZvg9I5sqCZIWs=
+github.com/launchdarkly/ccache v1.1.0 h1:voD1M+ZJXR3MREOKtBwgTF9hYHl1jg+vFKS/+VAkR2k=
+github.com/launchdarkly/ccache v1.1.0/go.mod h1:TlxzrlnzvYeXiLHmesMuvoZetu4Z97cV1SsdqqBJi1Q=
 github.com/launchdarkly/eventsource v1.6.2 h1:5SbcIqzUomn+/zmJDrkb4LYw7ryoKFzH/0TbR0/3Bdg=
 github.com/launchdarkly/eventsource v1.6.2/go.mod h1:LHxSeb4OnqznNZxCSXbFghxS/CjIQfzHovNoAqbO/Wk=
 github.com/launchdarkly/go-configtypes v1.1.0 h1:Qsp/q607eXPJqUcQdSdAs0+vDG+luqVCmenS9a302EI=
@@ -130,16 +132,20 @@ github.com/launchdarkly/go-ntlm-proxy-auth v1.0.1 h1:Iz5cg9mB/0vt5llZE+J0iGQ5+O/
 github.com/launchdarkly/go-ntlm-proxy-auth v1.0.1/go.mod h1:hKWfH/hga5oslM2mRkDZi+14u2h1dFsmgbvSM9qF8pk=
 github.com/launchdarkly/go-ntlmssp v1.0.1 h1:snB77118TQvf9tfHrkSyrIop/UX5e5VD2D2mv7Kh3wE=
 github.com/launchdarkly/go-ntlmssp v1.0.1/go.mod h1:/cq3t2JyALD7GdVF5BEWcEuGlIGa44FZ4v4CVk7vuCY=
-github.com/launchdarkly/go-semver v1.0.1 h1:Wc6ncGCq1RGDsJhedDLlzMNWQooCc5I4FwLoDiQKcvU=
-github.com/launchdarkly/go-semver v1.0.1/go.mod h1:xFmMwXba5Mb+3h72Z+VeSs9ahCvKo2QFUTHRNHVqR28=
+github.com/launchdarkly/go-sdk-common-private/v2 v2.2.3-0.20210323175925-2f53ef23e94c h1:TITiCfbEiVy8R+qy0QRZeTeuQGKfUTsQsBqtjLSL7ew=
+github.com/launchdarkly/go-sdk-common-private/v2 v2.2.3-0.20210323175925-2f53ef23e94c/go.mod h1:Fht0iTasUXh2xiDA8IJSmlSGbyQ1GNpmt97lXYz6+p8=
 github.com/launchdarkly/go-semver v1.0.2 h1:sYVRnuKyvxlmQCnCUyDkAhtmzSFRoX6rG2Xa21Mhg+w=
 github.com/launchdarkly/go-semver v1.0.2/go.mod h1:xFmMwXba5Mb+3h72Z+VeSs9ahCvKo2QFUTHRNHVqR28=
 github.com/launchdarkly/go-server-sdk-consul v1.0.0 h1:8yTFRUA9RsQVrSOyN4S3zDGWHxo1s9iYyQ5eSVkxFfU=
 github.com/launchdarkly/go-server-sdk-consul v1.0.0/go.mod h1:Uj+H4Wm3WEja1rdi+nR2Jq6fpl7dG9gtTgOAxjJV9SI=
 github.com/launchdarkly/go-server-sdk-dynamodb v1.0.1 h1:1XRvQ1hatstHxn9xW+f6j+WA2+CtISqo5/nlVUMRshY=
 github.com/launchdarkly/go-server-sdk-dynamodb v1.0.1/go.mod h1:PFfobKcvmYPDA7WiV+LYEUbQaetdztz4q/vB4l8MOp0=
-github.com/launchdarkly/go-server-sdk-redis-redigo v1.0.0 h1:mjGqhHFeUwIE6grBXtlaZzFSgHi1I32cpPMxN3exZSg=
-github.com/launchdarkly/go-server-sdk-redis-redigo v1.0.0/go.mod h1:Va1WsiGjA9iQ++pJn8GYpDhjhdDW3u46gGpXxaPyNTk=
+github.com/launchdarkly/go-server-sdk-evaluation-private v1.2.1-0.20210323201644-112b8c0df0c7 h1:PZu2xsvBGVKPZ0DxKBHWNLMq3moGpdzLaube+nYTseU=
+github.com/launchdarkly/go-server-sdk-evaluation-private v1.2.1-0.20210323201644-112b8c0df0c7/go.mod h1:RDJXXpuEph/S3VeO50Z88d/fvMFXeraJxq/eF6ruueY=
+github.com/launchdarkly/go-server-sdk-private/v5 v5.2.2-0.20210326211533-83aa5606d774 h1:c59dKSFNQkTmJm25yEwNUP/hRJWO1sIFVQLXOx4tLUg=
+github.com/launchdarkly/go-server-sdk-private/v5 v5.2.2-0.20210326211533-83aa5606d774/go.mod h1:WCz3rQrIC30Mk0Ye9oR4uniAiOFddWveY0o4Dur0GLU=
+github.com/launchdarkly/go-server-sdk-redis-redigo v1.0.1-0.20210330003600-50e820610b2b h1:gEuEBDesP/HYs+wtg5DfYYhlE56rhHiWyJu6OXJEkG8=
+github.com/launchdarkly/go-server-sdk-redis-redigo v1.0.1-0.20210330003600-50e820610b2b/go.mod h1:aDdaEN0aizvtsArL65E6cWGYIFeZnCDiGCdNXnygK24=
 github.com/launchdarkly/go-test-helpers/v2 v2.2.0 h1:L3kGILP/6ewikhzhdNkHy1b5y4zs50LueWenVF0sBbs=
 github.com/launchdarkly/go-test-helpers/v2 v2.2.0/go.mod h1:L7+th5govYp5oKU9iN7To5PgznBuIjBPn+ejqKR0avw=
 github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
@@ -166,12 +172,15 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
 github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c h1:Lgl0gzECD8GnQ5QCWA8o6BtfL6mDH5rQgM4/fX3avOs=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -213,13 +222,16 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tinylib/msgp v1.0.2 h1:DfdQrzQa7Yh2es9SuLkixqxuXS2SxsdYn0KbdrOGWD8=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
+github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 h1:3UeQBvD0TFrlVjOeLOBz+CPAI8dnbqNSVwUwRrkp7vQ=
+github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0/go.mod h1:IXCdmsXIht47RaVFLEdVnh1t+pgYtTAhQGj73kz+2DM=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opentelemetry.io/otel v0.19.0 h1:Lenfy7QHRXPZVsw/12CWpxX6d/JkrX8wrx2vO8G80Ng=
 go.opentelemetry.io/otel v0.19.0/go.mod h1:j9bF567N9EfomkSidSfmMwIwIBuP37AMAIzVW85OxSg=
 go.opentelemetry.io/otel/metric v0.19.0 h1:dtZ1Ju44gkJkYvo+3qGqVXmf88tc+a42edOywypengg=
 go.opentelemetry.io/otel/metric v0.19.0/go.mod h1:8f9fglJPRnXuskQmKpnad31lcLJ2VmNNqIsx/uIwBSc=
+go.opentelemetry.io/otel/oteltest v0.19.0 h1:YVfA0ByROYqTwOxqHVZYZExzEpfZor+MU1rU+ip2v9Q=
 go.opentelemetry.io/otel/oteltest v0.19.0/go.mod h1:tI4yxwh8U21v7JD6R3BcA/2+RBoTKFexE/PJ/nSO7IA=
 go.opentelemetry.io/otel/trace v0.19.0 h1:1ucYlenXIDA1OlHVLDZKX0ObXV5RLaq06DtUKz5e5zc=
 go.opentelemetry.io/otel/trace v0.19.0/go.mod h1:4IXiNextNOpPnRlI4ryK69mn5iC84bjBWZQA5DXz/qg=
@@ -304,6 +316,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20180717000714-0025a57598c0 h1:H82u+VsvfY63/uydrxjj2DpwjFvroE43qWaIzpa2Xik=
 google.golang.org/api v0.0.0-20180717000714-0025a57598c0/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -334,26 +347,11 @@ gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 gopkg.in/ghodss/yaml.v1 v1.0.0/go.mod h1:HDvRMPQLqycKPs9nWLuzZWxsxRzISLCRORiDpBUOMqg=
 gopkg.in/launchdarkly/go-jsonstream.v1 v1.0.0 h1:YI6AtOY2+Q9pSdCWO99TnenKPzmpZftV/RFdsIJTw/I=
 gopkg.in/launchdarkly/go-jsonstream.v1 v1.0.0/go.mod h1:YefdBjfITIP8D9BJLVbssFctHkJnQXhv+TiRdTV0Jr4=
-gopkg.in/launchdarkly/go-sdk-common.v2 v2.0.0 h1:cmzeGvm90d3RSxgNWLYVQ1jQ+aEngmkzXYatnTZJ+Qc=
-gopkg.in/launchdarkly/go-sdk-common.v2 v2.0.0/go.mod h1:4l1+/AtknK5Sx6YTO9XDqrCbAXj8FgwpI2U/x6ZBIM4=
-gopkg.in/launchdarkly/go-sdk-common.v2 v2.2.0 h1:nWMK2pZJ+mHuOMtbBRYu8yfxPBwRgtn3XOg1xqmMIbY=
-gopkg.in/launchdarkly/go-sdk-common.v2 v2.2.0/go.mod h1:Fht0iTasUXh2xiDA8IJSmlSGbyQ1GNpmt97lXYz6+p8=
-gopkg.in/launchdarkly/go-sdk-common.v2 v2.2.2 h1:1b+/daNegovIsEkG5KmVnXC/sWG7jNlH/fV4O1R9UKs=
-gopkg.in/launchdarkly/go-sdk-common.v2 v2.2.2/go.mod h1:Fht0iTasUXh2xiDA8IJSmlSGbyQ1GNpmt97lXYz6+p8=
-gopkg.in/launchdarkly/go-sdk-events.v1 v1.0.0 h1:4RFAe4vGFeMOfSYS89bi7Qrmldm0pdgFbGyF6vVYQY4=
-gopkg.in/launchdarkly/go-sdk-events.v1 v1.0.0/go.mod h1:t/86BM8V7FETICTMQ8umFoC/bM2Gvx7akU9bQRD9UaE=
 gopkg.in/launchdarkly/go-sdk-events.v1 v1.0.1 h1:QXM0cBmBzsNPhHjjSqtjFhl0wpFu9/Dx19o5QSq11OM=
 gopkg.in/launchdarkly/go-sdk-events.v1 v1.0.1/go.mod h1:HahOiL/+LEvLMZOsIMSByZJKZG5VFzr+817E9KlEo1c=
 gopkg.in/launchdarkly/go-sdk-events.v1 v1.1.0 h1:p7mTBT2WBQV/HMH3XfbzMYTgpTa6vXFxp2iN50dsxjk=
 gopkg.in/launchdarkly/go-sdk-events.v1 v1.1.0/go.mod h1:HahOiL/+LEvLMZOsIMSByZJKZG5VFzr+817E9KlEo1c=
-gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 v1.0.0 h1:vZyXd06EBNigqRO9uld5726Jv5h3EsZBue/DKaoAsPs=
-gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 v1.0.0/go.mod h1:KdRntsUUWlt6RnsgNIJbxJpvFcycu5I+LVfRlALtTK8=
-gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 v1.1.1 h1:zOdvM3Q31Ipp6aotj8QYV7fK/JmpfjosgRDkLeYPIb4=
-gopkg.in/launchdarkly/go-server-sdk-evaluation.v1 v1.1.1/go.mod h1:VBEQuA8sSizie8gb6F3aYWW0Aokmx5TprM/tb3ejGKc=
-gopkg.in/launchdarkly/go-server-sdk.v5 v5.0.0 h1:EZ2tMJeJ0wDGdzo35GmsWpwNPzAXZHbP4ivCsYz5Lgc=
-gopkg.in/launchdarkly/go-server-sdk.v5 v5.0.0/go.mod h1:XtGu5BjXAEP2zV2EfFI7Xnz2VeSTvzzfpSQxOMIUflw=
-gopkg.in/launchdarkly/go-server-sdk.v5 v5.1.4 h1:zN5b256GTBa2QahGz6A0KBy5QbHEqmtUokLlqbXi/mI=
-gopkg.in/launchdarkly/go-server-sdk.v5 v5.1.4/go.mod h1:Wjjd+R7uJoNQFmcvb+YtWq2fIm0QEXxId4vtlTZziQ0=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=

diff --git a/integrationtests/test_manager_test.go b/integrationtests/test_manager_test.go
@@ -293,9 +293,9 @@ func (m *integrationTestManager) deleteEnvironment(project projectInfo, env envi
 
 func (m *integrationTestManager) rotateSDKKey(project projectInfo, env environmentInfo, expirationTime time.Time) (
 	config.SDKKey, error) {
-	var apiOptions *ldapi.ResetEnvironmentSDKKeyOpts
+	var apiOptions *ldapi.EnvironmentsApiResetEnvironmentSDKKeyOpts
 	if !expirationTime.IsZero() {
-		apiOptions = &ldapi.ResetEnvironmentSDKKeyOpts{Expiry: optional.NewInt64(int64(ldtime.UnixMillisFromTime(expirationTime)))}
+		apiOptions = &ldapi.EnvironmentsApiResetEnvironmentSDKKeyOpts{Expiry: optional.NewInt64(int64(ldtime.UnixMillisFromTime(expirationTime)))}
 	}
 	envResult, _, err := m.apiClient.EnvironmentsApi.ResetEnvironmentSDKKey(m.apiContext, project.key, env.key, apiOptions)
 	var newKey config.SDKKey

diff --git a/internal/core/relayenv/env_context_impl.go b/internal/core/relayenv/env_context_impl.go
@@ -241,7 +241,12 @@ func NewEnvContext(
 
 	disconnectedStatusTime := allConfig.Main.DisconnectedStatusTime.GetOrElse(config.DefaultDisconnectedStatusTime)
 
+	var sdkBigSegments interfaces.BigSegmentsConfigurationFactory
+	if envContext.bigSegmentStore != nil {
+		sdkBigSegments = sdks.ConfigureBigSegments(allConfig, envConfig, loggers)
+	}
 	envContext.sdkConfig = ld.Config{
+		BigSegments:      sdkBigSegments,
 		DataSource:       ldcomponents.StreamingDataSource().BaseURI(streamURI),
 		DataStore:        storeAdapter,
 		DiagnosticOptOut: !enableDiagnostics,