Skip to content

Commit 055449a

Browse files
mariomacmariomac
authored
Update OBI to latest (#2354)
* Update OBI to latest * Sync tests from OBI * Update OBI and fix breaking changes * sync python images with OBI integration tests * Fix linux test * fix startup error * fix more python test images * Fix extra python test * Fix survey info accidentally triggering * Update node testservers * Fix wrong assumptions wrt survey_info mode * fix some failing tests
1 parent 689c2f8 commit 055449a

File tree

172 files changed

+4450
-2245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+4450
-2245
lines changed

‎.obi-src‎

Submodule .obi-src updated 268 files

‎go.mod‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ require (
3434
go.opentelemetry.io/collector/exporter/otlpexporter v0.140.0
3535
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.140.0
3636
go.opentelemetry.io/collector/pdata v1.46.0
37-
go.opentelemetry.io/obi v0.2.0
37+
go.opentelemetry.io/obi v0.3.0
3838
go.opentelemetry.io/otel v1.38.0
3939
go.opentelemetry.io/otel/sdk v1.38.0
4040
go.opentelemetry.io/otel/sdk/metric v1.38.0
4141
go.opentelemetry.io/otel/trace v1.38.0
42-
go.uber.org/zap v1.27.0
43-
golang.org/x/net v0.46.0
42+
go.uber.org/zap v1.27.1
43+
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82
4444
golang.org/x/sync v0.17.0
45-
google.golang.org/grpc v1.76.0
45+
google.golang.org/grpc v1.77.0
4646
google.golang.org/protobuf v1.36.10
4747
gopkg.in/yaml.v3 v3.0.1
48-
k8s.io/apimachinery v0.34.1
49-
k8s.io/client-go v0.34.1
48+
k8s.io/apimachinery v0.34.2
49+
k8s.io/client-go v0.34.2
5050
sigs.k8s.io/e2e-framework v0.6.0
5151
)
5252

@@ -120,7 +120,7 @@ require (
120120
github.com/grafana/jvmtools v0.0.3 // indirect
121121
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
122122
github.com/hashicorp/go-version v1.7.0 // indirect
123-
github.com/ianlancetaylor/demangle v0.0.0-20250628045327-2d64ad6b7ec5 // indirect
123+
github.com/ianlancetaylor/demangle v0.0.0-20251118225945-96ee0021ea0f // indirect
124124
github.com/json-iterator/go v1.1.12 // indirect
125125
github.com/klauspost/compress v1.18.1 // indirect
126126
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
@@ -147,11 +147,11 @@ require (
147147
github.com/rs/cors v1.11.1 // indirect
148148
github.com/shoenig/go-m1cpu v0.1.7 // indirect
149149
github.com/spf13/pflag v1.0.10 // indirect
150-
github.com/tklauser/go-sysconf v0.3.15 // indirect
151-
github.com/tklauser/numcpus v0.10.0 // indirect
150+
github.com/tklauser/go-sysconf v0.3.16 // indirect
151+
github.com/tklauser/numcpus v0.11.0 // indirect
152152
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
153153
github.com/ugorji/go/codec v1.2.12 // indirect
154-
github.com/vektah/gqlparser/v2 v2.5.30 // indirect
154+
github.com/vektah/gqlparser/v2 v2.5.31 // indirect
155155
github.com/vishvananda/netlink v1.3.1 // indirect
156156
github.com/vishvananda/netns v0.0.5 // indirect
157157
github.com/x448/float16 v0.8.4 // indirect
@@ -202,16 +202,16 @@ require (
202202
golang.org/x/arch v0.21.0 // indirect
203203
golang.org/x/crypto v0.43.0 // indirect
204204
golang.org/x/mod v0.29.0 // indirect
205-
golang.org/x/oauth2 v0.31.0 // indirect
206-
golang.org/x/sys v0.37.0 // indirect
205+
golang.org/x/oauth2 v0.32.0 // indirect
206+
golang.org/x/sys v0.38.0 // indirect
207207
golang.org/x/term v0.36.0 // indirect
208208
golang.org/x/text v0.30.0 // indirect
209209
golang.org/x/time v0.13.0 // indirect
210-
google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 // indirect
211-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
210+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 // indirect
211+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
212212
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
213213
gopkg.in/inf.v0 v0.9.1 // indirect
214-
k8s.io/api v0.34.1 // indirect
214+
k8s.io/api v0.34.2 // indirect
215215
k8s.io/component-base v0.33.0 // indirect
216216
k8s.io/klog/v2 v2.130.1 // indirect
217217
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect

‎go.sum‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKe
175175
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
176176
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
177177
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
178-
github.com/ianlancetaylor/demangle v0.0.0-20250628045327-2d64ad6b7ec5 h1:QCtizt3VTaANvnsd8TtD/eonx7JLIVdEKW1//ZNPZ9A=
179-
github.com/ianlancetaylor/demangle v0.0.0-20250628045327-2d64ad6b7ec5/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
178+
github.com/ianlancetaylor/demangle v0.0.0-20251118225945-96ee0021ea0f h1:Fnl4pzx8SR7k7JuzyW8lEtSFH6EQ8xgcypgIn8pcGIE=
179+
github.com/ianlancetaylor/demangle v0.0.0-20251118225945-96ee0021ea0f/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
180180
github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
181181
github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
182182
github.com/jsimonetti/rtnetlink/v2 v2.0.1 h1:xda7qaHDSVOsADNouv7ukSuicKZO7GgVUCXxpaIEIlM=
@@ -285,16 +285,16 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
285285
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
286286
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
287287
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
288-
github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4=
289-
github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4=
290-
github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso=
291-
github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ=
288+
github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
289+
github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
290+
github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
291+
github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
292292
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
293293
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
294294
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
295295
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
296-
github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE=
297-
github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
296+
github.com/vektah/gqlparser/v2 v2.5.31 h1:YhWGA1mfTjID7qJhd1+Vxhpk5HTgydrGU9IgkWBTJ7k=
297+
github.com/vektah/gqlparser/v2 v2.5.31/go.mod h1:c1I28gSOVNzlfc4WuDlqU7voQnsqI6OG2amkBAFmgts=
298298
github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0=
299299
github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
300300
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
@@ -457,8 +457,8 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
457457
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
458458
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
459459
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
460-
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
461-
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
460+
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
461+
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
462462
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
463463
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
464464
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
@@ -479,10 +479,10 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
479479
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
480480
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
481481
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
482-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
483-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
484-
golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
485-
golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
482+
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 h1:6/3JGEh1C88g7m+qzzTbl3A0FtsLguXieqofVLU/JAo=
483+
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
484+
golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
485+
golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
486486
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
487487
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
488488
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -498,8 +498,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
498498
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
499499
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
500500
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
501-
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
502-
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
501+
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
502+
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
503503
golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
504504
golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
505505
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -520,12 +520,12 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
520520
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
521521
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
522522
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
523-
google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9 h1:jm6v6kMRpTYKxBRrDkYAitNJegUeO1Mf3Kt80obv0gg=
524-
google.golang.org/genproto/googleapis/api v0.0.0-20250922171735-9219d122eba9/go.mod h1:LmwNphe5Afor5V3R5BppOULHOnt2mCIf+NxMd4XiygE=
525-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 h1:V1jCN2HBa8sySkR5vLcCSqJSTMv093Rw9EJefhQGP7M=
526-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ=
527-
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
528-
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
523+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8 h1:mepRgnBZa07I4TRuomDE4sTIYieg/osKmzIf4USdWS4=
524+
google.golang.org/genproto/googleapis/api v0.0.0-20251022142026-3a174f9686a8/go.mod h1:fDMmzKV90WSg1NbozdqrE64fkuTv6mlq2zxo9ad+3yo=
525+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 h1:M1rk8KBnUsBDg1oPGHNCxG4vc1f49epmTO7xscSajMk=
526+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
527+
google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM=
528+
google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig=
529529
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
530530
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
531531
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -539,14 +539,14 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
539539
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
540540
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
541541
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
542-
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
543-
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
542+
k8s.io/api v0.34.2 h1:fsSUNZhV+bnL6Aqrp6O7lMTy6o5x2C4XLjnh//8SLYY=
543+
k8s.io/api v0.34.2/go.mod h1:MMBPaWlED2a8w4RSeanD76f7opUoypY8TFYkSM+3XHw=
544544
k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs=
545545
k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc=
546-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
547-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
548-
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
549-
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
546+
k8s.io/apimachinery v0.34.2 h1:zQ12Uk3eMHPxrsbUJgNF8bTauTVR2WgqJsTmwTE/NW4=
547+
k8s.io/apimachinery v0.34.2/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
548+
k8s.io/client-go v0.34.2 h1:Co6XiknN+uUZqiddlfAjT68184/37PS4QAzYvQvDR8M=
549+
k8s.io/client-go v0.34.2/go.mod h1:2VYDl1XXJsdcAxw7BenFslRQX28Dxz91U9MWKjX97fE=
550550
k8s.io/component-base v0.33.0 h1:Ot4PyJI+0JAD9covDhwLp9UNkUja209OzsJ4FzScBNk=
551551
k8s.io/component-base v0.33.0/go.mod h1:aXYZLbw3kihdkOPMDhWbjGCO6sg+luw554KP51t8qCU=
552552
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

‎internal/test/integration/components/elasticsearch/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080
2-
FROM python:3.12@sha256:3466e9a530f0226fc09fbc479bde2387fd773f760749612e94d8696fe1aa5877
2+
FROM python:3.14@sha256:595140b768992c05b096570e5ae487a02a2c6b3ae23ba33ce0fc34b99579c98e
33
EXPOSE 8080
44
RUN apt update
55
RUN pip install fastapi uvicorn requests

‎internal/test/integration/components/nodeclient/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM node:20-slim@sha256:cba1d7bb8433bb920725193cd7d95d09688fb110b170406f7d4de94
44
WORKDIR /
55

66
# Copy the source code into the image for building
7-
COPY internal/test/integration/components/nodeclient/client* .
7+
COPY internal/test/integration/components/nodeclient/client* .
88

99
# Run the node app
1010
CMD [ "node", "client.js" ]

‎internal/test/integration/components/nodejsserver/app.js‎

Lines changed: 115 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,142 @@
11
var express = require("express");
2-
const http = require('http');
2+
const http = require("http");
3+
const https = require("https");
34
var app = express();
45
const port = 3030;
56

6-
app.use(express.json({limit: "50mb"}));
7+
app.use(express.json({ limit: "50mb" }));
78

89
app.get("/greeting", (req, res, next) => {
9-
res.json("Hello!");
10+
res.json("Hello!");
1011
});
1112

1213
app.post("/greeting", (req, res, next) => {
13-
res.json(req.body);
14+
res.json(req.body);
1415
});
1516

1617
app.get("/bye", (req, res, next) => {
17-
res.json("Goodbye!");
18+
res.json("Goodbye!");
1819
});
1920

2021
app.post("/bye", (req, res, next) => {
21-
res.json(req.body);
22+
res.json(req.body);
2223
});
2324

2425
app.get("/smoke", (req, res, next) => {
25-
res.sendStatus(200)
26+
res.sendStatus(200);
2627
});
2728

29+
app.get("/users/:userId", (req, res, next) => {
30+
res.json("Hello! " + req.params.userId);
31+
});
32+
33+
2834
app.get("/dist", (req, res, next) => {
29-
http.get('http://grafana.com', {}, (r) => {
30-
if (r.statusCode !== 301) {
31-
console.error(`Did not get an OK from the server. Code: ${r.statusCode}`);
32-
res.sendStatus(500)
33-
return
34-
}
35-
res.sendStatus(200)
36-
});
37-
})
35+
http.get("http://grafana.com", {}, (r) => {
36+
if (r.statusCode !== 301) {
37+
console.error(`Did not get an OK from the server. Code: ${r.statusCode}`);
38+
res.sendStatus(500);
39+
return;
40+
}
41+
res.sendStatus(200);
42+
});
43+
});
3844

3945
app.get("/traceme", (req, res, next) => {
40-
http.get('http://testserver:8080/gotracemetoo', {}, (r) => {
41-
if (r.statusCode !== 200) {
42-
console.error(`Did not get an OK from the server. Code: ${r.statusCode}`);
43-
res.sendStatus(500)
44-
return
46+
http.get("http://testserver:8080/gotracemetoo", {}, (r) => {
47+
if (r.statusCode !== 200) {
48+
console.error(`Did not get an OK from the server. Code: ${r.statusCode}`);
49+
res.sendStatus(500);
50+
return;
51+
}
52+
res.sendStatus(200);
53+
});
54+
});
55+
56+
// Helper function to make HTTPS requests
57+
function makeHttpsRequest(hostname, path) {
58+
return new Promise((resolve, reject) => {
59+
const options = {
60+
hostname: hostname,
61+
path: path,
62+
method: "GET",
63+
timeout: 10000,
64+
headers: {
65+
"User-Agent": "OBI-APM-Test/1.0.0",
66+
},
67+
};
68+
69+
const req = https.request(options, (res) => {
70+
let data = "";
71+
72+
res.on("data", (chunk) => {
73+
data += chunk;
74+
});
75+
76+
res.on("end", () => {
77+
try {
78+
const jsonData = JSON.parse(data);
79+
resolve(jsonData);
80+
} catch (parseError) {
81+
resolve({ raw: data, statusCode: res.statusCode });
4582
}
46-
res.sendStatus(200)
83+
});
4784
});
48-
})
85+
86+
req.on("error", (error) => {
87+
reject(error);
88+
});
89+
90+
req.on("timeout", () => {
91+
req.destroy();
92+
reject(new Error("Request timeout"));
93+
});
94+
95+
req.end();
96+
});
97+
}
98+
99+
app.get("/api/test-apm", async (req, res) => {
100+
const results = {
101+
message: "APM test completed - external API calls made for tracing",
102+
Api: { status: "unknown", success: false, data: null },
103+
SecondApi: { status: "unknown", success: false, data: null },
104+
};
105+
106+
try {
107+
// Call first external API with a lot of data
108+
try {
109+
const firstResponse = await makeHttpsRequest("opentelemetry.io", "/");
110+
results.Api.status = "success";
111+
results.Api.success = true;
112+
results.Api.data = firstResponse;
113+
} catch (error) {
114+
results.Api.status = `error: ${error.message}`;
115+
results.Api.success = false;
116+
}
117+
118+
// Call second external API with a lot of data
119+
try {
120+
const secondResponse = await makeHttpsRequest("www.cncf.io", "/");
121+
results.SecondApi.status = "success";
122+
results.SecondApi.success = true;
123+
results.SecondApi.data = secondResponse;
124+
} catch (error) {
125+
results.SecondApi.status = `error: ${error.message}`;
126+
results.SecondApi.success = false;
127+
}
128+
129+
res.json(results);
130+
} catch (error) {
131+
console.error("APM test error:", error);
132+
res.status(500).json({
133+
message: "APM test failed",
134+
error: error.message,
135+
...results,
136+
});
137+
}
138+
});
49139

50140
app.listen(port, () => {
51-
console.log("Server running on port " + port);
52-
});
141+
console.log("Server running on port " + port);
142+
});

‎internal/test/integration/components/nodemultiproc/service.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const app = express();
77
* CLI Usage:
88
* node service.js <route> <port> [upstreamURL]
99
*/
10-
const [route = 'a', port = 5001, upstream] = process.argv.slice(2);
10+
const [route = 'a', port = 5000, upstream] = process.argv.slice(2);
1111

1212
app.get(`/${route}`, async (req, res) => {
1313
if (upstream) {

‎internal/test/integration/components/pythonawsclient/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12@sha256:de96c54f25e2d69597a72bd3309d723110e59586845c5675c8cb83afb808af18
1+
FROM python:3.14@sha256:595140b768992c05b096570e5ae487a02a2c6b3ae23ba33ce0fc34b99579c98e
22
EXPOSE 8080
33
RUN pip install boto3 fastapi uvicorn
44
COPY main.py /main.py

‎internal/test/integration/components/pythongraphql/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.12@sha256:de96c54f25e2d69597a72bd3309d723110e59586845c5675c8cb83afb808af18
1+
FROM python:3.14@sha256:595140b768992c05b096570e5ae487a02a2c6b3ae23ba33ce0fc34b99579c98e
22
EXPOSE 8080
33
RUN pip install ariadne fastapi uvicorn
44
COPY main.py /main.py

‎internal/test/integration/components/pythongrpc/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile that will build a container that runs python with FastAPI and uvicorn on port 8080
2-
FROM python:3.12@sha256:872565c5ac89cafbab19419c699d80bda96e9d0f47a4790e5229bd3aeeeb5da9
2+
FROM python:3.14@sha256:595140b768992c05b096570e5ae487a02a2c6b3ae23ba33ce0fc34b99579c98e
33
EXPOSE 8080
44
RUN pip install fastapi uvicorn grpcio grpcio_tools
55
COPY main.py /main.py

0 commit comments

Comments
 (0)