From a49f79bcc2246daebe8647db377475ffc1523d7b Mon Sep 17 00:00:00 2001
From: Ian Cottrell <iancottrell@google.com>
Date: Sun, 22 Mar 2020 23:18:37 -0400
Subject: [PATCH] internal/telemetry: hide event.Type

Change-Id: I390102bbffaa242051cc131ef0659a6544aa89c6
Reviewed-on: https://go-review.googlesource.com/c/tools/+/224938
Run-TryBot: Ian Cottrell <iancottrell@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com>
---
 internal/telemetry/event/event.go  | 14 +++++++-------
 internal/telemetry/event/label.go  |  2 +-
 internal/telemetry/event/log.go    |  6 +++---
 internal/telemetry/event/metric.go |  2 +-
 internal/telemetry/event/trace.go  |  8 +++-----
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/internal/telemetry/event/event.go b/internal/telemetry/event/event.go
index 5c5e165291..87a46c0cd5 100644
--- a/internal/telemetry/event/event.go
+++ b/internal/telemetry/event/event.go
@@ -22,7 +22,7 @@ const (
 )
 
 type Event struct {
-	Type    eventType
+	typ     eventType
 	At      time.Time
 	Message string
 	Error   error
@@ -30,12 +30,12 @@ type Event struct {
 	tags []Tag
 }
 
-func (e Event) IsLog() bool       { return e.Type == LogType }
-func (e Event) IsEndSpan() bool   { return e.Type == EndSpanType }
-func (e Event) IsStartSpan() bool { return e.Type == StartSpanType }
-func (e Event) IsLabel() bool     { return e.Type == LabelType }
-func (e Event) IsDetach() bool    { return e.Type == DetachType }
-func (e Event) IsRecord() bool    { return e.Type == RecordType }
+func (e Event) IsLog() bool       { return e.typ == LogType }
+func (e Event) IsEndSpan() bool   { return e.typ == EndSpanType }
+func (e Event) IsStartSpan() bool { return e.typ == StartSpanType }
+func (e Event) IsLabel() bool     { return e.typ == LabelType }
+func (e Event) IsDetach() bool    { return e.typ == DetachType }
+func (e Event) IsRecord() bool    { return e.typ == RecordType }
 
 func (e Event) Format(f fmt.State, r rune) {
 	if !e.At.IsZero() {
diff --git a/internal/telemetry/event/label.go b/internal/telemetry/event/label.go
index 5892e7f842..9536ed2d25 100644
--- a/internal/telemetry/event/label.go
+++ b/internal/telemetry/event/label.go
@@ -11,7 +11,7 @@ import (
 // Label sends a label event to the exporter with the supplied tags.
 func Label(ctx context.Context, tags ...Tag) context.Context {
 	return dispatch(ctx, Event{
-		Type: LabelType,
+		typ:  LabelType,
 		tags: tags,
 	})
 }
diff --git a/internal/telemetry/event/log.go b/internal/telemetry/event/log.go
index abbe2206b9..3367f9b722 100644
--- a/internal/telemetry/event/log.go
+++ b/internal/telemetry/event/log.go
@@ -12,7 +12,7 @@ import (
 // Log sends a log event with the supplied tag list to the exporter.
 func Log(ctx context.Context, tags ...Tag) {
 	dispatch(ctx, Event{
-		Type: LogType,
+		typ:  LogType,
 		tags: tags,
 	})
 }
@@ -21,7 +21,7 @@ func Log(ctx context.Context, tags ...Tag) {
 // before delivering them to the exporter.
 func Print(ctx context.Context, message string, tags ...Tag) {
 	dispatch(ctx, Event{
-		Type:    LogType,
+		typ:     LogType,
 		Message: message,
 		tags:    tags,
 	})
@@ -36,7 +36,7 @@ func Error(ctx context.Context, message string, err error, tags ...Tag) {
 		message = ""
 	}
 	dispatch(ctx, Event{
-		Type:    LogType,
+		typ:     LogType,
 		Message: message,
 		Error:   err,
 		tags:    tags,
diff --git a/internal/telemetry/event/metric.go b/internal/telemetry/event/metric.go
index 23af8d5e53..48f030e9eb 100644
--- a/internal/telemetry/event/metric.go
+++ b/internal/telemetry/event/metric.go
@@ -10,7 +10,7 @@ import (
 
 func Record(ctx context.Context, tags ...Tag) {
 	dispatch(ctx, Event{
-		Type: RecordType,
+		typ:  RecordType,
 		tags: tags,
 	})
 }
diff --git a/internal/telemetry/event/trace.go b/internal/telemetry/event/trace.go
index 57095ab702..85cdd53850 100644
--- a/internal/telemetry/event/trace.go
+++ b/internal/telemetry/event/trace.go
@@ -10,19 +10,17 @@ import (
 
 func StartSpan(ctx context.Context, name string, tags ...Tag) (context.Context, func()) {
 	ctx = dispatch(ctx, Event{
-		Type:    StartSpanType,
+		typ:     StartSpanType,
 		Message: name,
 		tags:    tags,
 	})
 	return ctx, func() {
-		dispatch(ctx, Event{
-			Type: EndSpanType,
-		})
+		dispatch(ctx, Event{typ: EndSpanType})
 	}
 }
 
 // Detach returns a context without an associated span.
 // This allows the creation of spans that are not children of the current span.
 func Detach(ctx context.Context) context.Context {
-	return dispatch(ctx, Event{Type: DetachType})
+	return dispatch(ctx, Event{typ: DetachType})
 }