merge in master

Nordstrom · Jun 18, 2017 · 6e15c28 · 6e15c28
2 parents 6c727c8 + 24d30da
commit 6e15c28
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/core/span_test.go b/core/span_test.go
@@ -2,6 +2,7 @@ package core_test
 
 import (
 	"encoding/json"
+	"os"
 
 	"github.com/Nordstrom/ctrace-go/core"
 	. "github.com/onsi/ginkgo"
@@ -20,6 +21,10 @@ var _ = Describe("Span", func() {
 		out map[string]interface{}
 	)
 
+	BeforeEach(func() {
+		os.Setenv("CTRACE_SERVICE_NAME", "")
+	})
+
 	Context("with Single-Event Mode", func() {
 		BeforeEach(func() {
 			buf.Reset()

diff --git a/core/tracer_test.go b/core/tracer_test.go
@@ -74,6 +74,36 @@ var _ = Describe("Tracer", func() {
 			})
 		})
 
+		Context("with ServiceName option", func() {
+			JustBeforeEach(func() {
+				buf.Reset()
+				trc = core.NewWithOptions(core.TracerOptions{Writer: &buf, MultiEvent: true, ServiceName: "tservice"})
+			})
+			It("outputs service tag", func() {
+				_ = trc.StartSpan("x")
+				if err := json.Unmarshal([]byte(buf.String()), &out); err != nil {
+					Fail("Cannot unmarshal JSON")
+				}
+				tags := out["tags"].(map[string]interface{})
+				Ω(tags["service"]).Should(Equal("tservice"))
+			})
+		})
+
+		Context("with ServiceName env variable", func() {
+			JustBeforeEach(func() {
+				buf.Reset()
+				os.Setenv("CTRACE_SERVICE_NAME", "eservice")
+				trc = core.NewWithOptions(core.TracerOptions{Writer: &buf, MultiEvent: true})
+			})
+			It("outputs service tag", func() {
+				_ = trc.StartSpan("x")
+				if err := json.Unmarshal([]byte(buf.String()), &out); err != nil {
+					Fail("Cannot unmarshal JSON")
+				}
+				tags := out["tags"].(map[string]interface{})
+				Ω(tags["service"]).Should(Equal("eservice"))
+			})
+		})
 	})
 
 	Context("with ServiceName option", func() {