Skip to content

Commit 3ee7c33

Browse files
edmocostaedmocosta
committed
Fix iframe compatibility and update dependencies
1 parent 3a147fa commit 3ee7c33

File tree

11 files changed

+224
-260
lines changed

11 files changed

+224
-260
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY Makefile .
66
RUN make build-web
77

88
# Web-assembly and server
9-
FROM golang:1.23 AS wasmbuilder
9+
FROM golang:1.24 AS wasmbuilder
1010
WORKDIR /build
1111
COPY ./ .
1212
RUN make build-wasm
@@ -15,7 +15,7 @@ RUN if [ "$SKIP_BUILD_UNREGISTERED_VERSIONS" = "" ]; then make build-unregistere
1515

1616
# NGINX with brotli
1717
FROM alpine
18-
RUN apk add brotli nginx nginx-mod-http-brotli
18+
RUN apk add brotli nginx
1919
COPY docker/nginx/default.conf /etc/nginx/http.d/default.conf
2020
COPY --from=webbuilder /web/public /usr/share/nginx/html
2121
COPY --from=wasmbuilder /build/web/public/wasm /usr/share/nginx/html/wasm

‎docker/nginx/default.conf‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
server {
2-
location /wasm/ {
3-
brotli_static on;
2+
location ~ ^/wasm/.*\.wasm$ {
3+
add_header Content-Encoding br;
4+
add_header Vary Accept-Encoding;
5+
6+
types { application/wasm br; }
7+
try_files $uri.br =404;
48
}
59

610
listen 8080;

‎go.mod‎

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/ottlplayground
1+
module github.com/elastic/ottl-playground
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.125.0
7-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.125.0
8-
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component v1.31.0
10-
go.opentelemetry.io/collector/component/componenttest v0.125.0
11-
go.opentelemetry.io/collector/confmap v1.31.0
12-
go.opentelemetry.io/collector/consumer v1.31.0
13-
go.opentelemetry.io/collector/pdata v1.31.0
14-
go.opentelemetry.io/collector/processor v1.31.0
6+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.135.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.135.0
8+
github.com/stretchr/testify v1.11.1
9+
go.opentelemetry.io/collector/component v1.41.0
10+
go.opentelemetry.io/collector/component/componenttest v0.135.0
11+
go.opentelemetry.io/collector/confmap v1.41.0
12+
go.opentelemetry.io/collector/consumer v1.41.0
13+
go.opentelemetry.io/collector/pdata v1.41.0
14+
go.opentelemetry.io/collector/processor v1.41.0
1515
go.uber.org/zap v1.27.0
16-
golang.org/x/mod v0.24.0
16+
golang.org/x/mod v0.28.0
1717
)
1818

1919
require (
2020
github.com/alecthomas/participle/v2 v2.1.4 // indirect
2121
github.com/antchfx/xmlquery v1.4.4 // indirect
22-
github.com/antchfx/xpath v1.3.4 // indirect
22+
github.com/antchfx/xpath v1.3.5 // indirect
2323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2525
github.com/elastic/go-grok v0.3.1 // indirect
2626
github.com/elastic/lunes v0.1.0 // indirect
27-
github.com/expr-lang/expr v1.17.2 // indirect
28-
github.com/go-logr/logr v1.4.2 // indirect
27+
github.com/expr-lang/expr v1.17.6 // indirect
28+
github.com/go-logr/logr v1.4.3 // indirect
2929
github.com/go-logr/stdr v1.2.2 // indirect
30-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
30+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3131
github.com/gobwas/glob v0.2.3 // indirect
3232
github.com/goccy/go-json v0.10.5 // indirect
3333
github.com/gogo/protobuf v1.3.2 // indirect
@@ -40,47 +40,46 @@ require (
4040
github.com/json-iterator/go v1.1.12 // indirect
4141
github.com/knadh/koanf/maps v0.1.2 // indirect
4242
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
43-
github.com/knadh/koanf/v2 v2.2.0 // indirect
43+
github.com/knadh/koanf/v2 v2.3.0 // indirect
44+
github.com/lightstep/go-expohisto v1.0.0 // indirect
4445
github.com/magefile/mage v1.15.0 // indirect
4546
github.com/mitchellh/copystructure v1.2.0 // indirect
4647
github.com/mitchellh/reflectwalk v1.0.2 // indirect
4748
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
48-
github.com/modern-go/reflect2 v1.0.2 // indirect
49-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.125.0 // indirect
50-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.125.0 // indirect
51-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.125.0 // indirect
52-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.125.0 // indirect
53-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0 // indirect
49+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
50+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.135.0 // indirect
51+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.135.0 // indirect
52+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.135.0 // indirect
53+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.135.0 // indirect
54+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.135.0 // indirect
5455
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5556
github.com/stretchr/objx v0.5.2 // indirect
5657
github.com/twmb/murmur3 v1.1.8 // indirect
57-
github.com/ua-parser/uap-go v0.0.0-20250326155420-f7f5a2f9f5bc // indirect
58-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
59-
go.opentelemetry.io/collector/featuregate v1.31.0 // indirect
60-
go.opentelemetry.io/collector/internal/telemetry v0.125.0 // indirect
61-
go.opentelemetry.io/collector/pdata/pprofile v0.125.0 // indirect
62-
go.opentelemetry.io/collector/pipeline v0.125.0 // indirect
63-
go.opentelemetry.io/collector/processor/processorhelper v0.125.0 // indirect
64-
go.opentelemetry.io/collector/semconv v0.125.0 // indirect
65-
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
66-
go.opentelemetry.io/otel v1.35.0 // indirect
67-
go.opentelemetry.io/otel/log v0.11.0 // indirect
68-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
69-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
70-
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
71-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
58+
github.com/ua-parser/uap-go v0.0.0-20250917011043-9c86a9b0f8f0 // indirect
59+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
60+
go.opentelemetry.io/collector/consumer/xconsumer v0.135.0 // indirect
61+
go.opentelemetry.io/collector/featuregate v1.41.0 // indirect
62+
go.opentelemetry.io/collector/internal/telemetry v0.135.0 // indirect
63+
go.opentelemetry.io/collector/pdata/pprofile v0.135.0 // indirect
64+
go.opentelemetry.io/collector/pipeline v1.41.0 // indirect
65+
go.opentelemetry.io/collector/processor/processorhelper v0.135.0 // indirect
66+
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.135.0 // indirect
67+
go.opentelemetry.io/collector/processor/xprocessor v0.135.0 // indirect
68+
go.opentelemetry.io/contrib/bridges/otelzap v0.13.0 // indirect
69+
go.opentelemetry.io/otel v1.38.0 // indirect
70+
go.opentelemetry.io/otel/log v0.14.0 // indirect
71+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
72+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
73+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
74+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
7275
go.uber.org/multierr v1.11.0 // indirect
73-
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
74-
golang.org/x/net v0.40.0 // indirect
75-
golang.org/x/sys v0.33.0 // indirect
76-
golang.org/x/text v0.25.0 // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
78-
google.golang.org/grpc v1.72.0 // indirect
79-
google.golang.org/protobuf v1.36.6 // indirect
80-
gopkg.in/yaml.v2 v2.4.0 // indirect
76+
go.yaml.in/yaml/v3 v3.0.4 // indirect
77+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
78+
golang.org/x/net v0.44.0 // indirect
79+
golang.org/x/sys v0.36.0 // indirect
80+
golang.org/x/text v0.29.0 // indirect
81+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250922171735-9219d122eba9 // indirect
82+
google.golang.org/grpc v1.75.1 // indirect
83+
google.golang.org/protobuf v1.36.9 // indirect
8184
gopkg.in/yaml.v3 v3.0.1 // indirect
82-
sigs.k8s.io/yaml v1.4.0 // indirect
8385
)
84-
85-
// IMPORTANT NOTE: Do not add replace statements to this go.mod. This will break go install.
86-
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27855.

0 commit comments

Comments
 (0)