chore: Remove logging.yaml (#1809)

* remove logging.yaml

* remove logging files

.goreleaser.yml

@@ -110,9 +110,6 @@ archives:
       - src: release_deps/opentelemetry-java-contrib-jmx-metrics.jar
         dst: "."
         strip_parent: true
-      - src: release_deps/logging.yaml
-        dst: "."
-        strip_parent: true
       - src: release_deps/plugins/*
         dst: plugins
         strip_parent: true
@@ -158,14 +155,6 @@ nfpms:
           mode: 0755
           owner: observiq-otel-collector
           group: observiq-otel-collector
-      # TODO: (dakota) evaluate this file once supervisor has support for configuring agent logging
-      - src: release_deps/logging.yaml
-        dst: /opt/observiq-otel-collector/logging.yaml
-        file_info:
-          mode: 0640
-          owner: observiq-otel-collector
-          group: observiq-otel-collector
-        type: config|noreplace
       - src: LICENSE
         dst: /opt/observiq-otel-collector/LICENSE
         file_info:
@@ -263,7 +252,6 @@ dockers:
     extra_files:
       - release_deps/VERSION.txt
       - release_deps/plugins
-      - config/logging.stdout.yaml
       - LICENSE
   - id: scratch-arm64
     goos: linux
@@ -286,7 +274,6 @@ dockers:
     extra_files:
       - release_deps/VERSION.txt
       - release_deps/plugins
-      - config/logging.stdout.yaml
       - LICENSE
   - id: ubuntu-amd64
     goos: linux
@@ -331,7 +318,6 @@ dockers:
     extra_files:
       - release_deps/VERSION.txt
       - release_deps/plugins
-      - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
   - id: ubuntu-arm64
@@ -377,7 +363,6 @@ dockers:
     extra_files:
       - release_deps/VERSION.txt
       - release_deps/plugins
-      - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
 
@@ -406,7 +391,6 @@ dockers:
     extra_files:
       - release_deps/VERSION.txt
       - release_deps/plugins
-      - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
   - id: ubi8-arm64
@@ -434,7 +418,6 @@ dockers:
     extra_files:
       - release_deps/VERSION.txt
       - release_deps/plugins
-      - config/logging.stdout.yaml
       - LICENSE
       - release_deps/opentelemetry-java-contrib-jmx-metrics.jar
 
@@ -627,14 +610,14 @@ docker_signs:
   - artifacts: all
     stdin: "{{ .Env.COSIGN_PWD }}"
     args: [
-      # Default options
-      "sign",
-      "--key=cosign.key",
-      "${artifact}",
-      "--yes",
-      # Additional options
-      "--recursive"
-    ]
+        # Default options
+        "sign",
+        "--key=cosign.key",
+        "${artifact}",
+        "--yes",
+        # Additional options
+        "--recursive",
+      ]
     output: true
 
 # https://goreleaser.com/customization/release/

Makefile

@@ -235,7 +235,6 @@ release-prep:
 	@echo 'v$(CURR_VERSION)' > release_deps/VERSION.txt
 	./buildscripts/download-dependencies.sh release_deps
 	@cp -r ./plugins release_deps/
-	@cp config/logging.yaml release_deps/logging.yaml
 	@cp service/com.observiq.collector.plist release_deps/com.observiq.collector.plist
 	@jq ".files[] | select(.service != null)" windows/wix.json >> release_deps/windows_service.json
 	@cp service/observiq-otel-collector.service release_deps/observiq-otel-collector.service

docker/Dockerfile.scratch

@@ -20,7 +20,6 @@ COPY LICENSE /licenses/observiq-otel-collector.license
 COPY release_deps/VERSION.txt /etc/otel/VERSION.txt
 
 COPY release_deps/plugins /etc/otel/plugins
-COPY config/logging.stdout.yaml /etc/otel/logging.yaml
 
 # Scratch images contain nothing by default. The built image
 # will contain only what was copied into it. This means it

docker/Dockerfile.ubi8

@@ -62,14 +62,6 @@ COPY opampsupervisor /collector/opampsupervisor
 COPY release_deps/opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
 COPY release_deps/plugins /etc/otel/plugins
 
-COPY config/logging.stdout.yaml /etc/otel/logging.yaml
-
-RUN chown otel:otel \
-    /etc/otel/logging.yaml
-
-RUN chmod 0600 \
-    /etc/otel/logging.yaml
-
 USER otel
 WORKDIR /etc/otel
 

docker/Dockerfile.ubuntu

@@ -61,15 +61,6 @@ COPY observiq-otel-collector /collector/observiq-otel-collector
 COPY opampsupervisor /collector/opampsupervisor
 
 COPY release_deps/opentelemetry-java-contrib-jmx-metrics.jar /opt/opentelemetry-java-contrib-jmx-metrics.jar
-COPY release_deps/plugins /etc/otel/plugins
-
-COPY config/logging.stdout.yaml /etc/otel/logging.yaml
-
-RUN chown otel:otel \
-    /etc/otel/logging.yaml
-
-RUN chmod 0600 \
-    /etc/otel/logging.yaml
 
 USER otel
 WORKDIR /etc/otel

scripts/install/install_macos.sh

@@ -498,10 +498,10 @@ install_package() {
   info "Copying artifacts to install directory..."
   increase_indent
 
-  # This find command gets a list of all artifacts paths except logging.yaml, or opentelemetry-java-contrib-jmx-metrics.jar
+  # This find command gets a list of all artifacts paths except opentelemetry-java-contrib-jmx-metrics.jar
   FILES=$(
     cd "$TMP_DIR/artifacts"
-    find "." -type f -not \( -name logging.yaml -or -name opentelemetry-java-contrib-jmx-metrics.jar \)
+    find "." -type f -not \( -name opentelemetry-java-contrib-jmx-metrics.jar \)
   )
   # Move files to install dir
   for f in $FILES; do
@@ -511,12 +511,6 @@ install_package() {
   decrease_indent
   succeeded
 
-  if [ ! -f "$INSTALL_DIR/logging.yaml" ]; then
-    info "Copying default logging.yaml..."
-    cp "$TMP_DIR/artifacts/logging.yaml" "$INSTALL_DIR/logging.yaml" || error_exit "$LINENO" "Failed to copy default logging.yaml to install dir"
-    succeeded
-  fi
-
   # If an endpoint was specified, we need to write the supervisor.yaml
   if [ -n "$OPAMP_ENDPOINT" ]; then
     create_supervisor_config "$SUPERVISOR_YML_PATH"

scripts/install/install_unix.sh

@@ -694,7 +694,6 @@ create_supervisor_config() {
     command printf '  accepts_remote_config: true\n' >>"$supervisor_yml_path"
     command printf '  reports_remote_config: true\n' >>"$supervisor_yml_path"
     command printf 'agent:\n' >>"$supervisor_yml_path"
-    # TODO(dakota): Add logging config option when supervisor suppports it
     command printf '  executable: "%s"\n' "$INSTALL_DIR/observiq-otel-collector" >>"$supervisor_yml_path"
     command printf '  description:\n' >>"$supervisor_yml_path"
     command printf '    non_identifying_attributes:\n' >>"$supervisor_yml_path"