chore(core): upgrade to v0.49.0 (#550)

* chore(core): upgrade to v0.49.0 Signed-off-by: Dominik Rosiek <[email protected]> * docs(changelog): update Signed-off-by: Dominik Rosiek <[email protected]> Co-authored-by: Patryk Małek <[email protected]> * chore(makefile): fix sed for linux Signed-off-by: Dominik Rosiek <[email protected]> Co-authored-by: Patryk Małek <[email protected]>
SumoLogic · Apr 22, 2022 · e9751f6 · e9751f6
1 parent abb158b
commit e9751f6
Show file tree

Hide file tree

Showing 10 changed files with 290 additions and 337 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,10 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - docs: clarify status of sumologicextension [#553][#553]
 - chore(deps): bump golang from 1.18 to 1.18.1 [#546][#546]
+- chore: bump OT core to v0.49.0 [#550][#550]
 
 [Unreleased]: https://github.com/SumoLogic/sumologic-otel-collector/compare/v0.48.0-sumo-0...main
-[#553]: https://github.com/SumoLogic/sumologic-otel-collector/pull/553
 [#546]: https://github.com/SumoLogic/sumologic-otel-collector/pull/546
+[#550]: https://github.com/SumoLogic/sumologic-otel-collector/pull/550
+[#553]: https://github.com/SumoLogic/sumologic-otel-collector/pull/553
 
 ## [v0.48.0-sumo-0]
 

diff --git a/Makefile b/Makefile
@@ -14,6 +14,12 @@ else
 SED ?= sed
 endif
 
+.PHONY: install-gsed
+install-gsed:
+ifeq ($(shell go env GOOS),darwin)
+	@which gsed || brew install gsed
+endif
+
 .PHONY: mdl
 mdl:
 	mdl --style .markdownlint/style.rb $(MD_FILES)
@@ -79,16 +85,16 @@ check-uniform-dependencies:
 OT_CORE_VERSION := $(shell grep "otelcol_version: .*" otelcolbuilder/.otelcol-builder.yaml | cut -f 4 -d " ")
 # usage: make update-ot-core OT_CORE_NEW_VERSION=x.x.x
 .PHONY: update-ot-core
-update-ot-core:
+update-ot-core: install-gsed
 	@test $(OT_CORE_NEW_VERSION) || (echo "usage: make update-otc-core OT_CORE_NEW_VERSION=x.x.x"; exit 1);
 	@echo "updating OT core from $(OT_CORE_VERSION) to $(OT_CORE_NEW_VERSION)"
-	@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/.otelcol-builder.yaml
-	@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/Makefile
-	@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" README.md
-	@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/Configuration.md
-	@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/KnownIssues.md
-	@sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" pkg/receiver/telegrafreceiver/README.md
-	@find . -type f -name "go.mod" -exec sed -i "" "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" {} \;
+	$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/.otelcol-builder.yaml
+	$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" otelcolbuilder/Makefile
+	$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" README.md
+	$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/Configuration.md
+	$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" docs/KnownIssues.md
+	$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" pkg/receiver/telegrafreceiver/README.md
+	@find . -type f -name "go.mod" -exec $(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW_VERSION)/" {} \;
 	@echo "building OT distro to check for breakage"
 	make gomod-download-all
 	pushd otelcolbuilder \
@@ -149,10 +155,7 @@ delete-tag:
 	done
 
 .PHONY: prepare-tag
-prepare-tag:
-ifeq ($(shell go env GOOS),darwin)
-	@which gsed || brew install gsed
-endif
+prepare-tag: install-gsed
 	@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
 	$(SED) -i 's#\(gomod: "github.com/SumoLogic/sumologic-otel-collector/.*\) v0.0.0-00010101000000-000000000000#\1 ${TAG}#g' \
 		otelcolbuilder/.otelcol-builder.yaml

diff --git a/README.md b/README.md
diff --git a/docs/Configuration.md b/docs/Configuration.md
@@ -126,7 +126,7 @@ to persist the position in the files it reads between restarts.
 
 See section below on [Collecting logs from files](#collecting-logs-from-files) for details on configuring the Filelog receiver.
 
-[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.48.0/extension/storage/filestorage
+[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.49.0/extension/storage/filestorage
 
 ### Basic configuration for metrics
 
@@ -186,7 +186,7 @@ service:
       exporters: [sumologic]
 ```
 
-[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.48.0/receiver/otlpreceiver
+[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.49.0/receiver/otlpreceiver
 
 ### Putting it all together
 
@@ -471,7 +471,7 @@ Flags: 0
 Example configuration with example log can be found in [/examples/logs_json/](/examples/logs_json/) directory.
 
 [json_parser]: https://github.com/open-telemetry/opentelemetry-log-collection/blob/main/docs/operators/json_parser.md
-[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.48.0/receiver/filelogreceiver
+[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.49.0/receiver/filelogreceiver
 [opentelemetry-log-collection]: https://github.com/open-telemetry/opentelemetry-log-collection
 
 ## Setting source category
@@ -586,7 +586,7 @@ The first example creates a `_sourceCategory` label with a hardcoded value of `d
 The second example creates a `_sourceCategory` label by copying to it the value of Prometheus' `job` label,
 which contains the name of the job - in this case, `otelcol-metrics`.
 
-[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/receiver/prometheusreceiver/README.md
+[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/receiver/prometheusreceiver/README.md
 [prometheus_website]: https://prometheus.io/
 [prometheus_relabel_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
 
@@ -642,7 +642,7 @@ service:
       - statsd/another-app
 ```
 
-[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/processor/resourceprocessor/README.md
+[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/processor/resourceprocessor/README.md
 
 ## Setting source host
 
@@ -714,8 +714,8 @@ Only the first Resource processor's action is required to correctly set the `_so
 The other two actions perform an optional metadata cleanup - they delete the unneeded attributes.
 
 [sumologic_source_host_docs]: https://help.sumologic.com/03Send-Data/Sources/04Reference-Information-for-Sources/Metadata-Naming-Conventions#source-host
-[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/processor/resourcedetectionprocessor/README.md
-[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/processor/resourcedetectionprocessor/README.md#system-metadata
+[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/processor/resourcedetectionprocessor/README.md
+[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/processor/resourcedetectionprocessor/README.md#system-metadata
 
 ## Command-line configuration options
 
@@ -786,5 +786,5 @@ service:
 # ...
 ```
 
-[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.48.0/processor/metricstransformprocessor
+[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.49.0/processor/metricstransformprocessor
 [prometheus_data_model]: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
diff --git a/docs/KnownIssues.md b/docs/KnownIssues.md
@@ -75,7 +75,7 @@ or only read files created or modified after a specific point in time.
 
 There is currently no workaround for this.
 
-[filelogreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.48.0/receiver/filelogreceiver/README.md
+[filelogreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.49.0/receiver/filelogreceiver/README.md
 
 ## Multiple multiline logs are sometimes concatenated
 

diff --git a/docs/Migration.md b/docs/Migration.md
@@ -611,21 +611,19 @@ receivers:
     - type: regex_parser
       regex: (?P<timestamp>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} (\+|\-)\d{4})
       ## Keep original record in log field
-      preserve_to: $$body.log
+      preserve_to: body.log
       ## Parse timestamp from timestamp field
       ## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/time_parser.md
       timestamp:
-        parse_from: $$body.timestamp
+        parse_from: body.timestamp
         ## Layout are substitute for Timestamp Format configuration
         layout_type: gotime
         layout: '2006-01-02 15:04:05,000 -0700'
     ## Restore record from log field
-    ## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/restructure.md#move
-    - type: restructure
-      ops:
-      - move:
-        from: $$body.log
-        to: $$body
+    ## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/move.md
+    - type: move
+      from: body.log
+      to: body
   # ...
 processors:
   resource/my example name fields:
@@ -1015,21 +1013,19 @@ receivers:
     - type: regex_parser
       regex: (?P<timestamp>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} (\+|\-)\d{4})
       ## Keep original record in log field
-      preserve_to: $$body.log
+      preserve_to: body.log
       ## Parse timestamp from timestamp field
       ## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/time_parser.md
       timestamp:
-        parse_from: $$body.timestamp
+        parse_from: body.timestamp
         ## Layout are substitute for Timestamp Format configuration
         layout_type: gotime
         layout: '2006-01-02 15:04:05,000 -0700'
     ## Restore record from log field
-    ## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/restructure.md#move
-    - type: restructure
-      ops:
-      - move:
-        from: $$body.log
-        to: $$body
+    ## rel: https://github.com/sumo-drosiek/opentelemetry-log-collection/blob/b506aadf913d6c1691cef10a534d495338c87dee/docs/operators/move.md
+    - type: move
+      from: body.log
+      to: body
 processors:
   ## All my example logs
   sumologic_syslog/my example name: