@@ -11,6 +11,7 @@ import (
1111 "github.com/webhookx-io/webhookx/db/entities"
1212 "github.com/webhookx-io/webhookx/test/helper"
1313 "github.com/webhookx-io/webhookx/test/helper/factory"
14+ "github.com/webhookx-io/webhookx/utils"
1415 "testing"
1516 "time"
1617)
@@ -35,31 +36,33 @@ var _ = Describe("opentelemetry", Ordered, func() {
3536 helper .InitDB (true , & entitiesConfig )
3637 helper .InitOtelOutput ()
3738 proxyClient = helper .ProxyClient ()
38- var err error
39- app , err = helper .Start (map [string ]string {
39+ app = utils .Must (helper .Start (map [string ]string {
4040 "WEBHOOKX_METRICS_EXPORTS" : "opentelemetry" ,
4141 "WEBHOOKX_METRICS_PUSH_INTERVAL" : "3" ,
4242 "WEBHOOKX_METRICS_OPENTELEMETRY_PROTOCOL" : protocol ,
4343 "WEBHOOKX_METRICS_OPENTELEMETRY_ENDPOINT" : endpoints [protocol ],
44- })
45- assert .Nil (GinkgoT (), err )
44+ }))
45+
46+ err := helper .WaitForServer (helper .ProxyHttpURL , time .Second )
47+ assert .NoError (GinkgoT (), err )
4648 })
4749
4850 AfterAll (func () {
4951 app .Stop ()
5052 })
5153
5254 It ("sanity" , func () {
53- assert .Eventually (GinkgoT (), func () bool {
55+ n , err := helper .FileCountLine (helper .OtelCollectorMetricsFile )
56+ assert .Nil (GinkgoT (), err )
57+ n ++
58+
59+ for i := 0 ; i < 3 ; i ++ {
5460 resp , err := proxyClient .R ().
55- SetBody (`{
56- "event_type": "foo.bar",
57- "data": {
58- "key": "value"
59- }
60- }` ).Post ("/" )
61- return err == nil && resp .StatusCode () == 200
62- }, time .Second * 5 , time .Second )
61+ SetBody (`{"event_type": "foo.bar","data": {"key": "value"}}` ).
62+ Post ("/" )
63+ assert .NoError (GinkgoT (), err )
64+ assert .Equal (GinkgoT (), 200 , resp .StatusCode ())
65+ }
6366
6467 expected := []string {
6568 "webhookx.runtime.num_goroutine" ,
@@ -84,9 +87,6 @@ var _ = Describe("opentelemetry", Ordered, func() {
8487 "webhookx.attempt.failed" ,
8588 }
8689
87- n , err := helper .FileCountLine (helper .OtelCollectorMetricsFile )
88- assert .Nil (GinkgoT (), err )
89- n ++
9090 uploaded := make (map [string ]bool )
9191 assert .Eventually (GinkgoT (), func () bool {
9292 line , err := helper .FileLine (helper .OtelCollectorMetricsFile , n )
0 commit comments