Update README + add examples

.env.dist

@@ -1,6 +1,6 @@
 SERVER_HOST=
 SERVER_PORT=8080
 SERVER_SHUTDOWN_TIMEOUT=5
-HTTP_TRACE_HEADER=X-Amzn-Trace-Id
+TRACEPARENT_HEADER=traceparent
 SMTP_ADDR=smtp:1025
 LOG_LEVEL=debug

.gitattributes

@@ -0,0 +1 @@
+*.gif filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1 +1,2 @@
 .env
+coverage.txt

README.md

@@ -1,47 +1,46 @@
-# HTTP to SMTP
+# 📩 HTTP to SMTP
 
-[![docker image](https://img.shields.io/docker/v/eexit/http2smtp?label=docker-image&sort=date)](https://hub.docker.com/repository/docker/eexit/http2smtp) [![ci](https://github.com/eexit/http2smtp/workflows/build/badge.svg)](https://github.com/eexit/http2smtp/actions) [![codecov](https://codecov.io/gh/eexit/http2smtp/branch/master/graph/badge.svg?token=XH18EYLDLZ)](https://codecov.io/gh/eexit/http2smtp)
+[![version](https://img.shields.io/github/v/tag/eexit/http2smtp?label=version&logo=github&sort=semver)](https://github.com/eexit/http2smtp/releases) [![docker pull](https://img.shields.io/docker/pulls/eexit/http2smtp)](https://hub.docker.com/repository/docker/eexit/http2smtp) [![ci](https://github.com/eexit/http2smtp/workflows/build/badge.svg)](https://github.com/eexit/http2smtp/actions) [![codecov](https://codecov.io/gh/eexit/http2smtp/branch/master/graph/badge.svg?token=XH18EYLDLZ)](https://codecov.io/gh/eexit/http2smtp) [![license](https://img.shields.io/github/license/eexit/http2smtp)](https://github.com/eexit/http2smtp/blob/master/LICENSE)
 
-This small app allows to connect any HTTP-based vendor mailer to a SMTP server. Developped because of the lack of capability to test email sending thru APIs.
+An API proxies HTTP-backed vendor mailer calls to SMTP.
 
-### Supported vendors
-
-- [SparkPost RFC 822 transmission](https://developers.sparkpost.com/api/transmissions/#transmissions-post-send-rfc822-content)
+Plug a MailHog or MailCatcher to API email sending vendors such as SparkPost, MailGun or Twilio SendGrid for testing purposes.
 
 ## Usage
 
+See [examples](examples).
+
+:zap: ProTip: for tracing purposes, this app kinda supports [W3C Trace Context recommendation](https://www.w3.org/TR/trace-context/). Configure the env var `TRACEPARENT_HEADER` and inject any trace into this header value. All log entries will be contextualized with the given value.
+
 ### Docker image
 
 1. Checkout this repo or only copy the `.env.dist` and `docker-compose.yml` files
 1. Rename `.env.dist` into `.env`
-2. Update the values accordingly
-
-```bash
-# Pull the images
-docker-compose pull
-# Up the stack
-docker-compose up http2smtp
-Creating http2smtp_smtp_1 ... done
-Creating http2smtp_http2smtp_1 ... done
-Attaching to http2smtp_http2smtp_1
-http2smtp_1  | {"level":"info","version":"v0.1.0+dev","time":"2021-01-03T22:32:08Z","message":"app is starting"}
-http2smtp_1  | {"level":"info","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"time":"2021-01-03T22:32:08Z","message":"dialing to smtp server"}
-http2smtp_1  | {"level":"info","version":"v0.1.0+dev","time":"2021-01-03T22:32:08Z","message":"listening on http:8080"}
-```
+1. Update the values accordingly
+1. Pull images and run `docker-compose up http2smtp`
 
 ## Vendor endpoints
 
-### SparkPost
+### [SparkPost](https://developers.sparkpost.com/api/)
 
 #### Inline transmission
 
-_Not supported yet._
+API documentation: https://developers.sparkpost.com/api/transmissions/#transmissions-post-send-inline-content
+
+_:warning: Not supported yet._
 
 #### RFC 822 transmission
 
-SparkPost documentation: https://developers.sparkpost.com/api/transmissions/#transmissions-post-send-rfc822-content
+API documentation: https://developers.sparkpost.com/api/transmissions/#transmissions-post-send-rfc822-content
 
     POST /sparkpost/api/v1/transmissions
 
-Basic validation is enforced, only the recipients list and the RFC 822 content are used.
+Basic validation is enforced, only the recipients list email and the RFC 822 content are used and mandatory.
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+## Contributors
 
+![contributors](https://contrib.rocks/image?repo=eexit/http2smtp)

examples/README.md

@@ -0,0 +1,10 @@
+# Examples
+
+## Healthcheck
+
+![healthcheck.gif](healthcheck.gif)
+
+## SparkPost
+
+- [RFC 822 transmissions](sparkpost_rfc822.md)
+

examples/sparkpost_rfc822.json

@@ -0,0 +1,10 @@
+{
+    "recipients":[
+        {
+            "address":{"email":"[email protected]"}
+        }
+    ],
+    "content":{
+        "email_rfc822":"From: Test <[email protected]>\nTo: Bob <[email protected]>\nSubject: Hello world!\n\nHello world!"
+    }
+}

examples/sparkpost_rfc822.md

@@ -0,0 +1,37 @@
+# SparkPost RFC 822
+
+API documentation: https://developers.sparkpost.com/api/transmissions/#transmissions-post-send-rfc822-content
+
+![sparkpost_rfc822.gif](sparkpost_rfc822.gif)
+
+Launch the API:
+
+```bash
+docker-compose up http2smtp
+Creating http2smtp_smtp_1 ... done
+Creating http2smtp_http2smtp_1 ... done
+Attaching to http2smtp_http2smtp_1
+http2smtp_1  | {"level":"info","version":"v0.1.0+dev","time":"2021-01-03T22:32:08Z","message":"app is starting"}
+http2smtp_1  | {"level":"info","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"time":"2021-01-03T22:32:08Z","message":"dialing to smtp server"}
+http2smtp_1  | {"level":"info","version":"v0.1.0+dev","time":"2021-01-03T22:32:08Z","message":"listening on http:8080"}
+```
+
+Send the example request:
+
+```bash
+http POST :8080/sparkpost/api/v1/transmissions traceparent:$(openssl rand -hex 16) < sparkpost_rfc822.json
+```
+
+Logs:
+
+```bash
+http2smtp_1  | {"level":"info","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","time":"2021-01-04T00:24:27Z","message":"sending message"}
+http2smtp_1  | {"level":"debug","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","tos":["[email protected]"],"time":"2021-01-04T00:24:27Z","message":"executing transaction"}
+http2smtp_1  | {"level":"debug","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","from":"Test <[email protected]>","time":"2021-01-04T00:24:27Z","message":"sending MAIL FROM cmd"}
+http2smtp_1  | {"level":"debug","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","to":"[email protected]","time":"2021-01-04T00:24:27Z","message":"sending RCPT cmd"}
+http2smtp_1  | {"level":"debug","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","time":"2021-01-04T00:24:27Z","message":"sending DATA cmd"}
+http2smtp_1  | {"level":"debug","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","data":"From: Test <[email protected]>\nTo: Bob <[email protected]>\nSubject: Hello world!\n\nHello world!","time":"2021-01-04T00:24:27Z","message":"writing data"}
+http2smtp_1  | {"level":"debug","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","tos":["[email protected]"],"time":"2021-01-04T00:24:27Z","message":"transaction executed"}
+http2smtp_1  | {"level":"info","version":"v0.1.0+dev","smtp":{"addr":"smtp:1025","id":"go:net/smtp"},"trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","accepted":1,"time":"2021-01-04T00:24:27Z","message":"message sent"}
+http2smtp_1  | {"level":"info","version":"v0.1.0+dev","trace_id":"304dfb8a7fbcfbdb1db373da9e39354a","verb":"POST","ip":"172.24.0.1","user_agent":"HTTPie/2.3.0","url":"/sparkpost/api/v1/transmissions","code":201,"size":97,"duration":3.273861,"time":"2021-01-04T00:24:27Z","message":"served request"}
+```

internal/env/env.go

@@ -12,7 +12,7 @@ type Bag struct {
 	// HTTPTraceHeader is a header that provides a unique per-request ID that will be
 	// injected into all logs entries related to the same request. This is used to track
 	// the a request trace within the underlying services
-	HTTPTraceHeader string `envconfig:"HTTP_TRACE_HEADER"`
+	HTTPTraceHeader string `envconfig:"TRACEPARENT_HEADER" default:"traceparent"`
 	// SMTPAddr is the hostname:port config of the SMTP server the app forwards emails to
 	SMTPAddr string `envconfig:"SMTP_ADDR" required:"true"`
 	// LogLevel is the level of log generated by the app