output opentelemetry: move to using the in k6 code

grafana · Feb 20, 2025 · 72b7884 · 72b7884
1 parent 6f7f6b0
commit 72b7884
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 1,520 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,6 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b
 	github.com/grafana/xk6-dashboard v0.7.5
-	github.com/grafana/xk6-output-opentelemetry v0.3.0
 	github.com/grafana/xk6-redis v0.3.3
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/influxdata/influxdb1-client v0.0.0-20190402204710-8ff2fc3824fc
@@ -41,11 +40,16 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/tidwall/gjson v1.18.0
 	go.opentelemetry.io/otel v1.32.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.29.0
+	go.opentelemetry.io/otel/metric v1.32.0
 	go.opentelemetry.io/otel/sdk v1.32.0
+	go.opentelemetry.io/otel/sdk/metric v1.32.0
 	go.opentelemetry.io/otel/trace v1.32.0
+	go.opentelemetry.io/proto/otlp v1.3.1
 	go.uber.org/goleak v1.3.0
 	golang.org/x/crypto v0.33.0
 	golang.org/x/crypto/x509roots/fallback v0.0.0-20250210163342-e47973b1c108
@@ -88,11 +92,6 @@ require (
 	github.com/redis/go-redis/v9 v9.0.5 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.32.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect

diff --git a/go.sum b/go.sum
@@ -85,8 +85,6 @@ github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b h1:hzfIt1lf19Zx1jIYd
 github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b/go.mod h1:FmcutBFPLiGgroH42I4/HBahv7GxVjODcVWFTw1ISes=
 github.com/grafana/xk6-dashboard v0.7.5 h1:TcILyffT/Ea/XD7xG1jMA5lwtusOPRbEQsQDHmO30Mk=
 github.com/grafana/xk6-dashboard v0.7.5/go.mod h1:Y75F8xmgCraKT+pBzFH6me9AyH5PkXD+Bxo1dm6Il/M=
-github.com/grafana/xk6-output-opentelemetry v0.3.0 h1:dmclGBFtFVRJijqLncpu2dKVIIvx1GS3y6sQGg4Khl8=
-github.com/grafana/xk6-output-opentelemetry v0.3.0/go.mod h1:5uUg0J2dxrw+DkC9fCsfiKv2jTpccn7nz6vGmRUr4f8=
 github.com/grafana/xk6-redis v0.3.3 h1:9QiS4OUjYMzvriGzbqrhCn9i/kENmCkibZE+xCJSdPk=
 github.com/grafana/xk6-redis v0.3.3/go.mod h1:YL1qfBZXW4o2aAF6/gRa/N9oGoumUg7cJzzCHLxoCOw=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=

diff --git a/internal/cmd/outputs.go b/internal/cmd/outputs.go
@@ -11,13 +11,13 @@ import (
 	"go.k6.io/k6/internal/output/cloud"
 	"go.k6.io/k6/internal/output/influxdb"
 	"go.k6.io/k6/internal/output/json"
+	"go.k6.io/k6/internal/output/opentelemetry"
 	"go.k6.io/k6/internal/output/prometheusrw/remotewrite"
 	"go.k6.io/k6/lib"
 	"go.k6.io/k6/output"
 	"go.k6.io/k6/output/csv"
 
 	"github.com/grafana/xk6-dashboard/dashboard"
-	"github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry"
 )
 
 // builtinOutput marks the available builtin outputs.

diff --git a/...ntelemetry/pkg/opentelemetry/attribute.go → internal/output/opentelemetry/attribute.go b/...ntelemetry/pkg/opentelemetry/attribute.go → internal/output/opentelemetry/attribute.go
diff --git a/...opentelemetry/pkg/opentelemetry/config.go → internal/output/opentelemetry/config.go b/...opentelemetry/pkg/opentelemetry/config.go → internal/output/opentelemetry/config.go
diff --git a/...elemetry/pkg/opentelemetry/config_test.go → internal/output/opentelemetry/config_test.go b/...elemetry/pkg/opentelemetry/config_test.go → internal/output/opentelemetry/config_test.go
diff --git a/...entelemetry/pkg/opentelemetry/exporter.go → internal/output/opentelemetry/exporter.go b/...entelemetry/pkg/opentelemetry/exporter.go → internal/output/opentelemetry/exporter.go
diff --git a/...opentelemetry/pkg/opentelemetry/output.go → internal/output/opentelemetry/output.go b/...opentelemetry/pkg/opentelemetry/output.go → internal/output/opentelemetry/output.go
diff --git a/...elemetry/pkg/opentelemetry/output_test.go → internal/output/opentelemetry/output_test.go b/...elemetry/pkg/opentelemetry/output_test.go → internal/output/opentelemetry/output_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.k6.io/k6/lib/testutils"
+	"go.k6.io/k6/internal/lib/testutils"
 	"go.k6.io/k6/metrics"
 	"go.k6.io/k6/output"
 	collectormetrics "go.opentelemetry.io/proto/otlp/collector/metrics/v1"

diff --git a/...entelemetry/pkg/opentelemetry/registry.go → internal/output/opentelemetry/registry.go b/...entelemetry/pkg/opentelemetry/registry.go → internal/output/opentelemetry/registry.go
diff --git a/...ut/opentelemetry/pkg/opentelemetry/tls.go → internal/output/opentelemetry/tls.go b/...ut/opentelemetry/pkg/opentelemetry/tls.go → internal/output/opentelemetry/tls.go
diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/LICENSE b/vendor/github.com/grafana/xk6-output-opentelemetry/LICENSE
diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/attribute.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/attribute.go
diff --git a/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/config.go b/vendor/github.com/grafana/xk6-output-opentelemetry/pkg/opentelemetry/config.go