Bug fixes

Dockerfile

@@ -156,10 +156,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM centos7-build-golang-base AS centos7-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -257,10 +255,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM centos8-build-golang-base AS centos8-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -361,10 +357,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM rockylinux9-build-golang-base AS rockylinux9-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -460,10 +454,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM bookworm-build-golang-base AS bookworm-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -559,10 +551,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM bullseye-build-golang-base AS bullseye-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -660,10 +650,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM buster-build-golang-base AS buster-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -778,10 +766,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM sles12-build-golang-base AS sles12-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -882,10 +868,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM sles15-build-golang-base AS sles15-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -981,10 +965,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM focal-build-golang-base AS focal-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -1080,10 +1062,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM jammy-build-golang-base AS jammy-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -1179,10 +1159,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM lunar-build-golang-base AS lunar-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang
@@ -1278,10 +1256,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM mantic-build-golang-base AS mantic-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang

cmd/agent_wrapper/main_linux_test.go

@@ -17,11 +17,12 @@
 package main
 
 import (
+	"fmt"
 	"os/exec"
 	"strings"
 )
 
 // Get a command that will write the given number of bytes
 func getCommand(writeBytes int) *exec.Cmd {
-	return exec.Command("echo", strings.Repeat("a", int(writeBytes-1)))
+	return exec.Command("/bin/sh", "-c", fmt.Sprintf("echo %s", strings.Repeat("a", writeBytes-1)))
 }

debian/rules

@@ -8,9 +8,7 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	true
 override_dh_auto_test:
-	pwd
-	ls -la /work/cache/opt/google-cloud-ops-agent/subagents/fluent-bit/bin
-	go test ./...
+	PATH="/usr/local/go/bin:$$PATH" FLB="../cache/opt/google-cloud-ops-agent/subagents/fluent-bit/bin" go test ./...
 override_dh_strip_nondeterminism:
 	dh_strip_nondeterminism -X.jar
 override_dh_auto_install:

dockerfiles/compile_test.go

@@ -7,7 +7,9 @@ import (
 
 func TestDockerfileMatches(t *testing.T) {
 	gotDockerfile, err := os.ReadFile(getDockerfilePath())
-	if err != nil {
+	if os.IsNotExist(err) {
+		t.Skip("Dockerfile not found")
+	} else if err != nil {
 		t.Error(err)
 	}
 	expectedDockerfile, err := getDockerfile()

dockerfiles/template

@@ -71,10 +71,8 @@ RUN ./agent_wrapper.sh /work/cache/
 
 FROM {target_name}-build-golang-base AS {target_name}-build
 WORKDIR /work
-COPY cmd/google_cloud_ops_agent_engine cmd/google_cloud_ops_agent_engine
-COPY VERSION build.sh ./
-COPY debian debian
-COPY pkg pkg
+COPY . /work
+
 # Run the build script once to build the ops agent engine to a cache
 RUN mkdir -p /tmp/cache_run/golang && cp -r . /tmp/cache_run/golang
 WORKDIR /tmp/cache_run/golang

transformation_test/testdata/parse_json_upstream/config.yaml

@@ -0,0 +1,4 @@
+- type: parse_json
+  field: message
+  time_key: time
+  time_format: "%Y-%m-%dT%H:%M:%S %z"

transformation_test/testdata/parse_json_upstream/input.log

@@ -0,0 +1,2 @@
+{"key1": 12345, "key2": "abc", "time": "2006-07-28T13:22:04Z"}
+{"key1": 12345, "key2": "abc", "time": "2006-07-28T13:22:04+01:00"}

transformation_test/testdata/parse_json_upstream/output_fluentbit.yaml

@@ -0,0 +1,6 @@
+- date: 2006-07-28T13:22:04Z
+  key1: 12345
+  key2: abc
+- date: 2006-07-28T12:22:04Z
+  key1: 12345
+  key2: abc

transformation_test/testdata/test_timezone/config.yaml

@@ -0,0 +1,6 @@
+# When a timezone is not within a log Fluent-bit assumes UTC instead of system timezone
+# https://github.com/fluent/fluent-bit/issues/593#issuecomment-811183471
+- type: parse_json
+  field: message
+  time_key: time
+  time_format: "%Y-%m-%dT%H:%M"

transformation_test/testdata/test_timezone/input.log

@@ -0,0 +1 @@
+{"key1": 12345, "key2": "abc", "time": "2006-07-28T13:22"}

transformation_test/testdata/test_timezone/output_fluentbit.yaml

@@ -0,0 +1,3 @@
+- date: 2006-07-28T13:22:00Z
+  key1: 12345
+  key2: abc

transformation_test/transformation_test.go

@@ -7,6 +7,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strconv"
@@ -24,13 +25,13 @@ import (
 const (
 	flbMainConf          = "fluent_bit_main.conf"
 	flbParserConf        = "fluent_bit_parser.conf"
-	transformationInput  = "transformation_input.txt"
-	transformationOutput = "transformation_output.yaml"
+	transformationInput  = "input.log"
+	transformationOutput = "output_fluentbit.yaml"
 	flbTag               = "transformation_test"
 )
 
 var (
-	flbPath = flag.String("flb", "", "Fluent-bit path")
+	flbPath = flag.String("flb", os.Getenv("FLB"), "Fluent-bit path")
 )
 
 //go:embed testdata
@@ -163,7 +164,7 @@ func readTransformationConfig(dir string) (transformationTest, error) {
 	var transformationTestData []byte
 	var config transformationTest
 
-	transformationTestData, err := readFileFromTestDir(filepath.Join(dir, "transformation_config.yaml"))
+	transformationTestData, err := readFileFromTestDir(filepath.Join(dir, "config.yaml"))
 	if err != nil {
 		return config, err
 	}