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(deps): update OpenTelemetry and Jaeger #282

Merged
merged 1 commit into from
Sep 22, 2023
Merged

chore(deps): update OpenTelemetry and Jaeger #282

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.84.0 &&
go install go.opentelemetry.io/collector/cmd/builder@v0.85.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.84.0
go.opentelemetry.io/collector/semconv v0.85.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.

2 changes: 1 addition & 1 deletion demo/docker-compose-development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:

jaeger-query:
image: jaegertracing/jaeger-query:1.48
image: jaegertracing/jaeger-query:1.49
stop_grace_period: 10s
ports:
- "16686:16686" # web UI
Expand Down
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
@@ -1,7 +1,7 @@
services:

jaeger-query:
image: jaegertracing/jaeger-query:1.48
image: jaegertracing/jaeger-query:1.49
stop_grace_period: 10s
ports:
- "16686:16686" # web UI
Expand Down Expand Up @@ -46,7 +46,7 @@ services:
JAEGER_AGENT_PORT: 6831

otelcol-influxdb:
image: otel/opentelemetry-collector-contrib:0.84.0
image: otel/opentelemetry-collector-contrib:0.85.0
command: [ "--config", "/config.yml" ]
stop_grace_period: 10s
volumes:
Expand Down
18 changes: 9 additions & 9 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.5
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0
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/stretchr/testify v1.8.4
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014
go.opentelemetry.io/collector/semconv v0.84.0
go.opentelemetry.io/collector/semconv v0.85.0
)

require (
Expand All @@ -21,11 +21,11 @@ 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.14.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
google.golang.org/grpc v1.57.0 // indirect
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-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
34 changes: 17 additions & 17 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.

2 changes: 1 addition & 1 deletion jaeger-influxdb/Dockerfile.all-in-one
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN \
FROM alpine:3.16
RUN apk --update --no-cache add bash ca-certificates
USER 10001
COPY --from=jaegertracing/jaeger-query:1.48 --chmod=0755 /go/bin/query-linux /jaeger-query
COPY --from=jaegertracing/jaeger-query:1.49 --chmod=0755 /go/bin/query-linux /jaeger-query
COPY --chmod=0755 jaeger-influxdb/all-in-one.sh /
COPY --from=builder --chmod=0755 /go/bin/jaeger-influxdb /
ENTRYPOINT ["/all-in-one.sh"]
20 changes: 9 additions & 11 deletions jaeger-influxdb/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ 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.6
github.com/influxdata/influxdb-observability/common v0.5.7
github.com/influxdata/line-protocol/v2 v2.2.1
github.com/jaegertracing/jaeger v1.48.0
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.84.0
go.opentelemetry.io/collector/semconv v0.85.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.25.0
google.golang.org/grpc v1.57.0
Expand All @@ -31,7 +31,7 @@ require (
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.4.10 // indirect
github.com/hashicorp/go-plugin v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
Expand All @@ -53,18 +53,16 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/otel v1.17.0 // indirect
go.opentelemetry.io/otel/trace v1.17.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.14.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
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
Expand Down
Loading
Loading