Binary name should be otelcol not core (#8)

Fixes #7

Signed-off-by: Juraci Paixão Kröhling <[email protected]>

Author: jpkrohling

.goreleaser.yaml

@@ -2,14 +2,14 @@ project_name: opentelemetry-collector-releases
 checksum:
   name_template: "{{ .ProjectName }}_checksums.txt"
 archives:
-  - id: "opentelemetry-collector"
+  - id: "otelcol"
     name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}"
     builds:
-      - "opentelemetry-collector"
+      - "otelcol"
 builds:
-  - id: "opentelemetry-collector"
-    dir: "opentelemetry-collector/_build"
-    binary: "opentelemetry-collector"
+  - id: "otelcol"
+    dir: "distributions/otelcol/_build"
+    binary: "otelcol"
     env:
       - CGO_ENABLED=0
     goos:
@@ -33,13 +33,13 @@ builds:
       - goos: windows
         goarch: arm
 docker_manifests:
-  - name_template: quay.io/jpkroehling/opentelemetry-collector:{{ .Tag }}
+  - name_template: quay.io/jpkroehling/otelcol:{{ .Tag }}
     image_templates:
-      - quay.io/jpkroehling/opentelemetry-collector:{{ .Tag }}-amd64
+      - quay.io/jpkroehling/otelcol:{{ .Tag }}-amd64
 dockers:
   - image_templates:
-      - "quay.io/jpkroehling/opentelemetry-collector:{{ .Tag }}-amd64"
-    dockerfile: "opentelemetry-collector/Dockerfile"
+      - "quay.io/jpkroehling/otelcol:{{ .Tag }}-amd64"
+    dockerfile: "distributions/otelcol/Dockerfile"
     use: buildx
     build_flag_templates:
       - "--pull"
@@ -50,29 +50,29 @@ dockers:
       - "--label=org.opencontainers.image.source={{.GitURL}}"
       - "--platform=linux/amd64"
     extra_files:
-      - "configs/opentelemetry-collector.yaml"
+      - "configs/otelcol.yaml"
     goarch: amd64
 nfpms:
-  - id: "opentelemetry-collector"
-    package_name: "opentelemetry-collector"
+  - id: "otelcol"
+    package_name: "otelcol"
     license: Apache 2.0
-    description: "OpenTelemetry Collector - opentelemetry-collector"
+    description: "OpenTelemetry Collector - otelcol"
     formats:
       - apk
       - deb
       - rpm
     scripts:
-      preinstall: "opentelemetry-collector/preinstall.sh"
-      postinstall: "opentelemetry-collector/postinstall.sh"
-      preremove: "opentelemetry-collector/preremove.sh"
+      preinstall: "distributions/otelcol/preinstall.sh"
+      postinstall: "distributions/otelcol/postinstall.sh"
+      preremove: "distributions/otelcol/preremove.sh"
     builds:
-      - "opentelemetry-collector"
+      - "otelcol"
     contents:
-      - src: "opentelemetry-collector/opentelemetry-collector.service"
-        dst: "/lib/systemd/system/opentelemetry-collector.service"
-      - src: "opentelemetry-collector/opentelemetry-collector.conf"
-        dst: "/etc/opentelemetry-collector/opentelemetry-collector.conf"
+      - src: "distributions/otelcol/otelcol.service"
+        dst: "/lib/systemd/system/otelcol.service"
+      - src: "distributions/otelcol/otelcol.conf"
+        dst: "/etc/otelcol/otelcol.conf"
         type: "config|noreplace"
-      - src: "configs/opentelemetry-collector.yaml"
-        dst: "/etc/opentelemetry-collector/config.yaml"
+      - src: "configs/otelcol.yaml"
+        dst: "/etc/otelcol/config.yaml"
         type: config

Makefile

@@ -7,7 +7,7 @@ YQ_VERSION ?= 4.11.1
 YQ_DIR ?= ${OTELCOL_BUILDER_DIR}
 YQ ?= ${YQ_DIR}/yq
 
-DISTRIBUTIONS ?= "opentelemetry-collector"
+DISTRIBUTIONS ?= "otelcol"
 
 ci: check build
 check: ensure-goreleaser-up-to-date

configs/opentelemetry-collector.yaml renamed to configs/otelcol.yaml

@@ -2,7 +2,7 @@ FROM alpine:3.13 as certs
 RUN apk --update add ca-certificates
 
 FROM alpine:3.13 AS otelcol
-COPY opentelemetry-collector /otelcol
+COPY otelcol /otelcol
 # Note that this shouldn't be necessary, but in some cases the file seems to be
 # copied with the execute bit lost (see #1317)
 RUN chmod 755 /otelcol
@@ -14,7 +14,7 @@ USER ${USER_UID}
 
 COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=otelcol /otelcol /
-COPY configs/opentelemetry-collector.yaml /etc/otel/config.yaml
+COPY configs/otelcol.yaml /etc/otel/config.yaml
 ENTRYPOINT ["/otelcol"]
 CMD ["--config", "/etc/otel/config.yaml"]
 EXPOSE 4317 55678 55679

opentelemetry-collector/Dockerfile renamed to distributions/otelcol/Dockerfile

@@ -1,6 +1,6 @@
 dist:
   module: github.com/open-telemetry/opentelemetry-collector-releases/core
-  name: opentelemetry-collector
+  name: otelcol
   description: OpenTelemetry Collector
   version: 0.34.0
   output_path: ./_build

opentelemetry-collector/manifest.yaml renamed to distributions/otelcol/manifest.yaml

@@ -3,8 +3,8 @@ Description=OpenTelemetry Collector
 After=network.target
 
 [Service]
-EnvironmentFile=/etc/opentelemetry-collector/opentelemetry-collector.conf
-ExecStart=/usr/local/bin/opentelemetry-collector $OTELCOL_OPTIONS
+EnvironmentFile=/etc/opentelemetry-collector/otelcol.conf
+ExecStart=/usr/local/bin/otelcol $OTELCOL_OPTIONS
 KillMode=mixed
 Restart=on-failure
 Type=simple

opentelemetry-collector/opentelemetry-collector.conf renamed to distributions/otelcol/otelcol.conf

@@ -15,8 +15,8 @@
 # limitations under the License.
 
 if command -v systemctl >/dev/null 2>&1; then
-    systemctl enable opentelemetry-collector.service
-    if [ -f /etc/opentelemetry-collector/config.yaml ]; then
-        systemctl start opentelemetry-collector.service
+    systemctl enable otelcol.service
+    if [ -f /etc/otelcol/config.yaml ]; then
+        systemctl start otelcol.service
     fi
 fi

opentelemetry-collector/opentelemetry-collector.service renamed to distributions/otelcol/otelcol.service

@@ -15,6 +15,6 @@
 # limitations under the License.
 
 if command -v systemctl >/dev/null 2>&1; then
-    systemctl stop opentelemetry-collector.service
-    systemctl disable opentelemetry-collector.service
+    systemctl stop otelcol.service
+    systemctl disable otelcol.service
 fi