Skip to content

Commit

Permalink
chore: update otel related deps to v0.113.0 (#167)
Browse files Browse the repository at this point in the history 
* update otel to 0.113.0

* remove otelcol_version from manifest.json

* whoopsie, forgot the manifest when rebasing
  • Loading branch information
@Elfo404
Elfo404 authored Nov 15, 2024
1 parent c996794 commit 31da4e7
Show file tree
Hide file tree
Showing 22 changed files with 558 additions and 621 deletions.
26 changes: 13 additions & 13 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The following is a list of components that are included in the Grafana CI OTel C
- <mark>**[dronereceiver][dronereceiver]**</mark>
- <mark>**[githubactionsreceiver][githubactionsreceiver]**</mark>

[otlpreceiver]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.109.0/receiver/otlpreceiver
[otlpreceiver]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.113.0/receiver/otlpreceiver
[dronereceiver]: ./receiver/dronereceiver/README.md
[githubactionsreceiver]: ./receiver/githubactionsreceiver/README.md

Expand All @@ -24,17 +24,17 @@ The following is a list of components that are included in the Grafana CI OTel C
- [batchprocessor][batchprocessor]
- [resourceprocessor][resourceprocessor]

[attributesprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/processor/attributesprocessor
[batchprocessor]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.109.0/processor/batchprocessor
[resourceprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/processor/resourceprocessor
[attributesprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/processor/attributesprocessor
[batchprocessor]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.113.0/processor/batchprocessor
[resourceprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/processor/resourceprocessor

### Connectors

- [routingconnector][routingconnector]
- [spanmetricsconnector][spanmetricsconnector]

[routingconnector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/connector/routingconnector
[spanmetricsconnector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/connector/spanmetricsconnector
[routingconnector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/connector/routingconnector
[spanmetricsconnector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/connector/spanmetricsconnector

### Exporters

Expand All @@ -44,19 +44,19 @@ The following is a list of components that are included in the Grafana CI OTel C
- [prometheusexporter][prometheusexporter]
- [prometheusremotewriteexporter][prometheusremotewriteexporter]

[debugexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.109.0/exporter/debugexporter
[lokiexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/exporter/lokiexporter
[otlpexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.109.0/exporter/otlpexporter
[prometheusexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/exporter/prometheusexporter
[prometheusremotewriteexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/exporter/prometheusremotewriteexporter
[debugexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.113.0/exporter/debugexporter
[lokiexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/exporter/lokiexporter
[otlpexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.113.0/exporter/otlpexporter
[prometheusexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/exporter/prometheusexporter
[prometheusremotewriteexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/exporter/prometheusremotewriteexporter

### Extensions

- [basicauthextension][basicauthextension]
- [healthcheckextension][healthcheckextension]

[basicauthextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/extension/basicauthextension
[healthcheckextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.109.0/extension/healthcheckextension
[basicauthextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/extension/basicauthextension
[healthcheckextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.113.0/extension/healthcheckextension

## Configuration

Expand Down
30 changes: 13 additions & 17 deletions config/manifest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,32 @@ dist:
name: grafana-ci-otelcol
description: Grafana's OTel Collector distribution for CI/CD observability
output_path: ./build
otelcol_version: 0.109.0
debug_compilation: false
version: 0.1.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.109.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.109.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiexporter v0.113.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.113.0

connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.113.0

processors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.109.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.113.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.113.0

extensions:
# Used for basic auth in production deployments for grafana cloud.
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.109.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.113.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.113.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.113.0
- gomod: github.com/grafana/grafana-ci-otel-collector/receiver/dronereceiver v0.1.0
- gomod: github.com/grafana/grafana-ci-otel-collector/receiver/githubactionsreceiver v0.1.0

Expand All @@ -38,6 +37,3 @@ replaces:
- github.com/grafana/grafana-ci-otel-collector/internal/semconv => ../internal/semconv
- github.com/grafana/grafana-ci-otel-collector/internal/traceutils => ../internal/traceutils
- github.com/grafana/grafana-ci-otel-collector/internal/sharedcomponent => ../internal/sharedcomponent

excludes:
- github.com/knadh/koanf v1.5.0
61 changes: 29 additions & 32 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/bradleyfalzon/ghinstallation/v2 v2.11.0 // indirect
github.com/drone/drone-go v1.7.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
Expand All @@ -34,55 +34,52 @@ require (
github.com/grafana/grafana-ci-otel-collector/internal/semconv v0.0.0-00010101000000-000000000000 // indirect
github.com/grafana/grafana-ci-otel-collector/internal/sharedcomponent v0.0.0-00010101000000-000000000000 // indirect
github.com/grafana/grafana-ci-otel-collector/internal/traceutils v0.0.0-00010101000000-000000000000 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgx/v5 v5.5.5 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/knadh/koanf/maps v0.1.1 // indirect
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/rs/cors v1.11.1 // indirect
go.opentelemetry.io/collector v0.109.0 // indirect
go.opentelemetry.io/collector/client v1.15.0 // indirect
go.opentelemetry.io/collector/component v0.109.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.109.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.15.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.109.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.15.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.109.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.15.0 // indirect
go.opentelemetry.io/collector/config/internal v0.109.0 // indirect
go.opentelemetry.io/collector/client v1.19.0 // indirect
go.opentelemetry.io/collector/component v0.113.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.113.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.19.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.113.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.19.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.113.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.19.0 // indirect
go.opentelemetry.io/collector/config/internal v0.113.0 // indirect
go.opentelemetry.io/collector/confmap v1.15.0 // indirect
go.opentelemetry.io/collector/consumer v0.109.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.109.0 // indirect
go.opentelemetry.io/collector/extension v0.109.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.109.0 // indirect
go.opentelemetry.io/collector/featuregate v1.15.0 // indirect
go.opentelemetry.io/collector/pdata v1.15.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.109.0 // indirect
go.opentelemetry.io/collector/receiver v0.109.0 // indirect
go.opentelemetry.io/collector/semconv v0.109.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.opentelemetry.io/collector/consumer v0.113.0 // indirect
go.opentelemetry.io/collector/extension v0.113.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.113.0 // indirect
go.opentelemetry.io/collector/pdata v1.19.0 // indirect
go.opentelemetry.io/collector/pipeline v0.113.0 // indirect
go.opentelemetry.io/collector/receiver v0.113.0 // indirect
go.opentelemetry.io/collector/semconv v0.113.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.24.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240822170219-fc7c04adadcd // indirect
google.golang.org/grpc v1.66.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 31da4e7

Please sign in to comment.