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

Jump to bottom

[chore] bump go version in CI + collector deps #63

Merged
merged 2 commits into from
Oct 26, 2023
Merged

[chore] bump go version in CI + collector deps #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55c7554
bump go version in CI
Oct 26, 2023
93776e2
update component versions, otherwise things fail
Oct 26, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19.1
go-version: "1.20"
- uses: actions/checkout@v3

- name: golangci-lint
Expand All @@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19.1
go-version: "1.20"

- uses: actions/checkout@v3

Expand All @@ -36,7 +36,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.19.1
go-version: "1.20"

- uses: actions/checkout@v3
- run: make build
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ push-tag:

.PHONY: install-otel-builder
install-otel-builder:
GO111module=on go install go.opentelemetry.io/collector/cmd/builder@v0.78.1
GO111module=on go install go.opentelemetry.io/collector/cmd/builder@v0.88.0

.PHONY: build
build: install-otel-builder
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ version for the 10 most recent telemetry-generator versions.

| Telemetry Generator | OpenTelemetry Collector |
|---------------------|-------------------------|
| v0.15.0 | v0.88.0 |
| v0.14.2 | v0.83.0 |
| v0.14.1 | v0.83.0 |
| v0.14.0 | v0.83.0 |
Expand Down
16 changes: 8 additions & 8 deletions config/builder-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ dist:
description: "Custom Lightstep Partner OpenTelemetry Collector distribution" # a long name for the application. Optional.
output_path: build # the path to write the output (sources and binary). Optional.
version: "${TAG}" # Builder config gets overriden by Docker build.
otelcol_version: "0.78.1"
otelcol_version: "0.88.0"

# the version for your custom OpenTelemetry Collector. Optional. NOTE - this will be overriden by CI/CD during deployment.

receivers:
- gomod: "github.com/lightstep/telemetry-generator/generatorreceiver v0.12.0"
name: "generatorreceiver"
path: "./generatorreceiver"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.78.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.88.0"
name: "prometheusreceiver"
exporters:
- import: go.opentelemetry.io/collector/exporter/otlpexporter
gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.78.1
gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.88.0
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.78.1
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.88.0
processors:
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.78.0"
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.88.0"
name: "spanmetricsprocessor"
- import: go.opentelemetry.io/collector/processor/batchprocessor
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.78.1
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.88.0
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.78.1
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.78.0"
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.88.0
- gomod: "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.88.0"
name: "attributesprocessor"
56 changes: 28 additions & 28 deletions generatorreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ module github.com/lightstep/telemetry-generator/generatorreceiver
go 1.18

require (
go.opentelemetry.io/collector v0.83.0 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014
go.opentelemetry.io/collector v0.88.0 // indirect
go.opentelemetry.io/collector/pdata v1.0.0-rcv0017
)

require (
github.com/robfig/cron/v3 v3.0.1
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/component v0.83.0
go.opentelemetry.io/collector/config/confighttp v0.83.0
go.opentelemetry.io/collector/consumer v0.83.0
go.opentelemetry.io/collector/receiver v0.83.0
go.opentelemetry.io/otel v1.16.0
go.uber.org/zap v1.25.0
go.opentelemetry.io/collector/component v0.88.0
go.opentelemetry.io/collector/config/confighttp v0.88.0
go.opentelemetry.io/collector/consumer v0.88.0
go.opentelemetry.io/collector/receiver v0.88.0
go.opentelemetry.io/otel v1.19.0
go.uber.org/zap v1.26.0
gopkg.in/yaml.v3 v3.0.1
)

Expand All @@ -29,7 +29,7 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/compress v1.17.1 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/knadh/koanf/v2 v2.0.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -38,25 +38,25 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rs/cors v1.9.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.83.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.83.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.83.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.83.0 // indirect
go.opentelemetry.io/collector/config/internal v0.83.0 // indirect
go.opentelemetry.io/collector/confmap v0.83.0 // indirect
go.opentelemetry.io/collector/extension v0.83.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
github.com/rs/cors v1.10.1 // indirect
go.opentelemetry.io/collector/config/configauth v0.88.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.88.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.88.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.88.0 // indirect
go.opentelemetry.io/collector/config/configtls v0.88.0 // indirect
go.opentelemetry.io/collector/config/internal v0.88.0 // indirect
go.opentelemetry.io/collector/confmap v0.88.0 // indirect
go.opentelemetry.io/collector/extension v0.88.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.88.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0017 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.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.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-20230822172742-b8732ec3820d // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Loading