Update log-collection to v0.29.0 (final independent release)

CHANGELOG.md

@@ -19,8 +19,8 @@
 ### 🛑 Breaking changes 🛑
 
 - `filelogreceiver`, `journaldreceiver`, `syslogreceiver`, `tcplogreceiver`, `udplogreceiver`:
-  - Updated data model to align with stable logs data model, which includes various breaking changes. (#8835)
-    - A detailed [Upgrade Guide](https://github.com/open-telemetry/opentelemetry-log-collection/releases/tag/v0.28.0) is available in the log-collection v0.28.0 release notes. 
+  - Updated data model to align with stable logs data model, which includes various breaking changes. (#9139, #8835)
+    - A detailed [Upgrade Guide](https://github.com/open-telemetry/opentelemetry-log-collection/releases/tag/v0.28.0) is available in the log-collection v0.29.0 release notes. 
 - `datadogexporter`: Remove `OnlyMetadata` method from `Config` struct (#8980)
 - `datadogexporter`: Remove `GetCensoredKey` method from `APIConfig` struct (#8980)
 - `mongodbatlasreceiver`: Updated to uses newer metric builder which changed some metric and resource attributes (#9093)

cmd/configschema/go.mod

@@ -364,7 +364,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.48.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.48.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.48.0 // indirect
-	github.com/open-telemetry/opentelemetry-log-collection v0.28.0 // indirect
+	github.com/open-telemetry/opentelemetry-log-collection v0.29.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opencontainers/runc v1.1.0 // indirect

examples/kubernetes/otel-collector-config.yml

@@ -25,7 +25,7 @@ receivers:
         regex: '^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$'
         output: extract_metadata_from_filepath
         timestamp:
-          parse_from: body.time
+          parse_from: attributes.time
           layout_type: gotime
           layout: '2006-01-02T15:04:05.000000000-07:00'
       # Parse CRI-Containerd format
@@ -34,42 +34,42 @@ receivers:
         regex: '^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$'
         output: extract_metadata_from_filepath
         timestamp:
-          parse_from: body.time
+          parse_from: attributes.time
           layout: '%Y-%m-%dT%H:%M:%S.%LZ'
       # Parse Docker format
       - type: json_parser
         id: parser-docker
         output: extract_metadata_from_filepath
         timestamp:
-          parse_from: body.time
+          parse_from: attributes.time
           layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+      - type: move
+        from: attributes.log
+        to: body
       # Extract metadata from file path
       - type: regex_parser
         id: extract_metadata_from_filepath
         regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$'
-        parse_from: attributes["file.path"]
-      # Move out attributes to Attributes
+        parse_from: attributes["log.file.path"]
+      # Rename attributes
       - type: move
-        from: body.stream
+        from: attributes.stream
         to: attributes["log.iostream"]
       - type: move
-        from: body.container_name
+        from: attributes.container_name
         to: attributes["k8s.container.name"]
       - type: move
-        from: body.namespace
+        from: attributes.namespace
         to: attributes["k8s.namespace.name"]
       - type: move
-        from: body.pod_name
+        from: attributes.pod_name
         to: attributes["k8s.pod.name"]
       - type: move
-        from: body.restart_count
+        from: attributes.restart_count
         to: attributes["k8s.container.restart_count"]
       - type: move
-        from: body.uid
+        from: attributes.uid
         to: attributes["k8s.pod.uid"]
-      - type: move
-        from: body.log
-        to: body
 exporters:
   logging:
     loglevel: debug

examples/kubernetes/otel-collector.yaml

@@ -32,7 +32,7 @@ data:
             regex: '^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$'
             output: extract_metadata_from_filepath
             timestamp:
-              parse_from: body.time
+              parse_from: attributes.time
               layout_type: gotime
               layout: '2006-01-02T15:04:05.000000000-07:00'
           # Parse CRI-Containerd format
@@ -41,42 +41,42 @@ data:
             regex: '^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$'
             output: extract_metadata_from_filepath
             timestamp:
-              parse_from: body.time
+              parse_from: attributes.time
               layout: '%Y-%m-%dT%H:%M:%S.%LZ'
           # Parse Docker format
           - type: json_parser
             id: parser-docker
             output: extract_metadata_from_filepath
             timestamp:
-              parse_from:  body.time
+              parse_from: attributes.time
               layout: '%Y-%m-%dT%H:%M:%S.%LZ'
+          - type: move
+            from: attributes.log
+            to: body
           # Extract metadata from file path
           - type: regex_parser
             id: extract_metadata_from_filepath
             regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$'
             parse_from: attributes["log.file.path"]
-          # Move out attributes to Attributes
+          # Rename attributes
           - type: move
-            from: body.stream
+            from: attributes.stream
             to: attributes["log.iostream"]
           - type: move
-            from: body.container_name
+            from: attributes.container_name
             to: attributes["k8s.container.name"]
           - type: move
-            from: body.namespace
+            from: attributes.namespace
             to: attributes["k8s.namespace.name"]
           - type: move
-            from: body.pod_name
+            from: attributes.pod_name
             to: attributes["k8s.pod.name"]
           - type: move
-            from: body.restart_count
+            from: attributes.restart_count
             to: attributes["k8s.container.restart_count"]
           - type: move
-            from: body.uid
+            from: attributes.uid
             to: attributes["k8s.pod.uid"]
-          - type: move
-            from: body.log
-            to: body
 
     processors:
       # k8sattributes processor to get the metadata from K8s

go.mod

@@ -362,7 +362,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.48.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.48.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.48.0 // indirect
-	github.com/open-telemetry/opentelemetry-log-collection v0.28.0 // indirect
+	github.com/open-telemetry/opentelemetry-log-collection v0.29.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opencontainers/runc v1.1.0 // indirect

internal/stanza/go.mod

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.48.0
-	github.com/open-telemetry/opentelemetry-log-collection v0.28.0
+	github.com/open-telemetry/opentelemetry-log-collection v0.29.0
 	github.com/stretchr/testify v1.7.1
 	go.opentelemetry.io/collector v0.48.0
 	go.opentelemetry.io/collector/model v0.48.0

receiver/filelogreceiver/README.md

@@ -83,6 +83,6 @@ receivers:
     operators:    
       - type: json_parser
         timestamp:
-          parse_from: time
+          parse_from: attributes.time
           layout: '%Y-%m-%d %H:%M:%S'
 ```

receiver/filelogreceiver/go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/observiq/nanojack v0.0.0-20201106172433-343928847ebc
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.48.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.48.0
-	github.com/open-telemetry/opentelemetry-log-collection v0.28.0
+	github.com/open-telemetry/opentelemetry-log-collection v0.29.0
 	github.com/stretchr/testify v1.7.1
 	go.opentelemetry.io/collector v0.48.0
 	go.opentelemetry.io/collector/model v0.48.0

receiver/journaldreceiver/go.mod

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.48.0
-	github.com/open-telemetry/opentelemetry-log-collection v0.28.0
+	github.com/open-telemetry/opentelemetry-log-collection v0.29.0
 	github.com/stretchr/testify v1.7.1
 	go.opentelemetry.io/collector v0.48.0
 	gopkg.in/yaml.v2 v2.4.0