Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update OpenTelemetry #285

Merged
merged 1 commit into from
Sep 27, 2023
Merged

chore: update OpenTelemetry #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,6 @@ jobs:

- name: build
run: >
go install go.opentelemetry.io/collector/cmd/builder@v0.85.0 &&
go install go.opentelemetry.io/collector/cmd/builder@v0.86.0 &&
cd otelcol-influxdb &&
builder --config build.yml
2 changes: 1 addition & 1 deletion common/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

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

require (
Expand Down
4 changes: 2 additions & 2 deletions common/go.sum
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions demo/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
- ./demo/jaeger-ui-config.json:/jaeger-ui-config.json:ro

jaeger-influxdb:
image: jacobmarble/jaeger-influxdb:0.5.2
image: jacobmarble/jaeger-influxdb:0.5.9
stop_grace_period: 10s
environment:
LOG_LEVEL: info
Expand All @@ -46,7 +46,7 @@ services:
JAEGER_AGENT_PORT: 6831

otelcol-influxdb:
image: otel/opentelemetry-collector-contrib:0.85.0
image: otel/opentelemetry-collector-contrib:0.86.0
command: [ "--config", "/config.yml" ]
stop_grace_period: 10s
volumes:
Expand Down
12 changes: 6 additions & 6 deletions influx2otel/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ module github.com/influxdata/influxdb-observability/influx2otel
go 1.19

require (
github.com/influxdata/influxdb-observability/common v0.5.7
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014
go.opentelemetry.io/collector/semconv v0.85.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0015
go.opentelemetry.io/collector/semconv v0.86.0
)

require (
Expand All @@ -25,7 +25,7 @@ require (
golang.org/x/sys v0.12.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.0 // indirect
google.golang.org/grpc v1.58.1 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
22 changes: 11 additions & 11 deletions influx2otel/go.sum
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions jaeger-influxdb/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ go 1.20
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.7
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/influxdata/line-protocol/v2 v2.2.1
github.com/jaegertracing/jaeger v1.49.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-rcv0014
go.opentelemetry.io/collector/semconv v0.85.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0015
go.opentelemetry.io/collector/semconv v0.86.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.25.0
google.golang.org/grpc v1.57.0
google.golang.org/grpc v1.58.1
)

require (
Expand Down Expand Up @@ -65,7 +65,7 @@ require (
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.11.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
16 changes: 8 additions & 8 deletions jaeger-influxdb/go.sum
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions otel2influx/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/influxdata/influxdb-observability/otel2influx
go 1.19

require (
github.com/influxdata/influxdb-observability/common v0.5.7
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/consumer v0.85.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014
go.opentelemetry.io/collector/semconv v0.85.0
go.opentelemetry.io/collector/consumer v0.86.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0015
go.opentelemetry.io/collector/semconv v0.86.0
go.uber.org/multierr v1.11.0
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
)
Expand All @@ -23,8 +23,8 @@ require (
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.57.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.1 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
22 changes: 11 additions & 11 deletions otel2influx/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion otelcol-influxdb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN \
--mount=type=cache,id=influxdb-observability-gocache,sharing=locked,target=/root/.cache/go-build \
--mount=type=cache,id=influxdb-observability-gomodcache,sharing=locked,target=/go/pkg/mod \
du -cshx /root/.cache/go-build /go/pkg/mod && \
go install go.opentelemetry.io/collector/cmd/builder@v0.85.0 && \
go install go.opentelemetry.io/collector/cmd/builder@v0.86.0 && \
du -cshx /root/.cache/go-build /go/pkg/mod

COPY . /project
Expand Down
Loading
Loading