-
Notifications
You must be signed in to change notification settings - Fork 215
Add minimal OTLP-only distribution #663
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.
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
Merged
jpkrohling
merged 10 commits into
open-telemetry:main
from
jade-guiton-dd:minimal-distro
Sep 25, 2024
Merged
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
5522f58
Add minimal OTLP-only distribution
jade-guiton-dd dee6c65
Pin CI goreleaser version to v2.2.0
jade-guiton-dd a0cc30f
Rename distro from "otelcol-minimal" to "otelcol-otlp"
jade-guiton-dd 966238d
Add note in systemd .conf file
jade-guiton-dd a43f010
Merge branch 'main' into minimal-distro
jade-guiton-dd 8bf9711
Correct exposed ports in Dockerfile
jade-guiton-dd d7b6c4e
Removed default command line arguments in Dockerfile
jade-guiton-dd 369bb76
Updated README
jade-guiton-dd 99cf128
Merge branch 'main' into minimal-distro
jade-guiton-dd 339a195
Update new distro to 0.110.0
jade-guiton-dd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| name: Continuous Integration - OTLP - GoReleaser | ||
|
|
||
| on: | ||
| push: | ||
| branches: [main] | ||
| paths: | ||
| - "distributions/otelcol-otlp/**" | ||
| - "cmd/**" | ||
| - ".github/**" | ||
| - "scripts/**" | ||
| - "Makefile" | ||
| - "go.mod" | ||
| - "go.sum" | ||
| pull_request: | ||
| branches: [main] | ||
| paths: | ||
| - "distributions/otelcol-otlp/**" | ||
| - "cmd/**" | ||
| - ".github/**" | ||
| - "scripts/**" | ||
| - "Makefile" | ||
| - "go.mod" | ||
| - "go.sum" | ||
|
|
||
| jobs: | ||
| check-goreleaser: | ||
| name: Continuous Integration - OTLP - GoReleaser | ||
| uses: ./.github/workflows/base-ci-goreleaser.yaml | ||
| with: | ||
| distribution: otelcol-otlp | ||
| goos: '[ "linux", "windows", "darwin" ]' | ||
| goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' | ||
| secrets: inherit |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| name: Release OTLP | ||
jade-guiton-dd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| on: | ||
| push: | ||
| tags: ["v*"] | ||
|
|
||
| jobs: | ||
| release: | ||
| name: Release OTLP | ||
| uses: ./.github/workflows/base-release.yaml | ||
| with: | ||
| distribution: otelcol-otlp | ||
| goos: '[ "linux", "windows", "darwin" ]' | ||
| goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' | ||
| secrets: inherit | ||
| permissions: write-all | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| partial: | ||
| by: target | ||
| version: 2 | ||
| project_name: opentelemetry-collector-releases | ||
| env: | ||
| - COSIGN_YES=true | ||
| msi: | ||
| - id: otelcol-otlp | ||
| name: otelcol-otlp_{{ .Version }}_{{ .Os }}_{{ .MsiArch }} | ||
| wxs: windows-installer.wxs | ||
| extra_files: | ||
| - opentelemetry.ico | ||
| builds: | ||
| - id: otelcol-otlp | ||
| goos: | ||
| - darwin | ||
| - linux | ||
| - windows | ||
| goarch: | ||
| - "386" | ||
| - amd64 | ||
| - arm | ||
| - arm64 | ||
| - ppc64le | ||
| - s390x | ||
| goarm: | ||
| - "7" | ||
| ignore: | ||
| - goos: darwin | ||
| goarch: "386" | ||
| - goos: darwin | ||
| goarch: arm | ||
| - goos: darwin | ||
| goarch: s390x | ||
| - goos: windows | ||
| goarch: arm | ||
| - goos: windows | ||
| goarch: arm64 | ||
| - goos: windows | ||
| goarch: s390x | ||
| dir: _build | ||
| binary: otelcol-otlp | ||
| ldflags: | ||
| - -s | ||
| - -w | ||
| flags: | ||
| - -trimpath | ||
| env: | ||
| - CGO_ENABLED=0 | ||
| archives: | ||
| - id: otelcol-otlp | ||
| builds: | ||
| - otelcol-otlp | ||
| name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}' | ||
| nfpms: | ||
| - package_name: otelcol-otlp | ||
| contents: | ||
| - src: otelcol-otlp.service | ||
| dst: /lib/systemd/system/otelcol-otlp.service | ||
| - src: otelcol-otlp.conf | ||
| dst: /etc/otelcol-otlp/otelcol-otlp.conf | ||
| type: config|noreplace | ||
| scripts: | ||
| preinstall: preinstall.sh | ||
| postinstall: postinstall.sh | ||
| preremove: preremove.sh | ||
| overrides: | ||
| rpm: | ||
| dependencies: | ||
| - /bin/sh | ||
| id: otelcol-otlp | ||
| builds: | ||
| - otelcol-otlp | ||
| formats: | ||
| - deb | ||
| - rpm | ||
| maintainer: The OpenTelemetry Collector maintainers <[email protected]> | ||
| description: OpenTelemetry Collector - otelcol-otlp | ||
| license: Apache 2.0 | ||
| checksum: | ||
| name_template: '{{ .ProjectName }}_otelcol-otlp_checksums.txt' | ||
| dockers: | ||
| - goos: linux | ||
| goarch: "386" | ||
| dockerfile: Dockerfile | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-386 | ||
| - otel/opentelemetry-collector-otlp:latest-386 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-386 | ||
| build_flag_templates: | ||
| - --pull | ||
| - --platform=linux/386 | ||
| - --label=org.opencontainers.image.created={{.Date}} | ||
| - --label=org.opencontainers.image.name={{.ProjectName}} | ||
| - --label=org.opencontainers.image.revision={{.FullCommit}} | ||
| - --label=org.opencontainers.image.version={{.Version}} | ||
| - --label=org.opencontainers.image.source={{.GitURL}} | ||
| - --label=org.opencontainers.image.licenses=Apache-2.0 | ||
| use: buildx | ||
| - goos: linux | ||
| goarch: amd64 | ||
| dockerfile: Dockerfile | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-amd64 | ||
| - otel/opentelemetry-collector-otlp:latest-amd64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-amd64 | ||
| build_flag_templates: | ||
| - --pull | ||
| - --platform=linux/amd64 | ||
| - --label=org.opencontainers.image.created={{.Date}} | ||
| - --label=org.opencontainers.image.name={{.ProjectName}} | ||
| - --label=org.opencontainers.image.revision={{.FullCommit}} | ||
| - --label=org.opencontainers.image.version={{.Version}} | ||
| - --label=org.opencontainers.image.source={{.GitURL}} | ||
| - --label=org.opencontainers.image.licenses=Apache-2.0 | ||
| use: buildx | ||
| - goos: linux | ||
| goarch: arm | ||
| goarm: "7" | ||
| dockerfile: Dockerfile | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-armv7 | ||
| - otel/opentelemetry-collector-otlp:latest-armv7 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-armv7 | ||
| build_flag_templates: | ||
| - --pull | ||
| - --platform=linux/arm/v7 | ||
| - --label=org.opencontainers.image.created={{.Date}} | ||
| - --label=org.opencontainers.image.name={{.ProjectName}} | ||
| - --label=org.opencontainers.image.revision={{.FullCommit}} | ||
| - --label=org.opencontainers.image.version={{.Version}} | ||
| - --label=org.opencontainers.image.source={{.GitURL}} | ||
| - --label=org.opencontainers.image.licenses=Apache-2.0 | ||
| use: buildx | ||
| - goos: linux | ||
| goarch: arm64 | ||
| dockerfile: Dockerfile | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-arm64 | ||
| - otel/opentelemetry-collector-otlp:latest-arm64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-arm64 | ||
| build_flag_templates: | ||
| - --pull | ||
| - --platform=linux/arm64 | ||
| - --label=org.opencontainers.image.created={{.Date}} | ||
| - --label=org.opencontainers.image.name={{.ProjectName}} | ||
| - --label=org.opencontainers.image.revision={{.FullCommit}} | ||
| - --label=org.opencontainers.image.version={{.Version}} | ||
| - --label=org.opencontainers.image.source={{.GitURL}} | ||
| - --label=org.opencontainers.image.licenses=Apache-2.0 | ||
| use: buildx | ||
| - goos: linux | ||
| goarch: ppc64le | ||
| dockerfile: Dockerfile | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-ppc64le | ||
| - otel/opentelemetry-collector-otlp:latest-ppc64le | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-ppc64le | ||
| build_flag_templates: | ||
| - --pull | ||
| - --platform=linux/ppc64le | ||
| - --label=org.opencontainers.image.created={{.Date}} | ||
| - --label=org.opencontainers.image.name={{.ProjectName}} | ||
| - --label=org.opencontainers.image.revision={{.FullCommit}} | ||
| - --label=org.opencontainers.image.version={{.Version}} | ||
| - --label=org.opencontainers.image.source={{.GitURL}} | ||
| - --label=org.opencontainers.image.licenses=Apache-2.0 | ||
| use: buildx | ||
| - goos: linux | ||
| goarch: s390x | ||
| dockerfile: Dockerfile | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-s390x | ||
| - otel/opentelemetry-collector-otlp:latest-s390x | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-s390x | ||
| build_flag_templates: | ||
| - --pull | ||
| - --platform=linux/s390x | ||
| - --label=org.opencontainers.image.created={{.Date}} | ||
| - --label=org.opencontainers.image.name={{.ProjectName}} | ||
| - --label=org.opencontainers.image.revision={{.FullCommit}} | ||
| - --label=org.opencontainers.image.version={{.Version}} | ||
| - --label=org.opencontainers.image.source={{.GitURL}} | ||
| - --label=org.opencontainers.image.licenses=Apache-2.0 | ||
| use: buildx | ||
| docker_manifests: | ||
| - name_template: otel/opentelemetry-collector-otlp:{{ .Version }} | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-386 | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-amd64 | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-armv7 | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-arm64 | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-ppc64le | ||
| - otel/opentelemetry-collector-otlp:{{ .Version }}-s390x | ||
| - name_template: otel/opentelemetry-collector-otlp:latest | ||
| image_templates: | ||
| - otel/opentelemetry-collector-otlp:latest-386 | ||
| - otel/opentelemetry-collector-otlp:latest-amd64 | ||
| - otel/opentelemetry-collector-otlp:latest-armv7 | ||
| - otel/opentelemetry-collector-otlp:latest-arm64 | ||
| - otel/opentelemetry-collector-otlp:latest-ppc64le | ||
| - otel/opentelemetry-collector-otlp:latest-s390x | ||
| - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }} | ||
| image_templates: | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-386 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-amd64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-armv7 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-arm64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-ppc64le | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-s390x | ||
| - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest | ||
| image_templates: | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-386 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-amd64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-armv7 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-arm64 | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-ppc64le | ||
| - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:latest-s390x | ||
| signs: | ||
| - cmd: cosign | ||
| args: | ||
| - sign-blob | ||
| - --output-signature | ||
| - ${artifact}.sig | ||
| - --output-certificate | ||
| - ${artifact}.pem | ||
| - ${artifact} | ||
| signature: ${artifact}.sig | ||
| artifacts: all | ||
| certificate: ${artifact}.pem | ||
| docker_signs: | ||
| - args: | ||
| - sign | ||
| - ${artifact} | ||
| artifacts: all | ||
| sboms: | ||
| - id: archive | ||
| artifacts: archive | ||
| - id: package | ||
| artifacts: package | ||
| monorepo: | ||
| tag_prefix: v |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| FROM alpine:3.19 as certs | ||
| RUN apk --update add ca-certificates | ||
|
|
||
| FROM scratch | ||
|
|
||
| ARG USER_UID=10001 | ||
| USER ${USER_UID} | ||
|
|
||
| COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt | ||
| COPY --chmod=755 otelcol-otlp /otelcol-otlp | ||
| ENTRYPOINT ["/otelcol-otlp"] | ||
| CMD ["--config", "/etc/otelcol-otlp/config.yaml"] | ||
jade-guiton-dd marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| EXPOSE 4317 55678 55679 | ||
jade-guiton-dd marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # OpenTelemetry Collector OTLP Distro | ||
|
|
||
| This distribution only contains the receiver and exporters for the OpenTelemetry Protocol (OTLP), including both gRPC and HTTP transport. | ||
|
|
||
| ## Usage note | ||
|
|
||
| Unlike the Core and Contrib distributions, the deb/rpm/msi installers and the Docker images for this distribution do not provide a default configuration file. One will need to be created in the appropriate location (`/etc/otelcol-otlp/config.yaml` or `%ProgramW6432%\OpenTelemetry Collector\config.yaml` by default). | ||
|
|
||
| ## Components | ||
|
|
||
| The full list of components is available in the [manifest](manifest.yaml) | ||
|
|
||
| ### Rules for Component Inclusion | ||
|
|
||
| - Only `otlpreceiver`, `otlpexporter`, and `otlphttpexporter` are allowed. | ||
jade-guiton-dd marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| dist: | ||
| module: github.com/open-telemetry/opentelemetry-collector-releases/otlp | ||
| name: otelcol-otlp | ||
| description: OpenTelemetry Collector OTLP | ||
| version: 0.109.0 | ||
| output_path: ./_build | ||
| otelcol_version: 0.109.0 | ||
|
|
||
| exporters: | ||
| - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.109.0 | ||
| - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.109.0 | ||
|
|
||
| receivers: | ||
| - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.109.0 | ||
|
|
||
| providers: | ||
| - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.15.0 | ||
| - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.15.0 |
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # Systemd environment file for the otelcol-otlp service | ||
|
|
||
| # Command-line options for the otelcol-otlp service. | ||
| # Run `/usr/bin/otelcol-otlp --help` to see all available options. | ||
mx-psi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| OTELCOL_OPTIONS="--config=/etc/otelcol-otlp/config.yaml" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| [Unit] | ||
| Description=OpenTelemetry Collector OTLP | ||
| After=network.target | ||
|
|
||
| [Service] | ||
| EnvironmentFile=/etc/otelcol-otlp/otelcol-otlp.conf | ||
| ExecStart=/usr/bin/otelcol-otlp $OTELCOL_OPTIONS | ||
| KillMode=mixed | ||
| Restart=on-failure | ||
| Type=simple | ||
| User=otelcol-otlp | ||
| Group=otelcol-otlp | ||
|
|
||
| [Install] | ||
| WantedBy=multi-user.target |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.