Skip to content

Commit 3298948

Browse files
authored
Consolidate traces receiver with traces SDK (#729)
1 parent 12be43b commit 3298948

File tree

515 files changed

+86591
-1953
lines changed

Some content is hidden

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

515 files changed

+86591
-1953
lines changed

go.mod

+53-19
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,48 @@ require (
1414
github.com/go-logr/logr v1.4.1
1515
github.com/gobwas/glob v0.2.3
1616
github.com/goccy/go-json v0.10.2
17-
github.com/google/uuid v1.4.0
17+
github.com/google/uuid v1.6.0
1818
github.com/gorilla/mux v1.8.1
1919
github.com/grafana/go-offsets-tracker v0.1.7
2020
github.com/hashicorp/golang-lru/v2 v2.0.7
2121
github.com/mariomac/guara v0.0.0-20230621100729-42bd7716e524
2222
github.com/mariomac/pipes v0.10.0
23-
github.com/prometheus/client_golang v1.18.0
24-
github.com/prometheus/client_model v0.5.0
25-
github.com/prometheus/common v0.46.0
23+
github.com/prometheus/client_golang v1.19.0
24+
github.com/prometheus/client_model v0.6.0
25+
github.com/prometheus/common v0.48.0
2626
github.com/prometheus/procfs v0.12.0
2727
github.com/shirou/gopsutil v3.21.11+incompatible
28-
github.com/stretchr/testify v1.8.4
28+
github.com/stretchr/testify v1.9.0
2929
github.com/vishvananda/netlink v1.1.0
3030
github.com/vladimirvivien/gexe v0.2.0
3131
github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2
3232
github.com/yl2chen/cidranger v1.0.2
33-
go.opentelemetry.io/collector/consumer v0.94.1
34-
go.opentelemetry.io/collector/pdata v1.1.0
35-
go.opentelemetry.io/otel v1.23.1
33+
go.opentelemetry.io/collector/component v0.97.0
34+
go.opentelemetry.io/collector/config/configgrpc v0.97.0
35+
go.opentelemetry.io/collector/config/confighttp v0.97.0
36+
go.opentelemetry.io/collector/config/configtelemetry v0.97.0
37+
go.opentelemetry.io/collector/consumer v0.97.0
38+
go.opentelemetry.io/collector/exporter v0.97.0
39+
go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0
40+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.97.0
41+
go.opentelemetry.io/collector/pdata v1.4.0
42+
go.opentelemetry.io/otel v1.24.0
3643
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.23.1
3744
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.23.1
38-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1
39-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1
40-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1
41-
go.opentelemetry.io/otel/metric v1.23.1
42-
go.opentelemetry.io/otel/sdk v1.23.1
43-
go.opentelemetry.io/otel/sdk/metric v1.23.1
44-
go.opentelemetry.io/otel/trace v1.23.1
45+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
46+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
47+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0
48+
go.opentelemetry.io/otel/metric v1.24.0
49+
go.opentelemetry.io/otel/sdk v1.24.0
50+
go.opentelemetry.io/otel/sdk/metric v1.24.0
51+
go.opentelemetry.io/otel/trace v1.24.0
52+
go.uber.org/zap v1.27.0
4553
golang.org/x/arch v0.7.0
54+
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
4655
golang.org/x/mod v0.15.0
4756
golang.org/x/net v0.24.0
4857
golang.org/x/sys v0.19.0
49-
google.golang.org/grpc v1.61.0
58+
google.golang.org/grpc v1.62.1
5059
google.golang.org/protobuf v1.33.0
5160
gopkg.in/yaml.v3 v3.0.1
5261
k8s.io/api v0.29.3
@@ -70,6 +79,8 @@ require (
7079
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
7180
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
7281
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
82+
github.com/felixge/httpsnoop v1.0.4 // indirect
83+
github.com/fsnotify/fsnotify v1.7.0 // indirect
7384
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
7485
github.com/gin-contrib/sse v0.1.0 // indirect
7586
github.com/go-logr/stdr v1.2.2 // indirect
@@ -80,8 +91,10 @@ require (
8091
github.com/go-playground/locales v0.14.1 // indirect
8192
github.com/go-playground/universal-translator v0.18.1 // indirect
8293
github.com/go-playground/validator/v10 v10.14.0 // indirect
94+
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
8395
github.com/gogo/protobuf v1.3.2 // indirect
8496
github.com/golang/protobuf v1.5.4 // indirect
97+
github.com/golang/snappy v0.0.4 // indirect
8598
github.com/google/gnostic-models v0.6.8 // indirect
8699
github.com/google/go-cmp v0.6.0 // indirect
87100
github.com/google/gofuzz v1.2.0 // indirect
@@ -92,36 +105,57 @@ require (
92105
github.com/jmespath/go-jmespath v0.4.0 // indirect
93106
github.com/josharian/intern v1.0.0 // indirect
94107
github.com/json-iterator/go v1.1.12 // indirect
108+
github.com/klauspost/compress v1.17.7 // indirect
95109
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
110+
github.com/knadh/koanf/maps v0.1.1 // indirect
111+
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
112+
github.com/knadh/koanf/v2 v2.1.0 // indirect
96113
github.com/leodido/go-urn v1.2.4 // indirect
97114
github.com/mailru/easyjson v0.7.7 // indirect
98115
github.com/mattn/go-isatty v0.0.19 // indirect
116+
github.com/mitchellh/copystructure v1.2.0 // indirect
117+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
99118
github.com/moby/spdystream v0.2.0 // indirect
100119
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
101120
github.com/modern-go/reflect2 v1.0.2 // indirect
121+
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
102122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
103123
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
104124
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
105125
github.com/pkg/errors v0.9.1 // indirect
106126
github.com/pmezard/go-difflib v1.0.0 // indirect
127+
github.com/rs/cors v1.10.1 // indirect
107128
github.com/spf13/pflag v1.0.5 // indirect
108129
github.com/tklauser/go-sysconf v0.3.13 // indirect
109130
github.com/tklauser/numcpus v0.7.0 // indirect
110131
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
111132
github.com/ugorji/go/codec v1.2.11 // indirect
112133
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
113134
github.com/yusufpapurcu/wmi v1.2.4 // indirect
135+
go.opentelemetry.io/collector v0.97.0 // indirect
136+
go.opentelemetry.io/collector/config/configauth v0.97.0 // indirect
137+
go.opentelemetry.io/collector/config/configcompression v1.4.0 // indirect
138+
go.opentelemetry.io/collector/config/confignet v0.97.0 // indirect
139+
go.opentelemetry.io/collector/config/configopaque v1.4.0 // indirect
140+
go.opentelemetry.io/collector/config/configretry v0.97.0 // indirect
141+
go.opentelemetry.io/collector/config/configtls v0.97.0 // indirect
142+
go.opentelemetry.io/collector/config/internal v0.97.0 // indirect
143+
go.opentelemetry.io/collector/confmap v0.97.0 // indirect
144+
go.opentelemetry.io/collector/extension v0.97.0 // indirect
145+
go.opentelemetry.io/collector/extension/auth v0.97.0 // indirect
146+
go.opentelemetry.io/collector/featuregate v1.4.0 // indirect
147+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
148+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
114149
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
115150
go.uber.org/multierr v1.11.0 // indirect
116151
golang.org/x/crypto v0.22.0 // indirect
117-
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
118152
golang.org/x/oauth2 v0.16.0 // indirect
119153
golang.org/x/term v0.19.0 // indirect
120154
golang.org/x/text v0.14.0 // indirect
121155
golang.org/x/time v0.3.0 // indirect
122156
google.golang.org/appengine v1.6.8 // indirect
123-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
124-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
157+
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
158+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
125159
gopkg.in/inf.v0 v0.9.1 // indirect
126160
gopkg.in/yaml.v2 v2.4.0 // indirect
127161
k8s.io/klog/v2 v2.110.1 // indirect

0 commit comments

Comments
 (0)