Skip to content

Commit

Permalink
Merge branch 'main' into chan-tim_migrateCompressEncoding
Browse files Browse the repository at this point in the history
  • Loading branch information
chan-tim-sumo authored Jul 9, 2024
2 parents b15a24d + 9214063 commit 149a3ed
Show file tree
Hide file tree
Showing 120 changed files with 3,430 additions and 1,810 deletions.
1 change: 1 addition & 0 deletions .changelog/1611.changed.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chore: upgrade otel core to 0.103.0
1 change: 1 addition & 0 deletions .changelog/1614.added.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat(opamp): Validate kafkametricsreceiver
8 changes: 4 additions & 4 deletions .github/workflows/dev_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,11 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.1.0

- name: Set up Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0

- name: Show Buildx platforms
run: echo ${{ steps.buildx.outputs.platforms }}
Expand Down Expand Up @@ -320,11 +320,11 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.1.0

- name: Set up Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0

- name: Show Buildx platforms
run: echo ${{ steps.buildx.outputs.platforms }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,11 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.1.0

- name: Set up Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0

- name: Show Buildx platforms
run: echo ${{ steps.buildx.outputs.platforms }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.1.0

- name: Set up Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0

- name: Show Buildx platforms
run: echo ${{ steps.buildx.outputs.platforms }}
Expand Down Expand Up @@ -203,11 +203,11 @@ jobs:
- uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3.0.0
uses: docker/setup-qemu-action@v3.1.0

- name: Set up Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0

- name: Show Buildx platforms
run: echo ${{ steps.buildx.outputs.platforms }}
Expand Down
7 changes: 1 addition & 6 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@ run:
linters-settings:
errcheck:
check-type-assertions: false
check-blank: true
check-blank: false

gosimple:
go: "1.21"

maligned:
# print struct with more effective memory layout or not, false by default
suggest-new: true

unused:
go: "1.21"

Expand All @@ -37,7 +33,6 @@ linters:
- ineffassign
- typecheck
- unused
- gosimple
- staticcheck

issues:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# For FIPS binary, there are some debian runtime dependencies
FROM debian:12.5 as otelcol
FROM debian:12.6 as otelcol
COPY otelcol-sumo /
# This shouldn't be necessary but sometimes we end up with execution bit not set.
# ref: https://github.com/open-telemetry/opentelemetry-collector/issues/1317
Expand All @@ -12,13 +12,13 @@ RUN tar czhf otelcol.tar.gz /otelcol-sumo $(ldd /otelcol-sumo | grep -oP "\/.*?
# however, we can copy full directory as root (/) to be base file structure for scratch image
RUN mkdir /output && tar xf /otelcol.tar.gz --directory /output

FROM alpine:3.20.0 as certs
FROM alpine:3.20.1 as certs
RUN apk --update add ca-certificates

FROM alpine:3.20.0 as directories
FROM alpine:3.20.1 as directories
RUN mkdir /etc/otel/

FROM debian:12.5 as systemd
FROM debian:12.6 as systemd
RUN apt update && apt install -y systemd
# prepare package with journald and it's dependencies keeping original paths
# h stands for dereference of symbolic links
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile_local
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ RUN apk --update add make gcc g++ curl git
RUN make install-builder BUILDER_BIN_PATH=/bin
RUN make build BUILDER_BIN_PATH=/bin

FROM alpine:3.20.0 as certs
FROM alpine:3.20.1 as certs
RUN apk --update add ca-certificates

FROM alpine:3.20.0 as directories
FROM alpine:3.20.1 as directories
RUN mkdir /etc/otel/

FROM debian:12.5 as systemd
FROM debian:12.6 as systemd
RUN apt update && apt install -y systemd
# prepare package with journald and it's dependencies keeping original paths
# h stands for dereference of symbolic links
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GOLANGCI_LINT_VERSION ?= v1.55.2
GOLANGCI_LINT_VERSION ?= v1.59.1
PRETTIER_VERSION ?= 3.0.3
TOWNCRIER_VERSION ?= 23.6.0
SHELL := /usr/bin/env bash
Expand Down
298 changes: 149 additions & 149 deletions README.md

Large diffs are not rendered by default.

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.102.0/extension/storage/filestorage
[filestorageextension_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.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.102.0/receiver/hostmetricsreceiver/README.md
[hostmetricsreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.103.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.102.1/receiver/otlpreceiver
[otlpreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.103.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.102.0/extension/sumologicextension
[sumologicexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.102.0/exporter/sumologicexporter
[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.102.0/receiver/hostmetricsreceiver
[sumologicextension]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.0/extension/sumologicextension
[sumologicexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.0/exporter/sumologicexporter
[hostmetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.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.102.0/exporter/sumologicexporter/README.md
[sumologicexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.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.102.0/receiver/filelogreceiver
[debugexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.102.1/exporter/debugexporter
[filelogreceiver_readme]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.0/receiver/filelogreceiver
[debugexporter_docs]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.103.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.102.0/receiver/prometheusreceiver/README.md
[prometheusreceiver_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.103.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.102.0/processor/resourceprocessor/README.md
[resourceprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.103.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.102.0/processor/resourcedetectionprocessor/README.md
[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.102.0/processor/resourcedetectionprocessor/README.md#system-metadata
[resourcedetectionprocessor_docs]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.103.0/processor/resourcedetectionprocessor/README.md
[resourcedetectionprocessor_system_detector]: https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.103.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.102.0/processor/metricstransformprocessor
[metricstransformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.103.0/processor/metricstransformprocessor
[prometheus_data_model]: https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels
Loading

0 comments on commit 149a3ed

Please sign in to comment.