Skip to content

Commit

Permalink
Upgrade otel dependencies to v0.35.0. (aws-observability#643)
Browse files Browse the repository at this point in the history
* Upgrade otel dependencies to v0.35.0.

Bumped to golang 1.17 due to jaeger dependencies.

* Re-ran go mod tidy

* Bumped workflow go versions up to 1.17.

Bumped tools go.mod minimum version up to 1.17.
  • Loading branch information
jefchien committed Sep 10, 2021
1 parent 340a236 commit ea96ccb
Show file tree
Hide file tree
Showing 11 changed files with 683 additions and 259 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: 1.17
- name: Install Go tools
run: cd /tmp && go get -u golang.org/x/tools/cmd/goimports
- name: Build aotutil
Expand All @@ -72,7 +72,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: 1.17

- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/PR-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: 1.17

- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: 1.17
- name: Install Go tools
run: cd /tmp && go get -u golang.org/x/tools/cmd/goimports
- name: Build aotutil
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/soaking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v2
with:
go-version: ^1.13
go-version: 1.17
- name: Install Go tools
run: cd /tmp && go get -u golang.org/x/tools/cmd/goimports
- name: Build aotutil
Expand Down
2 changes: 1 addition & 1 deletion cmd/awscollector/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apk --update add ca-certificates
RUN apk add --update bash git make build-base

# config go
COPY --from=golang:1.16.3-alpine /usr/local/go/ /usr/local/go/
COPY --from=golang:1.17-alpine /usr/local/go/ /usr/local/go/
ENV PATH="/usr/local/go/bin:${PATH}"

# download go modules ahead to speed up the building
Expand Down
316 changes: 274 additions & 42 deletions go.mod

Large diffs are not rendered by default.

250 changes: 130 additions & 120 deletions go.sum

Large diffs are not rendered by default.

77 changes: 68 additions & 9 deletions pkg/lambdacomponents/go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,77 @@
module github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents

go 1.14
go 1.17

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.34.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.34.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.34.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.34.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.35.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.35.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.35.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.35.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.34.0
go.opentelemetry.io/collector v0.35.0
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.34.0
require (
github.com/aws/aws-sdk-go v1.40.38 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/knadh/koanf v1.2.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.35.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.35.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.35.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.35.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.35.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 // indirect
github.com/rs/cors v1.8.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/tidwall/gjson v1.8.1 // indirect
github.com/tidwall/match v1.0.3 // indirect
github.com/tidwall/pretty v1.1.0 // indirect
github.com/tidwall/tinylru v1.0.2 // indirect
github.com/tidwall/wal v0.1.5 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.35.0 // indirect
go.opentelemetry.io/contrib v0.23.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.23.0 // indirect
go.opentelemetry.io/otel v1.0.0-RC3 // indirect
go.opentelemetry.io/otel/internal/metric v0.23.0 // indirect
go.opentelemetry.io/otel/metric v0.23.0 // indirect
go.opentelemetry.io/otel/trace v1.0.0-RC3 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect
google.golang.org/grpc v1.40.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.35.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.34.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.35.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.34.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.35.0

0 comments on commit ea96ccb

Please sign in to comment.