Skip to content

Commit

Permalink
Merge pull request #13 from rancher-sandbox/add-storage-extension
Browse files Browse the repository at this point in the history 
Update modules to 0.85.0 and add storage/filestorage extension
  • Loading branch information
@jaehnri
jaehnri authored Sep 25, 2023
2 parents eec53b3 + 67efce0 commit 6874ecf
Show file tree
Hide file tree
Showing 7 changed files with 1,623 additions and 861 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/images.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
context: .
file: ./Dockerfile
push: true
tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/opni-otel-collector:${{ env.TAG_NAME }}-0.74.0
tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/opni-otel-collector:${{ env.TAG_NAME }}-0.85.0
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.20 AS builder

RUN go install go.opentelemetry.io/collector/cmd/builder@v0.74.0
RUN go install go.opentelemetry.io/collector/cmd/builder@v0.85.0

WORKDIR /otel

Expand All @@ -18,7 +18,7 @@ RUN mkdir -p /tmp

FROM debian:11.6 as journal
RUN apt update
RUN apt install -y systemd=247.3-7+deb11u2
RUN apt install -y systemd=247.3-7+deb11u4
RUN useradd -u 10001 scratchuser \
&& usermod -a -G systemd-journal scratchuser \
&& usermod -a -G root scratchuser
Expand Down
2 changes: 2 additions & 0 deletions components.go
View file

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

397 changes: 218 additions & 179 deletions go.mod
View file

Large diffs are not rendered by default.

1,997 changes: 1,358 additions & 639 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
View file

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

80 changes: 41 additions & 39 deletions ocb-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,56 @@ dist:
module: github.com/rancher-sandbox/opni-otel-collector # the module name for the new distribution, following Go mod conventions. Optional, but recommended.
name: otelcol-custom # the binary name. Optional.
description: "Custom OpenTelemetry Collector distribution" # a long name for the application. Optional.
otelcol_version: "0.74.0"
version: "0.74.0"
otelcol_version: "0.85.0"
version: "0.85.0"
output_path: ./

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.74.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.85.0

exporters:
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.74.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.74.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.74.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.85.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.85.0

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.74.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.74.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.85.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.85.0
import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage

processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.74.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.74.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.74.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.85.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.85.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.85.0

replaces:
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter => github.com/dbason/opentelemetry-collector-contrib/exporter/opensearchexporter v0.0.0-20230612004839-109400ed0c16

0 comments on commit 6874ecf

Please sign in to comment.