Merge pull request #73 from tetratelabs/fix-example

fix examples

Author: mathetake

Makefile

@@ -8,7 +8,7 @@ build.example:
 	tinygo build -o ./examples/${name}/main.go.wasm -scheduler=none -target=wasi -wasm-abi=generic ./examples/${name}/main.go
 
 build.examples:
-	find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -target=wasi -wasm-abi=generic p
+	find ./examples -type f -name "main.go" | xargs -Ip tinygo build -o p.wasm -scheduler=none -target=wasi -wasm-abi=generic p
 
 lint:
 	golangci-lint run --build-tags proxytest

README.md

@@ -9,30 +9,28 @@ proxy-wasm-go-sdk is powered by [TinyGo](https://tinygo.org/) and does not suppo
 
 
 ```golang
-
 import (
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm/types"
 )
 
 var counter proxywasm.MetricCounter
 
-const metricName = "proxy_wasm_go.request_counter"
-
-type context struct{ proxywasm.DefaultContext }
+type metricRootContext struct { proxywasm.DefaultRootContext }
 
-func (ctx *context) OnVMStart(int) bool {
-	// initialize the new metric	
-	counter, _ = proxywasm.DefineCounterMetric(metricName)
+func (ctx *metricRootContext) OnVMStart(int) bool {
+	// initialize the metric
+	counter = proxywasm.DefineCounterMetric("proxy_wasm_go.request_counter")
 	return true
 }
 
-func (ctx *context) OnHttpRequestHeaders(int, bool) types.Action {
+type metricHttpContext struct { proxywasm.DefaultHttpContext }
+
+func (ctx *metricHttpContext) OnHttpRequestHeaders(int, bool) types.Action {
 	// increment the request counter when we receive request headers
-	counter.Increment(1)  
+	counter.Increment(1)
 	return types.ActionContinue
 }
-
 ```
 
 ### requirements

e2e/e2e_test.go

@@ -64,7 +64,7 @@ func TestE2E_helloworld(t *testing.T) {
 	out := stdErr.String()
 	fmt.Println(out)
 	assert.True(t, strings.Contains(out, "wasm log helloworld: proxy_on_vm_start from Go!"))
-	assert.True(t, strings.Contains(out, "wasm log helloworld: OnTick on "))
+	assert.True(t, strings.Contains(out, "wasm log helloworld: It's"))
 }
 
 func TestE2E_http_auth_random(t *testing.T) {

examples/helloworld/main.go

@@ -15,6 +15,8 @@
 package main
 
 import (
+	"math/rand"
+
 	"github.com/tetratelabs/proxy-wasm-go-sdk/proxywasm"
 )
 
@@ -36,15 +38,18 @@ func newHelloWorld(contextID uint32) proxywasm.RootContext {
 
 // override
 func (ctx *helloWorld) OnVMStart(int) bool {
+	rand.Seed(proxywasm.GetCurrentTime())
+
 	proxywasm.LogInfo("proxy_on_vm_start from Go!")
 	if err := proxywasm.SetTickPeriodMilliSeconds(tickMilliseconds); err != nil {
 		proxywasm.LogCriticalf("failed to set tick period: %v", err)
 	}
+
 	return true
 }
 
 // override
 func (ctx *helloWorld) OnTick() {
 	t := proxywasm.GetCurrentTime()
-	proxywasm.LogInfof("OnTick on %d, it's %d", ctx.contextID, t)
+	proxywasm.LogInfof("It's %d: random value: %d", t, rand.Uint64())
 }

examples/helloworld/main_test.go

@@ -27,7 +27,7 @@ func TestHelloWorld_OnTick(t *testing.T) {
 	require.Greater(t, len(logs), 0)
 	msg := logs[len(logs)-1]
 
-	assert.True(t, strings.Contains(msg, "OnTick on"))
+	assert.True(t, strings.Contains(msg, "It's"))
 }
 
 func TestHelloWorld_OnVMStart(t *testing.T) {