diff --git a/.circleci/config.yml b/.circleci/config.yml
index b119cb6de1..9e52828360 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  buildevents: honeycombio/buildevents@0.0.2
+  buildevents: honeycombio/buildevents@0.0.3
 
 executors:
   linuxgo:
@@ -16,6 +16,12 @@ jobs:
     steps:
       - buildevents/start_trace
 
+  # finish_trace:
+  #   executor: linuxgo
+  #   steps:
+  #     - buildevents/finish_trace:
+  #         success: true
+
   test:
     executor: linuxgo
     steps:
@@ -79,12 +85,6 @@ jobs:
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} ./artifacts/samproxy_${CIRCLE_TAG:1:20}_amd64.deb
             ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} ${CIRCLE_TAG} ./artifacts/samproxy-${CIRCLE_TAG:1:20}-1.x86_64.rpm
 
-  finish_trace:
-    executor: linuxgo
-    steps:
-      - buildevents/finish_trace:
-          result: success
-
 workflows:
   build:
     jobs:
@@ -92,18 +92,18 @@ workflows:
           filters:
             tags:
               only: /.*/
+      # - finish_trace:
+      #     requires:
+      #       - setup
+      #     filters:
+      #       tags:
+      #         only: /.*/
       - test:
           requires:
             - setup
           filters:
             tags:
               only: /.*/
-      - finish_trace:
-          requires:
-            - test
-          filters:
-            tags:
-              only: /.*/
       - build:
           requires:
             - test
diff --git a/cmd/samproxy/main.go b/cmd/samproxy/main.go
index 37d72053ba..7ecdbed418 100644
--- a/cmd/samproxy/main.go
+++ b/cmd/samproxy/main.go
@@ -95,6 +95,7 @@ func main() {
 
 	// upstreamTransport is the http transport used to send things on to Honeycomb
 	upstreamTransport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{
 			Timeout: 10 * time.Second,
 		}).Dial,
@@ -103,6 +104,7 @@ func main() {
 
 	// peerTransport is the http transport used to send things to a local peer
 	peerTransport := &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{
 			Timeout: 3 * time.Second,
 		}).Dial,