Skip to content

Commit

Permalink
chore: update otel to v0.97.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@jacobmarble
jacobmarble committed May 25, 2024
1 parent 4be04f3 commit 453b496
Show file tree
Hide file tree
Showing 16 changed files with 188 additions and 188 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
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.96.0 &&
go install go.opentelemetry.io/collector/cmd/builder@v0.97.0 &&
cd otelcol-influxdb &&
builder --config build.yml
2 changes: 1 addition & 1 deletion common/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/semconv v0.96.0
go.opentelemetry.io/collector/semconv v0.97.0
)

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

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.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
JAEGER_AGENT_PORT: 6831

otelcol-influxdb:
image: otel/opentelemetry-collector-contrib:0.87.0
image: otel/opentelemetry-collector-contrib:0.97.0
command: [ "--config", "/config.yml" ]
stop_grace_period: 10s
volumes:
Expand Down
8 changes: 4 additions & 4 deletions influx2otel/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ go 1.21

require (
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.96.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.96.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.97.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.97.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/pdata v1.3.0
go.opentelemetry.io/collector/semconv v0.96.0
go.opentelemetry.io/collector/pdata v1.4.0
go.opentelemetry.io/collector/semconv v0.97.0
)

require (
Expand Down
20 changes: 10 additions & 10 deletions influx2otel/go.sum
View file

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/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/pdata v1.3.0
go.opentelemetry.io/collector/semconv v0.96.0
go.opentelemetry.io/collector/semconv v0.97.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
google.golang.org/grpc v1.62.1
Expand Down
4 changes: 2 additions & 2 deletions jaeger-influxdb/go.sum
View file

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

6 changes: 3 additions & 3 deletions otel2influx/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ go 1.21
require (
github.com/influxdata/influxdb-observability/common v0.5.8
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/consumer v0.96.0
go.opentelemetry.io/collector/pdata v1.3.0
go.opentelemetry.io/collector/semconv v0.96.0
go.opentelemetry.io/collector/consumer v0.97.0
go.opentelemetry.io/collector/pdata v1.4.0
go.opentelemetry.io/collector/semconv v0.97.0
go.uber.org/multierr v1.11.0
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
)
Expand Down
16 changes: 8 additions & 8 deletions otel2influx/go.sum
View file

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
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.96.0 && \
go install go.opentelemetry.io/collector/cmd/builder@v0.97.0 && \
du -cshx /root/.cache/go-build /go/pkg/mod

COPY . /project
Expand Down
44 changes: 22 additions & 22 deletions otelcol-influxdb/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,39 @@ dist:
name: otelcol-influxdb
module: github.com/influxdata/influxdb-observability/otelcol-influxdb
description: OpenTelemetry Collector Distribution built for InfluxDB
version: 0.96.0-0.0.0-beta.0
otelcol_version: 0.96.0
version: 0.97.0-0.0.0-beta.0
otelcol_version: 0.97.0
output_path: ./build

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.96.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.97.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.96.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.97.0

connectors:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.97.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.96.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.96.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.97.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.97.0

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.96.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.96.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.96.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.97.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.97.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.97.0

replaces:
- github.com/influxdata/influxdb-observability/common => ../../common
Expand Down
4 changes: 2 additions & 2 deletions run-checks.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ if ! hash go; then
fi
if ! hash staticcheck; then
echo "installing staticcheck"
if ! go install honnef.co/go/tools/cmd/[email protected].3; then
if ! go install honnef.co/go/tools/cmd/[email protected].7; then
echo "failed to install staticcheck"
exit 1
fi
fi
if ! hash builder; then
echo "installing the opentelemetry collector builder"
if ! go install go.opentelemetry.io/collector/cmd/builder@v0.87.0; then
if ! go install go.opentelemetry.io/collector/cmd/builder@v0.97.0; then
echo "failed to install the opentelemetry collector builder"
exit 1
fi
Expand Down
Loading

0 comments on commit 453b496

Please sign in to comment.