Skip to content

Commit

Permalink
chore: update OpenTelemetry & Jaeger
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobmarble committed Mar 13, 2024
1 parent aaf635b commit 7316644
Show file tree
Hide file tree
Showing 14 changed files with 874 additions and 890 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: [ "1.19", "1.20" ]
go: [ "1.21", "1.22" ]
package: [ "common", "influx2otel", "otel2influx", "jaeger-influxdb", "tests-integration" ]
exclude:
- go: 1.19
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- name: staticcheck
run: >
go install honnef.co/go/tools/cmd/[email protected].3 &&
go install honnef.co/go/tools/cmd/[email protected].7 &&
cd ${{ matrix.package }} &&
staticcheck -f stylish ./...
Expand All @@ -62,6 +62,6 @@ jobs:

- name: build
run: >
go install go.opentelemetry.io/collector/cmd/builder@v0.87.0 &&
go install go.opentelemetry.io/collector/cmd/builder@v0.88.0 &&
cd otelcol-influxdb &&
builder --config build.yml
4 changes: 2 additions & 2 deletions common/go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/influxdata/influxdb-observability/common

go 1.19
go 1.21

require (
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/semconv v0.87.0
go.opentelemetry.io/collector/semconv v0.96.0
)

require (
Expand Down
7 changes: 5 additions & 2 deletions common/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions influx2otel/go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module github.com/influxdata/influxdb-observability/influx2otel

go 1.19
go 1.21

require (
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/pdata v1.0.0-rcv0016
go.opentelemetry.io/collector/semconv v0.87.0
go.opentelemetry.io/collector/pdata v1.3.0
go.opentelemetry.io/collector/semconv v0.96.0
)

require (
Expand All @@ -21,12 +21,12 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
52 changes: 30 additions & 22 deletions influx2otel/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

71 changes: 36 additions & 35 deletions jaeger-influxdb/go.mod
Original file line number Diff line number Diff line change
@@ -1,72 +1,73 @@
module github.com/influxdata/influxdb-observability/jaeger-influxdb

go 1.20
go 1.21

require (
github.com/apache/arrow-adbc/go/adbc v0.6.0
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/influxdata/line-protocol/v2 v2.2.1
github.com/jaegertracing/jaeger v1.50.0
github.com/jaegertracing/jaeger v1.55.0
github.com/mattn/go-isatty v0.0.18
github.com/opentracing/opentracing-go v1.2.0
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.16.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/pdata v1.0.0-rcv0016
go.opentelemetry.io/collector/semconv v0.87.0
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/pdata v1.3.0
go.opentelemetry.io/collector/semconv v0.96.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.26.0
google.golang.org/grpc v1.58.3
go.uber.org/zap v1.27.0
google.golang.org/grpc v1.62.0
)

require (
github.com/apache/arrow/go/v13 v13.0.0 // indirect
github.com/bluele/gcache v0.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fatih/color v1.14.1 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/flatbuffers v23.5.26+incompatible // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-plugin v1.5.2 // indirect
github.com/hashicorp/go-hclog v1.6.2 // indirect
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/compress v1.17.6 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.11.0 // indirect
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.16.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
Loading

0 comments on commit 7316644

Please sign in to comment.