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

Update to go1.21, collector v0.86.0, and disable CGO #48

Merged
merged 1 commit into from
Oct 6, 2023
Merged

Update to go1.21, collector v0.86.0, and disable CGO #48

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
6 changes: 3 additions & 3 deletions build/cloudbuild-automation/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.19 as build
ARG OTEL_VERSION=0.75.0
FROM golang:1.21 as build
ARG OTEL_VERSION=0.86.0
WORKDIR /app
COPY . .
RUN go install go.opentelemetry.io/collector/cmd/builder@v${OTEL_VERSION}
RUN builder --config=builder-config.yaml
RUN CGO_ENABLED=0 builder --config=builder-config.yaml

FROM gcr.io/distroless/base-debian11
COPY --from=build /app/bin/otelcol-custom /
Expand Down
26 changes: 13 additions & 13 deletions build/cloudbuild-automation/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@ dist:

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0
gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.86.0

processors:
- import: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.86.0
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.75.0
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.86.0
- import: go.opentelemetry.io/collector/processor/batchprocessor
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.75.0
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.86.0

exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.75.0
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.86.0
6 changes: 3 additions & 3 deletions build/cloudbuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.19 as build
ARG OTEL_VERSION=0.75.0
FROM golang:1.21 as build
ARG OTEL_VERSION=0.86.0
WORKDIR /app
COPY . .
RUN go install go.opentelemetry.io/collector/cmd/builder@v${OTEL_VERSION}
RUN builder --config=builder-config.yaml
RUN CGO_ENABLED=0 builder --config=builder-config.yaml

FROM gcr.io/distroless/base-debian11
COPY --from=build /app/bin/otelcol-custom /
Expand Down
26 changes: 13 additions & 13 deletions build/cloudbuild/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@ dist:

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0
gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.86.0

processors:
- import: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.86.0
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.75.0
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.86.0
- import: go.opentelemetry.io/collector/processor/batchprocessor
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.75.0
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.86.0

exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.75.0
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.86.0
6 changes: 3 additions & 3 deletions build/local/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.19 as build
ARG OTEL_VERSION=0.75.0
FROM golang:1.21 as build
ARG OTEL_VERSION=0.86.0
WORKDIR /app
COPY . .
RUN go install go.opentelemetry.io/collector/cmd/builder@v${OTEL_VERSION}
RUN builder --config=builder-config.yaml
RUN CGO_ENABLED=0 builder --config=builder-config.yaml

FROM gcr.io/distroless/base-debian11
COPY --from=build /app/bin/otelcol-custom /
Expand Down
4 changes: 2 additions & 2 deletions build/local/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
include ../../Makefile

OUTPUT_DIR=bin
OTEL_VERSION=0.75.0
OTEL_VERSION=0.86.0
GCLOUD_PROJECT ?= $(shell gcloud config get project)

.PHONY: setup
Expand All @@ -25,7 +25,7 @@ setup:
.PHONY: build
build: setup
mkdir -p ${OUTPUT_DIR}
builder --config=builder-config.yaml
CGO_ENABLED=0 builder --config=builder-config.yaml

.PHONY: docker-build
docker-build: setup
Expand Down
26 changes: 13 additions & 13 deletions build/local/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,32 @@ dist:

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0
gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudspannerreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otlpjsonfilereceiver v0.86.0

processors:
- import: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.86.0
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.75.0
gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.86.0
- import: go.opentelemetry.io/collector/processor/batchprocessor
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.75.0
gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.86.0

exporters:
- import: go.opentelemetry.io/collector/exporter/loggingexporter
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.75.0
gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter v0.86.0
- import: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.75.0
gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter v0.86.0
2 changes: 0 additions & 2 deletions deploy/gke/redaction/otel-config-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ receivers:
exporters:
# The googlecloud exporter sends traces to google cloud trace.
googlecloud:
retry_on_failure:
enabled: false

# The logging exporter writes telemetry to stdout.
logging:
Expand Down
2 changes: 0 additions & 2 deletions deploy/gke/redaction/otel-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ receivers:
exporters:
# The googlecloud exporter sends traces to google cloud trace.
googlecloud:
retry_on_failure:
psx95 marked this conversation as resolved.
Show resolved Hide resolved
enabled: false

# The logging exporter writes telemetry to stdout.
logging:
Expand Down
2 changes: 0 additions & 2 deletions deploy/gke/simple/otel-config-sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ receivers:

exporters:
googlecloud:
retry_on_failure:
enabled: false
log:
default_log_name: otel-collector-builder-sample/gke-simple-demo # This could be anything

Expand Down
2 changes: 0 additions & 2 deletions deploy/gke/simple/otel-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ receivers:

exporters:
googlecloud:
retry_on_failure:
enabled: false

googlemanagedprometheus:

Expand Down