From 9114d2a574fe540ee532e6cae2bac0495b7f4849 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 29 Jun 2019 22:40:25 +0200
Subject: [PATCH 01/13] Add Event type

---
 .../opentelemetry-types/src/trace/event.ts    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 packages/opentelemetry-types/src/trace/event.ts

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
new file mode 100644
index 0000000000..6dae624e17
--- /dev/null
+++ b/packages/opentelemetry-types/src/trace/event.ts
@@ -0,0 +1,30 @@
+import { Attributes } from "./attributes";
+
+/**
+ * Copyright 2019, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface Event {
+
+  /**
+   * Returns the name of the Event.
+   */
+  getName(): string;
+
+  /**
+   * Returns the attributes of the Event.
+   */
+  getAttributes(): Attributes;
+}

From 7964af67ce3aff05973ac8b2c4484aa0db3125fd Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 29 Jun 2019 22:41:24 +0200
Subject: [PATCH 02/13] Reorder import

---
 packages/opentelemetry-types/src/trace/event.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
index 6dae624e17..d5be907d8f 100644
--- a/packages/opentelemetry-types/src/trace/event.ts
+++ b/packages/opentelemetry-types/src/trace/event.ts
@@ -1,4 +1,3 @@
-import { Attributes } from "./attributes";
 
 /**
  * Copyright 2019, OpenTelemetry Authors
@@ -16,6 +15,8 @@ import { Attributes } from "./attributes";
  * limitations under the License.
  */
 
