Skip to content

Commit

Permalink
chore: Upgrade otel core to v114
Browse files Browse the repository at this point in the history
  • Loading branch information
rnishtala-sumo committed Nov 27, 2024
1 parent 972977b commit e7a0df4
Show file tree
Hide file tree
Showing 50 changed files with 3,367 additions and 3,071 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ for-all:
check-uniform-dependencies:
./ci/check_uniform_dependencies.sh

OT_CORE_VERSION := $(shell grep "otelcol_version: .*" otelcolbuilder/.otelcol-builder.yaml | cut -f 4 -d " ")
OT_CORE_VERSION := $(shell grep "version: .*" otelcolbuilder/.otelcol-builder.yaml | cut -f 4 -d " ")
OT_CONTRIB_VERSION := $(shell grep --max-count=1 '^ - gomod: github\.com/open-telemetry/opentelemetry-collector-contrib/' otelcolbuilder/.otelcol-builder.yaml | cut -d " " -f 6 | $(SED) "s/v//")
# usage: make update-ot OT_CORE_NEW=x.x.x OT_CONTRIB_NEW=y.y.y
.PHONY: update-ot
update-ot: install-gsed
@test $(OT_CORE_NEW) || (echo "usage: make update-ot OT_CORE_NEW=x.x.x OT_CONTRIB_NEW=y.y.y"; exit 1);
@test $(OT_CONTRIB_NEW) || (echo "usage: make update-ot OT_CORE_NEW=x.x.x OT_CONTRIB_NEW=y.y.y"; exit 1);
@echo "Updating OT core from $(OT_CORE_VERSION) to $(OT_CORE_NEW) and OT contrib from $(OT_CONTRIB_VERSION) to $(OT_CONTRIB_NEW)"
$(SED) -i "s/\(otelcol_version:\) $(OT_CORE_VERSION)$$/\1 $(OT_CORE_NEW)/" otelcolbuilder/.otelcol-builder.yaml
$(SED) -i "s/\(version:\) $(OT_CORE_VERSION)$$/\1 $(OT_CORE_NEW)/" otelcolbuilder/.otelcol-builder.yaml
$(SED) -i "s/\(go\.opentelemetry\.io\/collector\/.*\) v$(OT_CORE_VERSION)$$/\1 v$(OT_CORE_NEW)/" otelcolbuilder/.otelcol-builder.yaml
$(SED) -i "s/\(github\.com\/open-telemetry\/opentelemetry-collector-contrib\/.*\) v$(OT_CONTRIB_VERSION)$$/\1 v$(OT_CONTRIB_NEW)/" otelcolbuilder/.otelcol-builder.yaml
$(SED) -i "s/$(OT_CORE_VERSION)/$(OT_CORE_NEW)/" otelcolbuilder/Makefile
Expand Down
298 changes: 149 additions & 149 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ci/get_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ parse_params() {

parse_core_version() {
config="otelcolbuilder/.otelcol-builder.yaml"
regex='s/.*otelcol_version:[ ]+([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'
regex='s/.*version:[ ]+([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'
version="$(sed -En "${regex}" "${config}")"

if [[ -z "${version}" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/plugins_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ readonly GREP=grep
fi

readonly BUILDER_CONFIG="otelcolbuilder/.otelcol-builder.yaml"
OT_VERSION=$(yq e '.dist.otelcol_version' "${BUILDER_CONFIG}" | cut -f1,2 -d'.')
OT_VERSION=$(yq e '.dist.version' "${BUILDER_CONFIG}" | cut -f1,2 -d'.')
readonly OT_VERSION
readonly CONTRIB_PLUGIN_HTTP_URL_REGEX="https://github.com/open-telemetry/opentelemetry-collector(-contrib)?/tree/(v[0-9]+.[0-9]+.[0-9]+)/(receiver|processor|exporter|extension)/([a-zA-Z]+)"
readonly CONTRIB_PLUGIN_REGEX="github.com/open-telemetry/opentelemetry-collector(-contrib)?/(receiver|processor|exporter|extension)/([a-zA-Z]+)"
Expand Down
28 changes: 14 additions & 14 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,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.108.0/extension/storage/filestorage
[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/extension/storage/filestorage

### Basic configuration for metrics

Expand Down Expand Up @@ -196,7 +196,7 @@ service:
exporters: [sumologic]
```

[hostmetricsreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/receiver/hostmetricsreceiver/README.md
[hostmetricsreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/hostmetricsreceiver/README.md

### Basic configuration for traces

Expand Down Expand Up @@ -225,7 +225,7 @@ service:
exporters: [sumologic]
```

[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.108.0/receiver/otlpreceiver
[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.114.0/receiver/otlpreceiver

### Putting it all together

Expand Down Expand Up @@ -324,9 +324,9 @@ so keep in mind that to store credentials either the user needs a home directory
More information about this feature can be found in the [extension's documentation][sumologicextension_store_credentials].

[sumologic_webpage]: https://www.sumologic.com/
[sumologicextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/extension/sumologicextension
[sumologicexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/exporter/sumologicexporter
[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/hostmetricsreceiver
[sumologicextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/extension/sumologicextension
[sumologicexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/sumologicexporter
[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/hostmetricsreceiver
[sumologicextension_configuration]: ../pkg/extension/sumologicextension#configuration
[sumologicextension_store_credentials]: ../pkg/extension/sumologicextension/README.md#storing-credentials

Expand Down Expand Up @@ -421,7 +421,7 @@ service:
- hostmetrics
```

[sumologicexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/exporter/sumologicexporter/README.md
[sumologicexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/sumologicexporter/README.md

## Collecting logs from files

Expand Down Expand Up @@ -532,8 +532,8 @@ Flags: 0
Example configuration with example log can be found in [/examples/otelcolconfigs/logs_json/](/examples/otelcolconfigs/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.108.0/receiver/filelogreceiver
[debugexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.108.0/exporter/debugexporter
[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/filelogreceiver
[debugexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.114.0/exporter/debugexporter

## Setting source category

Expand Down Expand Up @@ -650,7 +650,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.108.0/receiver/prometheusreceiver/README.md
[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/prometheusreceiver/README.md
[prometheus_website]: https://prometheus.io/
[prometheus_relabel_config]: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config

Expand Down Expand Up @@ -706,7 +706,7 @@ service:
- statsd/another-app
```

[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/processor/resourceprocessor/README.md
[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/processor/resourceprocessor/README.md

## Setting source host

Expand Down Expand Up @@ -778,8 +778,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/docs/send-data/reference-information/metadata-naming-conventions#source-host
[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/processor/resourcedetectionprocessor/README.md
[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/processor/resourcedetectionprocessor/README.md#system-metadata
[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/processor/resourcedetectionprocessor/README.md
[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/processor/resourcedetectionprocessor/README.md#system-metadata

## Command-line configuration options

Expand Down Expand Up @@ -850,5 +850,5 @@ service:
# ...
```

[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/processor/metricstransformprocessor
[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/metricstransformprocessor
[prometheus_data_model]: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
52 changes: 26 additions & 26 deletions docs/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -440,12 +440,12 @@ receivers:
start_at: beginning
## encoding is substitute for Installed Collector `Encoding`.
## List of supported encodings:
## https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/filelogreceiver
## https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/filelogreceiver
encoding: utf-8
## multiline is Opentelemetry Collector substitute for `Enable Multiline Processing`.
## As multiline detection behaves slightly different than in Installed Collector
## the following section in filelog documentation is recommended to read:
## https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/filelogreceiver#multiline-configuration
## https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/filelogreceiver#multiline-configuration
multiline:
## line_start_pattern is substitute of `Boundary Regex`.
line_start_pattern: ^\d{4}
Expand Down Expand Up @@ -737,11 +737,11 @@ receivers:
start_at: end
operators:
## Extract timestamp into timestamp field using regex
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/pkg/stanza/docs/operators/regex_parser.md
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/pkg/stanza/docs/operators/regex_parser.md
- type: regex_parser
regex: (?P<timestamp>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} (\+|\-)\d{4})
## Parse timestamp from timestamp field
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/pkg/stanza/docs/operators/time_parser.md
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/pkg/stanza/docs/operators/time_parser.md
timestamp:
parse_from: attributes.timestamp
## Layout are substitute for Timestamp Format configuration
Expand Down Expand Up @@ -913,7 +913,7 @@ receivers:
listen_address: 0.0.0.0:514
## Add network attributes
## `net.peer.name` is going to be used as processors.source.source_host
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/tcplogreceiver#configuration
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/tcplogreceiver#configuration
add_attributes: true
## Use UDP receiver for UDP protocol
udplog/first receiver:
Expand All @@ -922,7 +922,7 @@ receivers:
listen_address: 0.0.0.0:514
## Add network attributes
## `net.peer.name` is going to be used as processors.source.source_host
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/udplogreceiver#configuration
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/udplogreceiver#configuration
add_attributes: true

processors:
Expand Down Expand Up @@ -1114,11 +1114,11 @@ receivers:
listen_address: 0.0.0.0:514
operators:
## Extract timestamp into timestamp field using regex
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/pkg/stanza/docs/operators/regex_parser.md
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/pkg/stanza/docs/operators/regex_parser.md
- type: regex_parser
regex: (?P<timestamp>^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2},\d{3} (\+|\-)\d{4})
## Parse timestamp from timestamp field
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/pkg/stanza/docs/operators//time_parser.md
## rel: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/pkg/stanza/docs/operators//time_parser.md
timestamp:
parse_from: attributes.timestamp
## Layout are substitute for Timestamp Format configuration
Expand Down Expand Up @@ -1292,7 +1292,7 @@ receivers:

## A list of images for which corresponding containers won't be scraped.
## Strings, regexes and globs are supported, more information in the receiver's readme:
## https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/receiver/dockerstatsreceiver#configuration
## https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/dockerstatsreceiver#configuration
excluded_images:
## Exclude particular image
- docker.io/library/nginx:1.2
Expand All @@ -1312,7 +1312,7 @@ receivers:
api_version: 1.22

## Enable or disable particular metrics.
## Full list of metrics with their default config is available at https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/receiver/dockerstatsreceiver/documentation.md
## Full list of metrics with their default config is available at https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/dockerstatsreceiver/documentation.md
metrics:
container.cpu.usage.percpu:
enabled: true
Expand Down Expand Up @@ -1399,7 +1399,7 @@ receivers:
docker_stats:
## A list of images for which corresponding containers won't be scraped.
## Strings, regexes and globs are supported, more information in the receiver's readme:
## https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/receiver/dockerstatsreceiver#configuration
## https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/dockerstatsreceiver#configuration
excluded_images:
## Exclude particular image
- docker.io/library/nginx:1.2
Expand Down Expand Up @@ -2496,20 +2496,20 @@ Remote Windows Performance Source is not supported by the OpenTelemetry Collecto

Windows Active Directory Source is not supported by the OpenTelemetry Collector.

[resourceprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/processor/resourceprocessor
[multiline]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/filelogreceiver#multiline-configuration
[supported_encodings]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/filelogreceiver#supported-encodings
[udplogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/udplogreceiver
[tcplogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/tcplogreceiver
[filelogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/filelogreceiver
[syslogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/receiver/syslogreceiver
[transformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/processor/transformprocessor
[filterprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/processor/filterprocessor
[resourceprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/resourceprocessor
[multiline]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/filelogreceiver#multiline-configuration
[supported_encodings]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/filelogreceiver#supported-encodings
[udplogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/udplogreceiver
[tcplogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/tcplogreceiver
[filelogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/filelogreceiver
[syslogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/receiver/syslogreceiver
[transformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/transformprocessor
[filterprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/processor/filterprocessor
[sumologicsyslog]: ../pkg/processor/sumologicsyslogprocessor/README.md
[network-semantic-convention]: https://github.com/open-telemetry/semantic-conventions/blob/cee22ec91448808ebcfa53df689c800c7171c9e1/docs/general/attributes.md#other-network-attributes
[sumologicextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/extension/sumologicextension/README.md
[sumologicexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/exporter/sumologicexporter/README.md
[syslogexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/exporter/syslogexporter/README.md
[sumologicextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/extension/sumologicextension/README.md
[sumologicexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/exporter/sumologicexporter/README.md
[syslogexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/exporter/syslogexporter/README.md
[user.properties]: https://help.sumologic.com/docs/send-data/installed-collectors/collector-installation-reference/user-properties
[proxy]: https://opentelemetry.io/docs/collector/configuration/#proxy-support
[common-parameters]: https://help.sumologic.com/docs/send-data/use-json-configure-sources#common-parameters-for-log-source-types
Expand All @@ -2526,9 +2526,9 @@ Windows Active Directory Source is not supported by the OpenTelemetry Collector.
[telegraf-input-netstat]: https://github.com/SumoLogic/telegraf/tree/v1.24.3-sumo-4/plugins/inputs/netstat/README.md
[telegraf-input-diskio]: https://github.com/SumoLogic/telegraf/tree/v1.24.3-sumo-4/plugins/inputs/diskio
[telegraf-input-disk]: https://github.com/SumoLogic/telegraf/tree/v1.24.3-sumo-4/plugins/inputs/disk
[dockerstatsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/receiver/dockerstatsreceiver
[dockerstatsmetrics]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.108.0/receiver/dockerstatsreceiver/documentation.md
[dockerstatsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/dockerstatsreceiver
[dockerstatsmetrics]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.114.0/receiver/dockerstatsreceiver/documentation.md
[sumologicschemaprocessor]: ../pkg/processor/sumologicschemaprocessor/README.md
[mask-filter]: https://help.sumologic.com/docs/send-data/use-json-configure-sources/#example-mask-filter
[ottlfuncs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.108.0/pkg/ottl/ottlfuncs#functions
[ottlfuncs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.114.0/pkg/ottl/ottlfuncs#functions
[forward-data]: https://help.sumologic.com/docs/manage/data-archiving/installed-collectors/
Loading

0 comments on commit e7a0df4

Please sign in to comment.