diff --git a/README.md b/README.md index aa315fb..dcf1ec8 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,8 @@ Compatibility | `otelsql` | `go.opentelemetry.io/otel/trace` | `go.opentelemetry.io/otel/sdk/metric` | |:--------------------------:|:--------------------------------:|:-------------------------------------:| -| `v0.7.*`   | `v1.11.1` ~> `latest` | `v0.33.0` ~> `latest` | +| `v0.8.*`   | `v1.12.0` ~> `latest` | `v0.35.0` ~> `latest` | +| `v0.7.*`   | `v1.11.1` ~> `latest` | `v0.33.0` ~> `v0.34.x` | | `v0.6.*`   | `v1.10.0` ~> `latest` | `v0.32.x` | | `v0.5.*`   | `v1.10.0` ~> `latest` | `v0.31.x` | | `v0.4.*` 1 | `v1.9.0` ~> `latest` | `v0.31.x` | diff --git a/begin_internal_test.go b/begin_internal_test.go index 8240fbc..83d651f 100644 --- a/begin_internal_test.go +++ b/begin_internal_test.go @@ -17,10 +17,10 @@ import ( func BenchmarkBeginStats(b *testing.B) { meter := metric.NewNoopMeter() - histogram, err := meter.SyncFloat64().Histogram("latency_ms") + histogram, err := meter.Float64Histogram("latency_ms") require.NoError(b, err) - count, err := meter.SyncInt64().Counter("calls") + count, err := meter.Int64Counter("calls") require.NoError(b, err) r := newMethodRecorder(histogram.Record, count.Add, @@ -183,10 +183,10 @@ func TestBeginStats(t *testing.T) { Run(t, func(s oteltest.SuiteContext) { meter := s.MeterProvider().Meter("begin_test") - histogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs) + histogram, err := meter.Float64Histogram(dbSQLClientLatencyMs) require.NoError(t, err) - count, err := meter.SyncInt64().Counter(dbSQLClientCalls) + count, err := meter.Int64Counter(dbSQLClientCalls) require.NoError(t, err) r := newMethodRecorder(histogram.Record, count.Add, diff --git a/driver.go b/driver.go index c3a1131..de2566b 100644 --- a/driver.go +++ b/driver.go @@ -132,13 +132,13 @@ func newConnConfig(opts driverOptions) connConfig { traceWithSpanNameFormatter(opts.trace.spanNameFormatter), ) - latencyMsHistogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs, + latencyMsHistogram, err := meter.Float64Histogram(dbSQLClientLatencyMs, instrument.WithUnit(unit.Milliseconds), instrument.WithDescription(`The distribution of latencies of various calls in milliseconds`), ) handleErr(err) - callsCounter, err := meter.SyncInt64().Counter(dbSQLClientCalls, + callsCounter, err := meter.Int64Counter(dbSQLClientCalls, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription(`The number of various calls of methods`), ) diff --git a/exec_internal_test.go b/exec_internal_test.go index 783f35c..e743b9f 100644 --- a/exec_internal_test.go +++ b/exec_internal_test.go @@ -17,10 +17,10 @@ import ( func BenchmarkExecStats(b *testing.B) { meter := metric.NewNoopMeter() - histogram, err := meter.SyncFloat64().Histogram("latency_ms") + histogram, err := meter.Float64Histogram("latency_ms") require.NoError(b, err) - count, err := meter.SyncInt64().Counter("calls") + count, err := meter.Int64Counter("calls") require.NoError(b, err) r := newMethodRecorder(histogram.Record, count.Add, @@ -157,10 +157,10 @@ func TestExecStats(t *testing.T) { Run(t, func(s oteltest.SuiteContext) { meter := s.MeterProvider().Meter("exec_test") - histogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs) + histogram, err := meter.Float64Histogram(dbSQLClientLatencyMs) require.NoError(t, err) - count, err := meter.SyncInt64().Counter(dbSQLClientCalls) + count, err := meter.Int64Counter(dbSQLClientCalls) require.NoError(t, err) r := newMethodRecorder(histogram.Record, count.Add, diff --git a/go.mod b/go.mod index 7bb89f6..b019523 100644 --- a/go.mod +++ b/go.mod @@ -6,13 +6,13 @@ require ( github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/stretchr/testify v1.8.1 github.com/swaggest/assertjson v1.7.0 - go.opentelemetry.io/otel v1.11.2 - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 - go.opentelemetry.io/otel/metric v0.34.0 - go.opentelemetry.io/otel/sdk v1.11.2 - go.opentelemetry.io/otel/sdk/metric v0.34.0 - go.opentelemetry.io/otel/trace v1.11.2 + go.opentelemetry.io/otel v1.12.0 + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 + go.opentelemetry.io/otel/metric v0.35.0 + go.opentelemetry.io/otel/sdk v1.12.0 + go.opentelemetry.io/otel/sdk/metric v0.35.0 + go.opentelemetry.io/otel/trace v1.12.0 ) require ( diff --git a/go.sum b/go.sum index 817f4a6..b9a7095 100644 --- a/go.sum +++ b/go.sum @@ -50,20 +50,20 @@ github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FB github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M= github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= github.com/yudai/pp v2.0.1+incompatible h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcmawg5bI= -go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= -go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0 h1:O1E9/qhspQSz3O6/dSGLNBND2TO9mUaSvlhcKJMv278= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0/go.mod h1:Id0oYi2ARij/um3gFV+t5rH1MTFdJpfTimsFsqKS7pE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2/go.mod h1:bx//lU66dPzNT+Y0hHA12ciKoMOH9iixEwCqC1OeQWQ= -go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8= -go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= -go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU= -go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= -go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo= -go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ= -go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= -go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= +go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0 h1:4ItSNqXDmuPiYGIENWD2jeJECQRXwWxb3/HoSfKsa6U= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0/go.mod h1:k/PEzF9FAu3Do2qFOaqF6F5rVy7Z0idyYtWKSbS8vRo= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 h1:FXwvCIXsrMas/reQkSUTPZVCqud1yDy441acn4Fdu6w= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0/go.mod h1:TTDkohPFSX4LMcbmNMYDh0hMXV8YigEjw5WwD+nDn6U= +go.opentelemetry.io/otel/metric v0.35.0 h1:aPT5jk/w7F9zW51L7WgRqNKDElBdyRLGuBtI5MX34e8= +go.opentelemetry.io/otel/metric v0.35.0/go.mod h1:qAcbhaTRFU6uG8QM7dDo7XvFsWcugziq/5YI065TokQ= +go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= +go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= +go.opentelemetry.io/otel/sdk/metric v0.35.0 h1:gryV4W5GzpOhKK48/lZb8ldyWIs3DRugSVlQZmCwELA= +go.opentelemetry.io/otel/sdk/metric v0.35.0/go.mod h1:eDyp1GxSiwV98kr7w4pzrszQh/eze9MqBqPd2bCPmyE= +go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= +go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/ping_internal_test.go b/ping_internal_test.go index ad68d6a..57ce391 100644 --- a/ping_internal_test.go +++ b/ping_internal_test.go @@ -16,10 +16,10 @@ import ( func BenchmarkPingStats(b *testing.B) { meter := metric.NewNoopMeter() - histogram, err := meter.SyncFloat64().Histogram("latency_ms") + histogram, err := meter.Float64Histogram("latency_ms") require.NoError(b, err) - count, err := meter.SyncInt64().Counter("calls") + count, err := meter.Int64Counter("calls") require.NoError(b, err) r := newMethodRecorder(histogram.Record, count.Add, @@ -144,10 +144,10 @@ func TestPingStats(t *testing.T) { Run(t, func(s oteltest.SuiteContext) { meter := s.MeterProvider().Meter("ping_test") - histogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs) + histogram, err := meter.Float64Histogram(dbSQLClientLatencyMs) require.NoError(t, err) - count, err := meter.SyncInt64().Counter(dbSQLClientCalls) + count, err := meter.Int64Counter(dbSQLClientCalls) require.NoError(t, err) r := newMethodRecorder(histogram.Record, count.Add, diff --git a/prepare_internal_test.go b/prepare_internal_test.go index 92a870f..2b32922 100644 --- a/prepare_internal_test.go +++ b/prepare_internal_test.go @@ -17,10 +17,10 @@ import ( func BenchmarkPrepareStats(b *testing.B) { meter := metric.NewNoopMeter() - histogram, err := meter.SyncFloat64().Histogram("latency_ms") + histogram, err := meter.Float64Histogram("latency_ms") require.NoError(b, err) - count, err := meter.SyncInt64().Counter("calls") + count, err := meter.Int64Counter("calls") require.NoError(b, err) r := newMethodRecorder(histogram.Record, count.Add, @@ -183,10 +183,10 @@ func TestPrepareStats(t *testing.T) { Run(t, func(s oteltest.SuiteContext) { meter := s.MeterProvider().Meter("prepare_test") - histogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs) + histogram, err := meter.Float64Histogram(dbSQLClientLatencyMs) require.NoError(t, err) - count, err := meter.SyncInt64().Counter(dbSQLClientCalls) + count, err := meter.Int64Counter(dbSQLClientCalls) require.NoError(t, err) r := newMethodRecorder(histogram.Record, count.Add, diff --git a/query_internal_test.go b/query_internal_test.go index ee90496..0e16b08 100644 --- a/query_internal_test.go +++ b/query_internal_test.go @@ -17,10 +17,10 @@ import ( func BenchmarkQueryStats(b *testing.B) { meter := metric.NewNoopMeter() - histogram, err := meter.SyncFloat64().Histogram("latency_ms") + histogram, err := meter.Float64Histogram("latency_ms") require.NoError(b, err) - count, err := meter.SyncInt64().Counter("calls") + count, err := meter.Int64Counter("calls") require.NoError(b, err) r := newMethodRecorder(histogram.Record, count.Add, @@ -157,10 +157,10 @@ func TestQueryStats(t *testing.T) { Run(t, func(s oteltest.SuiteContext) { meter := s.MeterProvider().Meter("query_test") - histogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs) + histogram, err := meter.Float64Histogram(dbSQLClientLatencyMs) require.NoError(t, err) - count, err := meter.SyncInt64().Counter(dbSQLClientCalls) + count, err := meter.Int64Counter(dbSQLClientCalls) require.NoError(t, err) r := newMethodRecorder(histogram.Record, count.Add, diff --git a/stats.go b/stats.go index ff925df..5e12096 100644 --- a/stats.go +++ b/stats.go @@ -11,8 +11,6 @@ import ( "go.opentelemetry.io/otel/metric" "go.opentelemetry.io/otel/metric/global" "go.opentelemetry.io/otel/metric/instrument" - "go.opentelemetry.io/otel/metric/instrument/asyncfloat64" - "go.opentelemetry.io/otel/metric/instrument/asyncint64" "go.opentelemetry.io/otel/metric/unit" ) @@ -55,13 +53,13 @@ func recordStats( var ( err error - openConnections asyncint64.Gauge - idleConnections asyncint64.Gauge - activeConnections asyncint64.Gauge - waitCount asyncint64.Gauge - waitDuration asyncfloat64.Gauge - idleClosed asyncint64.Gauge - lifetimeClosed asyncint64.Gauge + openConnections instrument.Int64ObservableGauge + idleConnections instrument.Int64ObservableGauge + activeConnections instrument.Int64ObservableGauge + waitCount instrument.Int64ObservableGauge + waitDuration instrument.Float64ObservableGauge + idleClosed instrument.Int64ObservableGauge + lifetimeClosed instrument.Int64ObservableGauge dbStats sql.DBStats lastDBStats time.Time @@ -73,64 +71,56 @@ func recordStats( lock.Lock() defer lock.Unlock() - openConnections, err = meter.AsyncInt64().Gauge( + openConnections, err = meter.Int64ObservableGauge( dbSQLConnectionsOpen, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription("Count of open connections in the pool"), ) otel.Handle(err) - idleConnections, err = meter.AsyncInt64().Gauge( + idleConnections, err = meter.Int64ObservableGauge( dbSQLConnectionsIdle, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription("Count of idle connections in the pool"), ) otel.Handle(err) - activeConnections, err = meter.AsyncInt64().Gauge( + activeConnections, err = meter.Int64ObservableGauge( dbSQLConnectionsActive, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription("Count of active connections in the pool"), ) otel.Handle(err) - waitCount, err = meter.AsyncInt64().Gauge( + waitCount, err = meter.Int64ObservableGauge( dbSQLConnectionsWaitCount, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription("The total number of connections waited for"), ) otel.Handle(err) - waitDuration, err = meter.AsyncFloat64().Gauge( + waitDuration, err = meter.Float64ObservableGauge( dbSQLConnectionsWaitDuration, instrument.WithUnit(unit.Milliseconds), instrument.WithDescription("The total time blocked waiting for a new connection"), ) otel.Handle(err) - idleClosed, err = meter.AsyncInt64().Gauge( + idleClosed, err = meter.Int64ObservableGauge( dbSQLConnectionsIdleClosed, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription("The total number of connections closed due to SetMaxIdleConns"), ) otel.Handle(err) - lifetimeClosed, err = meter.AsyncInt64().Gauge( + lifetimeClosed, err = meter.Int64ObservableGauge( dbSQLConnectionsLifetimeClosed, instrument.WithUnit(unit.Dimensionless), instrument.WithDescription("The total number of connections closed due to SetConnMaxLifetime"), ) otel.Handle(err) - return meter.RegisterCallback([]instrument.Asynchronous{ - openConnections, - idleConnections, - activeConnections, - waitCount, - waitDuration, - idleClosed, - lifetimeClosed, - }, func(ctx context.Context) { + _, err = meter.RegisterCallback(func(ctx context.Context, obs metric.Observer) error { lock.Lock() defer lock.Unlock() @@ -140,12 +130,24 @@ func recordStats( lastDBStats = now } - openConnections.Observe(ctx, int64(dbStats.OpenConnections), attrs...) - idleConnections.Observe(ctx, int64(dbStats.Idle), attrs...) - activeConnections.Observe(ctx, int64(dbStats.InUse), attrs...) - waitCount.Observe(ctx, dbStats.WaitCount, attrs...) - waitDuration.Observe(ctx, float64(dbStats.WaitDuration.Nanoseconds())/1e6, attrs...) - idleClosed.Observe(ctx, dbStats.MaxIdleClosed, attrs...) - lifetimeClosed.Observe(ctx, dbStats.MaxLifetimeClosed, attrs...) - }) + obs.ObserveInt64(openConnections, int64(dbStats.OpenConnections), attrs...) + obs.ObserveInt64(idleConnections, int64(dbStats.Idle), attrs...) + obs.ObserveInt64(activeConnections, int64(dbStats.InUse), attrs...) + obs.ObserveInt64(waitCount, dbStats.WaitCount, attrs...) + obs.ObserveFloat64(waitDuration, float64(dbStats.WaitDuration.Nanoseconds())/1e6, attrs...) + obs.ObserveInt64(idleClosed, dbStats.MaxIdleClosed, attrs...) + obs.ObserveInt64(lifetimeClosed, dbStats.MaxLifetimeClosed, attrs...) + + return nil + }, + openConnections, + idleConnections, + activeConnections, + waitCount, + waitDuration, + idleClosed, + lifetimeClosed, + ) + + return err } diff --git a/tests/mssql/go.mod b/tests/mssql/go.mod index be2b5bb..3880dc9 100644 --- a/tests/mssql/go.mod +++ b/tests/mssql/go.mod @@ -84,12 +84,12 @@ require ( go.nhat.io/otelsql v0.1.0 // indirect go.nhat.io/testcontainers-registry v0.11.0 // indirect go.nhat.io/timeparser v0.3.0 // indirect - go.opentelemetry.io/otel v1.11.2 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.34.0 // indirect - go.opentelemetry.io/otel/metric v0.34.0 // indirect - go.opentelemetry.io/otel/sdk v1.11.2 // indirect - go.opentelemetry.io/otel/sdk/metric v0.34.0 // indirect - go.opentelemetry.io/otel/trace v1.11.2 // indirect + go.opentelemetry.io/otel v1.12.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.35.0 // indirect + go.opentelemetry.io/otel/metric v0.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.12.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.35.0 // indirect + go.opentelemetry.io/otel/trace v1.12.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/crypto v0.4.0 // indirect golang.org/x/mod v0.7.0 // indirect diff --git a/tests/mssql/go.sum b/tests/mssql/go.sum index cf05dfa..f80e5d7 100644 --- a/tests/mssql/go.sum +++ b/tests/mssql/go.sum @@ -1244,33 +1244,33 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.2 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= -go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= +go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= +go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0 h1:L5D+HxdaC/ORB47ribbTBbkXRZs9JzPjq0EoIOMWncM= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0/go.mod h1:6gUoJyfhoWqF0tOLaY0ZmKgkQRcvEQx6p5rVlKHp3s4= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0 h1:O1E9/qhspQSz3O6/dSGLNBND2TO9mUaSvlhcKJMv278= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0 h1:OCWu7Z5W9wNis5aViq+MqRFj2PEFmFhvIHOk32TABM0= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0/go.mod h1:U0tqTnN6hnGiNKKGNN5uPOuhb/3C7gcZuh23d2k9bXc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0 h1:4ItSNqXDmuPiYGIENWD2jeJECQRXwWxb3/HoSfKsa6U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 h1:FXwvCIXsrMas/reQkSUTPZVCqud1yDy441acn4Fdu6w= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8= -go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= +go.opentelemetry.io/otel/metric v0.35.0 h1:aPT5jk/w7F9zW51L7WgRqNKDElBdyRLGuBtI5MX34e8= +go.opentelemetry.io/otel/metric v0.35.0/go.mod h1:qAcbhaTRFU6uG8QM7dDo7XvFsWcugziq/5YI065TokQ= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU= -go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= +go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= +go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo= -go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ= +go.opentelemetry.io/otel/sdk/metric v0.35.0 h1:gryV4W5GzpOhKK48/lZb8ldyWIs3DRugSVlQZmCwELA= +go.opentelemetry.io/otel/sdk/metric v0.35.0/go.mod h1:eDyp1GxSiwV98kr7w4pzrszQh/eze9MqBqPd2bCPmyE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= -go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= +go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/tests/mysql/go.mod b/tests/mysql/go.mod index 889376c..7361486 100644 --- a/tests/mysql/go.mod +++ b/tests/mysql/go.mod @@ -76,12 +76,12 @@ require ( go.nhat.io/otelsql v0.1.0 // indirect go.nhat.io/testcontainers-registry v0.11.0 // indirect go.nhat.io/timeparser v0.3.0 // indirect - go.opentelemetry.io/otel v1.11.2 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.34.0 // indirect - go.opentelemetry.io/otel/metric v0.34.0 // indirect - go.opentelemetry.io/otel/sdk v1.11.2 // indirect - go.opentelemetry.io/otel/sdk/metric v0.34.0 // indirect - go.opentelemetry.io/otel/trace v1.11.2 // indirect + go.opentelemetry.io/otel v1.12.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.35.0 // indirect + go.opentelemetry.io/otel/metric v0.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.12.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.35.0 // indirect + go.opentelemetry.io/otel/trace v1.12.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/mod v0.7.0 // indirect golang.org/x/net v0.4.0 // indirect diff --git a/tests/mysql/go.sum b/tests/mysql/go.sum index 1009451..775e4a4 100644 --- a/tests/mysql/go.sum +++ b/tests/mysql/go.sum @@ -1223,33 +1223,33 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.2 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= -go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= +go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= +go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0 h1:L5D+HxdaC/ORB47ribbTBbkXRZs9JzPjq0EoIOMWncM= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0/go.mod h1:6gUoJyfhoWqF0tOLaY0ZmKgkQRcvEQx6p5rVlKHp3s4= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0 h1:O1E9/qhspQSz3O6/dSGLNBND2TO9mUaSvlhcKJMv278= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0 h1:OCWu7Z5W9wNis5aViq+MqRFj2PEFmFhvIHOk32TABM0= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0/go.mod h1:U0tqTnN6hnGiNKKGNN5uPOuhb/3C7gcZuh23d2k9bXc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0 h1:4ItSNqXDmuPiYGIENWD2jeJECQRXwWxb3/HoSfKsa6U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 h1:FXwvCIXsrMas/reQkSUTPZVCqud1yDy441acn4Fdu6w= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8= -go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= +go.opentelemetry.io/otel/metric v0.35.0 h1:aPT5jk/w7F9zW51L7WgRqNKDElBdyRLGuBtI5MX34e8= +go.opentelemetry.io/otel/metric v0.35.0/go.mod h1:qAcbhaTRFU6uG8QM7dDo7XvFsWcugziq/5YI065TokQ= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU= -go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= +go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= +go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo= -go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ= +go.opentelemetry.io/otel/sdk/metric v0.35.0 h1:gryV4W5GzpOhKK48/lZb8ldyWIs3DRugSVlQZmCwELA= +go.opentelemetry.io/otel/sdk/metric v0.35.0/go.mod h1:eDyp1GxSiwV98kr7w4pzrszQh/eze9MqBqPd2bCPmyE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= -go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= +go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/tests/postgres/go.mod b/tests/postgres/go.mod index 09a5e04..d157804 100644 --- a/tests/postgres/go.mod +++ b/tests/postgres/go.mod @@ -84,12 +84,12 @@ require ( go.nhat.io/otelsql v0.1.0 // indirect go.nhat.io/testcontainers-registry v0.11.0 // indirect go.nhat.io/timeparser v0.3.0 // indirect - go.opentelemetry.io/otel v1.11.2 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.34.0 // indirect - go.opentelemetry.io/otel/metric v0.34.0 // indirect - go.opentelemetry.io/otel/sdk v1.11.2 // indirect - go.opentelemetry.io/otel/sdk/metric v0.34.0 // indirect - go.opentelemetry.io/otel/trace v1.11.2 // indirect + go.opentelemetry.io/otel v1.12.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.35.0 // indirect + go.opentelemetry.io/otel/metric v0.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.12.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.35.0 // indirect + go.opentelemetry.io/otel/trace v1.12.0 // indirect go.uber.org/atomic v1.10.0 // indirect golang.org/x/crypto v0.4.0 // indirect golang.org/x/mod v0.7.0 // indirect diff --git a/tests/postgres/go.sum b/tests/postgres/go.sum index 45e0254..05185a0 100644 --- a/tests/postgres/go.sum +++ b/tests/postgres/go.sum @@ -1249,33 +1249,33 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.2 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= -go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= +go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= +go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0 h1:L5D+HxdaC/ORB47ribbTBbkXRZs9JzPjq0EoIOMWncM= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0/go.mod h1:6gUoJyfhoWqF0tOLaY0ZmKgkQRcvEQx6p5rVlKHp3s4= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0 h1:O1E9/qhspQSz3O6/dSGLNBND2TO9mUaSvlhcKJMv278= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0 h1:OCWu7Z5W9wNis5aViq+MqRFj2PEFmFhvIHOk32TABM0= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0/go.mod h1:U0tqTnN6hnGiNKKGNN5uPOuhb/3C7gcZuh23d2k9bXc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0 h1:4ItSNqXDmuPiYGIENWD2jeJECQRXwWxb3/HoSfKsa6U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 h1:FXwvCIXsrMas/reQkSUTPZVCqud1yDy441acn4Fdu6w= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8= -go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= +go.opentelemetry.io/otel/metric v0.35.0 h1:aPT5jk/w7F9zW51L7WgRqNKDElBdyRLGuBtI5MX34e8= +go.opentelemetry.io/otel/metric v0.35.0/go.mod h1:qAcbhaTRFU6uG8QM7dDo7XvFsWcugziq/5YI065TokQ= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU= -go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= +go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= +go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo= -go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ= +go.opentelemetry.io/otel/sdk/metric v0.35.0 h1:gryV4W5GzpOhKK48/lZb8ldyWIs3DRugSVlQZmCwELA= +go.opentelemetry.io/otel/sdk/metric v0.35.0/go.mod h1:eDyp1GxSiwV98kr7w4pzrszQh/eze9MqBqPd2bCPmyE= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= -go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= +go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/tests/suite/go.mod b/tests/suite/go.mod index 1b93d30..c7088b9 100644 --- a/tests/suite/go.mod +++ b/tests/suite/go.mod @@ -15,11 +15,11 @@ require ( go.nhat.io/otelsql v0.1.0 go.nhat.io/testcontainers-extra v0.9.0 go.nhat.io/testcontainers-registry v0.11.0 - go.opentelemetry.io/otel v1.11.2 - go.opentelemetry.io/otel/exporters/prometheus v0.34.0 - go.opentelemetry.io/otel/metric v0.34.0 - go.opentelemetry.io/otel/sdk v1.11.2 - go.opentelemetry.io/otel/sdk/metric v0.34.0 + go.opentelemetry.io/otel v1.12.0 + go.opentelemetry.io/otel/exporters/prometheus v0.35.0 + go.opentelemetry.io/otel/metric v0.35.0 + go.opentelemetry.io/otel/sdk v1.12.0 + go.opentelemetry.io/otel/sdk/metric v0.35.0 golang.org/x/mod v0.7.0 // indirect golang.org/x/tools v0.4.0 // indirect ) @@ -74,7 +74,7 @@ require ( github.com/yudai/gojsondiff v1.0.0 // indirect github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect go.nhat.io/timeparser v0.3.0 // indirect - go.opentelemetry.io/otel/trace v1.11.2 // indirect + go.opentelemetry.io/otel/trace v1.12.0 // indirect golang.org/x/net v0.4.0 // indirect golang.org/x/sys v0.3.0 // indirect google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect diff --git a/tests/suite/go.sum b/tests/suite/go.sum index fa7b5ee..1ec9ca8 100644 --- a/tests/suite/go.sum +++ b/tests/suite/go.sum @@ -219,20 +219,20 @@ go.nhat.io/testcontainers-registry v0.11.0 h1:JIf/mpBVUe7XvsLNMbABsVD2PJzua0Q3BU go.nhat.io/testcontainers-registry v0.11.0/go.mod h1:DWhOQ0MWIsKZmoTAcveLfxaSon+/lQTTx23vpeBUGEU= go.nhat.io/timeparser v0.3.0 h1:K29FOjYO9OVJUroSl/bb70I/FKT3CJt8APs25Npj5No= go.nhat.io/timeparser v0.3.0/go.mod h1:YdhOZNl64RWdHdNYIHxwDu9edleVBlnrREzddab0tO4= -go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= -go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0 h1:L5D+HxdaC/ORB47ribbTBbkXRZs9JzPjq0EoIOMWncM= -go.opentelemetry.io/otel/exporters/prometheus v0.34.0/go.mod h1:6gUoJyfhoWqF0tOLaY0ZmKgkQRcvEQx6p5rVlKHp3s4= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.34.0 h1:O1E9/qhspQSz3O6/dSGLNBND2TO9mUaSvlhcKJMv278= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2 h1:BhEVgvuE1NWLLuMLvC6sif791F45KFHi5GhOs1KunZU= -go.opentelemetry.io/otel/metric v0.34.0 h1:MCPoQxcg/26EuuJwpYN1mZTeCYAUGx8ABxfW07YkjP8= -go.opentelemetry.io/otel/metric v0.34.0/go.mod h1:ZFuI4yQGNCupurTXCwkeD/zHBt+C2bR7bw5JqUm/AP8= -go.opentelemetry.io/otel/sdk v1.11.2 h1:GF4JoaEx7iihdMFu30sOyRx52HDHOkl9xQ8SMqNXUiU= -go.opentelemetry.io/otel/sdk v1.11.2/go.mod h1:wZ1WxImwpq+lVRo4vsmSOxdd+xwoUJ6rqyLc3SyX9aU= -go.opentelemetry.io/otel/sdk/metric v0.34.0 h1:7ElxfQpXCFZlRTvVRTkcUvK8Gt5DC8QzmzsLsO2gdzo= -go.opentelemetry.io/otel/sdk/metric v0.34.0/go.mod h1:l4r16BIqiqPy5rd14kkxllPy/fOI4tWo1jkpD9Z3ffQ= -go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= -go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= +go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= +go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0 h1:OCWu7Z5W9wNis5aViq+MqRFj2PEFmFhvIHOk32TABM0= +go.opentelemetry.io/otel/exporters/prometheus v0.35.0/go.mod h1:U0tqTnN6hnGiNKKGNN5uPOuhb/3C7gcZuh23d2k9bXc= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.35.0 h1:4ItSNqXDmuPiYGIENWD2jeJECQRXwWxb3/HoSfKsa6U= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.12.0 h1:FXwvCIXsrMas/reQkSUTPZVCqud1yDy441acn4Fdu6w= +go.opentelemetry.io/otel/metric v0.35.0 h1:aPT5jk/w7F9zW51L7WgRqNKDElBdyRLGuBtI5MX34e8= +go.opentelemetry.io/otel/metric v0.35.0/go.mod h1:qAcbhaTRFU6uG8QM7dDo7XvFsWcugziq/5YI065TokQ= +go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= +go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= +go.opentelemetry.io/otel/sdk/metric v0.35.0 h1:gryV4W5GzpOhKK48/lZb8ldyWIs3DRugSVlQZmCwELA= +go.opentelemetry.io/otel/sdk/metric v0.35.0/go.mod h1:eDyp1GxSiwV98kr7w4pzrszQh/eze9MqBqPd2bCPmyE= +go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= +go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= diff --git a/transaction_internal_test.go b/transaction_internal_test.go index a55f827..b6b212e 100644 --- a/transaction_internal_test.go +++ b/transaction_internal_test.go @@ -113,10 +113,10 @@ func TestTxStats(t *testing.T) { Run(t, func(s oteltest.SuiteContext) { meter := s.MeterProvider().Meter("tx_test") - histogram, err := meter.SyncFloat64().Histogram(dbSQLClientLatencyMs) + histogram, err := meter.Float64Histogram(dbSQLClientLatencyMs) require.NoError(t, err) - count, err := meter.SyncInt64().Counter(dbSQLClientCalls) + count, err := meter.Int64Counter(dbSQLClientCalls) require.NoError(t, err) r := newMethodRecorder(histogram.Record, count.Add,