+import { Attributes } from "./attributes";
+
 export interface Event {
 
   /**

From 21643e86e61670c23da44efc7b0e8a9f276e8cc6 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 29 Jun 2019 22:41:52 +0200
Subject: [PATCH 03/13] remove empty line

---
 packages/opentelemetry-types/src/trace/event.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
index d5be907d8f..1c2af33fb0 100644
--- a/packages/opentelemetry-types/src/trace/event.ts
+++ b/packages/opentelemetry-types/src/trace/event.ts
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2019, OpenTelemetry Authors
  *

From 53b7482cc5c087c15ad69acf0a704d1df62ea463 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 29 Jun 2019 22:47:57 +0200
Subject: [PATCH 04/13] Add TimedEvent

---
 .../opentelemetry-types/src/trace/event.ts    |  3 ++
 .../src/trace/timed_event.ts                  | 43 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 packages/opentelemetry-types/src/trace/timed_event.ts

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
index 1c2af33fb0..c601ca373a 100644
--- a/packages/opentelemetry-types/src/trace/event.ts
+++ b/packages/opentelemetry-types/src/trace/event.ts
@@ -16,6 +16,9 @@
 
 import { Attributes } from "./attributes";
 
+/**
+ * Represents an event.
+ */
 export interface Event {
 
   /**
diff --git a/packages/opentelemetry-types/src/trace/timed_event.ts b/packages/opentelemetry-types/src/trace/timed_event.ts
new file mode 100644
index 0000000000..7664b20547
--- /dev/null
+++ b/packages/opentelemetry-types/src/trace/timed_event.ts
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2019, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Event } from './event';
+
+/**
+ * Represents a timed event.
+ * A timed event is an event with a timestamp.
+ */
+export interface TimedEvent {
+
+  /**
+   * Returns a new timed event.
+   * An Event has to be treated as immutable.
+   *
+   * @param timestamp The timestamp of this event
+   * @param event The event
+   */
+  create(timestamp: number, event: Event): TimedEvent;
+
+  /**
+   * Returns the Timestamp of this event.
+   */
+  getTimestamp(): number;
+
+  /**
+   * Returns the Event.
+   */
+  getEvent(): Event;
+}

From e0632e50beb8a0d505b018e1098fc74529a1136b Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 29 Jun 2019 23:02:49 +0200
Subject: [PATCH 05/13] fix styling

---
 packages/opentelemetry-types/src/trace/event.ts       | 3 +--
 packages/opentelemetry-types/src/trace/timed_event.ts | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
index c601ca373a..c5cfe4d36e 100644
--- a/packages/opentelemetry-types/src/trace/event.ts
+++ b/packages/opentelemetry-types/src/trace/event.ts
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-import { Attributes } from "./attributes";
+import { Attributes } from './attributes';
 
 /**
  * Represents an event.
  */
 export interface Event {
-
   /**
    * Returns the name of the Event.
    */
diff --git a/packages/opentelemetry-types/src/trace/timed_event.ts b/packages/opentelemetry-types/src/trace/timed_event.ts
index 7664b20547..dc12c4f3c2 100644
--- a/packages/opentelemetry-types/src/trace/timed_event.ts
+++ b/packages/opentelemetry-types/src/trace/timed_event.ts
@@ -21,7 +21,6 @@ import { Event } from './event';
  * A timed event is an event with a timestamp.
  */
 export interface TimedEvent {
-
   /**
    * Returns a new timed event.
    * An Event has to be treated as immutable.

From d238a8974121f05e7601f3d533b0edc40d7faf1c Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Fri, 5 Jul 2019 13:10:43 +0200
Subject: [PATCH 06/13] used new event type

---
 packages/opentelemetry-types/src/trace/event.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
index c5cfe4d36e..ea21c33017 100644
--- a/packages/opentelemetry-types/src/trace/event.ts
+++ b/packages/opentelemetry-types/src/trace/event.ts
@@ -16,17 +16,10 @@
 
 import { Attributes } from './attributes';
 
-/**
- * Represents an event.
- */
+/** A text annotation with a set of attributes. */
 export interface Event {
-  /**
-   * Returns the name of the Event.
-   */
-  getName(): string;
-
-  /**
-   * Returns the attributes of the Event.
-   */
-  getAttributes(): Attributes;
+  /** The name of the event. */
+  name: string;
+  /** The attributes of the event. */
+  attributes?: Attributes;
 }

From add81cf9b994636fb1c2189e22de6733ded870d0 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Fri, 5 Jul 2019 13:12:24 +0200
Subject: [PATCH 07/13] added timed event extending event

---
 .../src/trace/timed_event.ts                  | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/packages/opentelemetry-types/src/trace/timed_event.ts b/packages/opentelemetry-types/src/trace/timed_event.ts
index dc12c4f3c2..fee92eb508 100644
--- a/packages/opentelemetry-types/src/trace/timed_event.ts
+++ b/packages/opentelemetry-types/src/trace/timed_event.ts
@@ -20,23 +20,6 @@ import { Event } from './event';
  * Represents a timed event.
  * A timed event is an event with a timestamp.
  */
-export interface TimedEvent {
-  /**
-   * Returns a new timed event.
-   * An Event has to be treated as immutable.
-   *
-   * @param timestamp The timestamp of this event
-   * @param event The event
-   */
-  create(timestamp: number, event: Event): TimedEvent;
-
-  /**
-   * Returns the Timestamp of this event.
-   */
-  getTimestamp(): number;
-
-  /**
-   * Returns the Event.
-   */
-  getEvent(): Event;
+export interface TimeEvent extends Event {
+  time: number;
 }

From dc2a706f276dac6b9814bc950a7ad65b4626245c Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 6 Jul 2019 01:24:29 +0200
Subject: [PATCH 08/13] change casing

---
 packages/opentelemetry-types/src/trace/timed_event.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opentelemetry-types/src/trace/timed_event.ts b/packages/opentelemetry-types/src/trace/timed_event.ts
index fee92eb508..3b46df2e87 100644
--- a/packages/opentelemetry-types/src/trace/timed_event.ts
+++ b/packages/opentelemetry-types/src/trace/timed_event.ts
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { Event } from './event';
+import { Event } from './Event';
 
 /**
  * Represents a timed event.
  * A timed event is an event with a timestamp.
  */
-export interface TimeEvent extends Event {
+export interface TimedEvent extends Event {
   time: number;
 }

From 80988821f2ceb4522dbd75f8f006e32bac54f75f Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Sat, 6 Jul 2019 01:24:53 +0200
Subject: [PATCH 09/13] change casing again

---
 packages/opentelemetry-types/src/index.ts             | 2 +-
 packages/opentelemetry-types/src/trace/timed_event.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/opentelemetry-types/src/index.ts b/packages/opentelemetry-types/src/index.ts
index 79a5640a0b..9871e8f86f 100644
--- a/packages/opentelemetry-types/src/index.ts
+++ b/packages/opentelemetry-types/src/index.ts
@@ -19,7 +19,7 @@ export * from './distributed_context/DistributedContext';
 export * from './distributed_context/EntryValue';
 export * from './resources/Resource';
 export * from './trace/attributes';
-export * from './trace/Event';
+export * from './trace/event';
 export * from './trace/link';
 export * from './trace/Sampler';
 export * from './trace/span';
diff --git a/packages/opentelemetry-types/src/trace/timed_event.ts b/packages/opentelemetry-types/src/trace/timed_event.ts
index 3b46df2e87..b4b125dc99 100644
--- a/packages/opentelemetry-types/src/trace/timed_event.ts
+++ b/packages/opentelemetry-types/src/trace/timed_event.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Event } from './Event';
+import { Event } from './event';
 
 /**
  * Represents a timed event.

From ef2598910889fe6e7e89103739be676b493f4433 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Mon, 8 Jul 2019 09:23:59 +0200
Subject: [PATCH 10/13] Fixed naming according to new conventions

---
 packages/opentelemetry-types/src/index.ts                       | 2 +-
 .../src/trace/{timed_event.ts => TimedEvent.ts}                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/opentelemetry-types/src/trace/{timed_event.ts => TimedEvent.ts} (95%)

diff --git a/packages/opentelemetry-types/src/index.ts b/packages/opentelemetry-types/src/index.ts
index 9871e8f86f..79a5640a0b 100644
--- a/packages/opentelemetry-types/src/index.ts
+++ b/packages/opentelemetry-types/src/index.ts
@@ -19,7 +19,7 @@ export * from './distributed_context/DistributedContext';
 export * from './distributed_context/EntryValue';
 export * from './resources/Resource';
 export * from './trace/attributes';
-export * from './trace/event';
+export * from './trace/Event';
 export * from './trace/link';
 export * from './trace/Sampler';
 export * from './trace/span';
diff --git a/packages/opentelemetry-types/src/trace/timed_event.ts b/packages/opentelemetry-types/src/trace/TimedEvent.ts
similarity index 95%
rename from packages/opentelemetry-types/src/trace/timed_event.ts
rename to packages/opentelemetry-types/src/trace/TimedEvent.ts
index b4b125dc99..3b46df2e87 100644
--- a/packages/opentelemetry-types/src/trace/timed_event.ts
+++ b/packages/opentelemetry-types/src/trace/TimedEvent.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Event } from './event';
+import { Event } from './Event';
 
 /**
  * Represents a timed event.

From 3fbfb3f71d1f21dbde8544963f616140a09faf56 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Mon, 8 Jul 2019 09:30:04 +0200
Subject: [PATCH 11/13] Delete event.ts

---
 .../opentelemetry-types/src/trace/event.ts    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 packages/opentelemetry-types/src/trace/event.ts

diff --git a/packages/opentelemetry-types/src/trace/event.ts b/packages/opentelemetry-types/src/trace/event.ts
deleted file mode 100644
index ea21c33017..0000000000
--- a/packages/opentelemetry-types/src/trace/event.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright 2019, OpenTelemetry Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Attributes } from './attributes';
-
-/** A text annotation with a set of attributes. */
-export interface Event {
-  /** The name of the event. */
-  name: string;
-  /** The attributes of the event. */
-  attributes?: Attributes;
-}

From 5b1eca6a555fa8c7cbb48632bba37d45e6cf9729 Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Mon, 8 Jul 2019 09:30:49 +0200
Subject: [PATCH 12/13] Delete Events

---
 .../opentelemetry-types/src/trace/Event.ts    | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 packages/opentelemetry-types/src/trace/Event.ts

diff --git a/packages/opentelemetry-types/src/trace/Event.ts b/packages/opentelemetry-types/src/trace/Event.ts
deleted file mode 100644
index ea21c33017..0000000000
--- a/packages/opentelemetry-types/src/trace/Event.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright 2019, OpenTelemetry Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Attributes } from './attributes';
-
-/** A text annotation with a set of attributes. */
-export interface Event {
-  /** The name of the event. */
-  name: string;
-  /** The attributes of the event. */
-  attributes?: Attributes;
-}

From beb4f8eabe2bceac6d5efcbd1ea53da593525a7a Mon Sep 17 00:00:00 2001
From: Daniel Khan <daniel@khan.io>
Date: Mon, 8 Jul 2019 09:31:56 +0200
Subject: [PATCH 13/13] Re-add event

---
 .../opentelemetry-types/src/trace/Event.ts    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 packages/opentelemetry-types/src/trace/Event.ts

diff --git a/packages/opentelemetry-types/src/trace/Event.ts b/packages/opentelemetry-types/src/trace/Event.ts
new file mode 100644
index 0000000000..ea21c33017
--- /dev/null
+++ b/packages/opentelemetry-types/src/trace/Event.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright 2019, OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Attributes } from './attributes';
+
+/** A text annotation with a set of attributes. */
+export interface Event {
+  /** The name of the event. */
+  name: string;
+  /** The attributes of the event. */
+  attributes?: Attributes;
+}