Skip to content

Commit

Permalink
Merge branch 'main' into localhost_listen
Browse files Browse the repository at this point in the history
  • Loading branch information
hughesjj authored Oct 2, 2023
2 parents 74c922e + d71e534 commit 903ea1e
Show file tree
Hide file tree
Showing 148 changed files with 894 additions and 9,406 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
# https://docs.ansible.com/ansible/latest/os_guide/windows_faq.html#windows-faq-ansible
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
runs-on: macos-12
timeout-minutes: 60
timeout-minutes: 75
strategy:
fail-fast: false
matrix:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/auto-instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: Set up QEMU
if: ${{ matrix.ARCH == 'arm64' }}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
image: tonistiigi/binfmt:qemu-v7.0.0
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:

- name: Set up QEMU
if: ${{ matrix.ARCH == 'arm64' }}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
image: tonistiigi/binfmt:qemu-v7.0.0
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:

- name: Set up QEMU
if: ${{ matrix.ARCH == 'arm64'}}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
image: tonistiigi/binfmt:qemu-v7.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/installer-script-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- name: Check out the codebase.
uses: actions/checkout@v4

- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
key: agent-bundle-buildx-${{ matrix.ARCH }}-${{ hashFiles('internal/signalfx-agent/bundle/**') }}
restore-keys: |
agent-bundle-buildx-${{ matrix.ARCH }}-
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
with:
name: otelcol-${{ matrix.ARCH }}
path: ./bin
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
with:
name: otelcol-${{ matrix.ARCH }}
path: ./bin
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/linux-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
restore-keys: |
agent-bundle-buildx-${{ matrix.ARCH }}-
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
name: ${{ env.SYS_PACKAGE }}-${{ matrix.ARCH }}-package
path: ./dist

- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:

- name: Set up QEMU
if: ${{ matrix.ARCH != 'amd64' }}
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: ${{ matrix.ARCH }}
image: tonistiigi/binfmt:qemu-v7.0.0
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/nomad.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
paths:
- 'deployments/nomad/**'
- '.github/workflows/nomad.yml'
- '!**.md'

permissions:
contents: write
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/vuln-scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
key: agent-bundle-buildx-${{ matrix.ARCH }}-${{ hashFiles('internal/signalfx-agent/bundle/**') }}
restore-keys: |
agent-bundle-buildx-${{ matrix.ARCH }}-
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand All @@ -91,7 +91,7 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
GRYPE_PLATFORM: ${{ matrix.ARCH }}
steps:
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-qemu-action@v3
if: ${{ matrix.ARCH != 'amd64' }}
with:
platforms: ${{ matrix.ARCH }}
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/win-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,22 @@ jobs:
name: msi-build
path: ./tests/zeroconfig/windows/testdata/docker-setup/

- name: Get latest signalfx-dotnet-tracing release
id: dotnet-tracing
uses: pozetroninc/[email protected]
with:
owner: signalfx
repo: signalfx-dotnet-tracing
excludes: prerelease, draft
token: ${{ secrets.GITHUB_TOKEN }}

- name: Set SIGNALFX_DOTNET_TRACING_VERSION
run: |
version="${{ steps.dotnet-tracing.outputs.release }}"
sed -i "s|SIGNALFX_DOTNET_TRACING_VERSION|${version#v}|" tests/zeroconfig/windows/testdata/resource_traces/aspnetcore.yaml
sed -i "s|SIGNALFX_DOTNET_TRACING_VERSION|${version#v}|" tests/zeroconfig/windows/testdata/resource_traces/aspnetfx.yaml
shell: bash

- name: Run the test script
working-directory: tests/zeroconfig/windows/
run: |
Expand Down
14 changes: 10 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,6 @@ agent-bundle-linux:
TAG: arm
tags:
- $TAG
cache:
key: agent-bundle-${ARCH}
paths:
- .cache/buildx/agent-bundle-${ARCH}
script:
- *docker-reader-role
- docker login -u $CIRCLECI_QUAY_USERNAME -p $CIRCLECI_QUAY_PASSWORD quay.io
Expand Down Expand Up @@ -282,6 +278,7 @@ sign-exe:
- .trigger-filter
- .submit-signing-request
stage: sign-binaries
retry: 2
needs:
- compile
parallel:
Expand All @@ -300,6 +297,7 @@ sign-osx:
- .trigger-filter
- .submit-signing-request
stage: sign-binaries
retry: 2
needs:
- compile
parallel:
Expand Down Expand Up @@ -409,6 +407,7 @@ sign-debs:
- .trigger-filter
- .submit-signing-request
stage: sign-packages
retry: 2
needs:
- build-deb
- instrumentation-deb
Expand All @@ -431,6 +430,7 @@ sign-rpms:
- .trigger-filter
- .submit-signing-request
stage: sign-packages
retry: 2
needs:
- build-rpm
- instrumentation-rpm
Expand All @@ -453,6 +453,7 @@ sign-tar:
- .trigger-filter
- .submit-signing-request
stage: sign-packages
retry: 2
needs:
- build-tar
variables:
Expand All @@ -476,6 +477,7 @@ sign-msi:
- .trigger-filter
- .submit-signing-request
stage: sign-packages
retry: 2
needs:
- build-msi
variables:
Expand All @@ -497,6 +499,7 @@ sign-agent-bundles:
- .trigger-filter
- .submit-signing-request
stage: sign-packages
retry: 2
needs:
- agent-bundle-linux
- agent-bundle-windows
Expand Down Expand Up @@ -524,6 +527,7 @@ sign-ps-installer:
- .trigger-filter
- .submit-signing-request
stage: sign-packages
retry: 2
dependencies: []
variables:
ARTIFACT: dist/install.ps1
Expand Down Expand Up @@ -818,6 +822,7 @@ sign-apt-metadata:
- .trigger-filter
- .submit-signing-request
stage: sign-metadata
retry: 2
resource_group: artifactory-deb
needs:
- release-debs
Expand All @@ -836,6 +841,7 @@ sign-yum-metadata:
- .trigger-filter
- .submit-signing-request
stage: sign-metadata
retry: 2
parallel:
matrix:
- ARCH: ['x86_64', 'aarch64']
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,50 @@
- (Splunk) `SPLUNK_LISTEN_INTERFACE`: Move to use 127.0.0.1 for the network listen interface of the collector by default on Windows and Linux installers, as well as Chocolatey.
Users can override this behavior by configuring the installers and Chocolatey to use `0.0.0.0` to continue to use the previous default value. Please see [Advanced Configuration](https://github.com/signalfx/splunk-otel-collector#advanced-configuration) for more information.

## v0.85.0

***ADVANCED NOTICE - SPLUNK_LISTEN_INTERFACE DEFAULTS***

Starting with version 0.86.0 (next release), the collector installer will change the default value of the network listening interface option from `0.0.0.0` to `127.0.0.1`.

### 🛑 Breaking changes 🛑

- (Contrib) `k8sclusterreceiver`: Remove deprecated Kubernetes API resources ([#23612](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/23612), [#26551](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26551))
Drop support of `HorizontalPodAutoscaler` `v2beta2` version and `CronJob` `v1beta1` version.
Note that metrics for those resources will not be emitted anymore on Kubernetes 1.22 and older.
- (Contrib) `prometheusexporters`: Append prometheus type and unit suffixes by default in prometheus exporters. ([#26488](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26488))
Suffixes can be disabled by setting add_metric_suffixes to false on the exporter.
- (Contrib) `attributesprocessor`, `resourceprocessor`: Transition featuregate `coreinternal.attraction.hash.sha256` to stable ([#4759](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/4759))

### 💡 Enhancements 💡

- (Splunk) `wavefrontreceiver`: Add wavefrontreceiver ([#3629](https://github.com/signalfx/splunk-otel-collector/pull/3629))
- (Splunk) Update `splunk-otel-javaagent` to 1.28.0 ([#3647](https://github.com/signalfx/splunk-otel-collector/pull/3647))
- (Contrib) `postgresqlreceiver`: Added postgresql.database.locks metric. ([#26317](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26317))
- (Contrib) `receiver/statsdreceiver`: Add support for distribution type metrics in the statsdreceiver. ([#24768](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24768))
- (Contrib) `pkg/ottl`: Add converters to convert time to unix nanoseconds, unix microseconds, unix milliseconds or unix seconds ([#24686](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24686))
- (Contrib) `receiver/hostmetrics`: Don't collect connections data from the host if system.network.connections metric is disabled to not waste CPU cycles. ([#25815](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/25815))
- (Contrib) `jaegerreceiver`,`jaegerremotesamplingextension`: Add featuregates to replace Thrift-gen with Proto-gen types for sampling strategies ([#18401](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/18401))

Available featuregates are:
* `extension.jaegerremotesampling.replaceThriftWithProto`
* `receiver.jaegerreceiver.replaceThriftWithProto`
- (Contrib) `k8sclusterreceiver`: Add optional `k8s.kubelet.version`, `k8s.kubeproxy.version` node resource attributes ([#24835](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24835))
- (Contrib) `k8sclusterreceiver`: Add `k8s.pod.status_reason` option metric ([#24034](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24034))
- (Contrib) `k8sobjectsreceiver`: Adds logic to properly handle 410 response codes when watching. This improves the reliability of the receiver. ([#26098](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/26098))
- (Contrib) `k8sobjectreceiver`: Adds option to exclude event types (`MODIFIED`, `DELETED`, etc) in watch mode. ([#26042](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/26042))
- (Core) `confighttp`: Add option to disable HTTP keep-alives ([#8260](https://github.com/open-telemetry/opentelemetry-collector/issues/8260))

### 🧰 Bug fixes 🧰

- (Splunk) `fluentd`: Update fluentd url for windows ([#3635](https://github.com/signalfx/splunk-otel-collector/pull/3635))
- (Contrib) `processor/routing`: When using attributes instead of resource attributes, the routing processor would crash the collector. This does not affect the connector version of this component. ([#26462](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26462))
- (Contrib) `processor/tailsampling`: Added saving instrumentation library information for tail-sampling ([#13642](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/13642))
- (Contrib) `receiver/kubeletstats`: Fixes client to refresh service account token when authenticating with kubelet ([#26120](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26120))
- (Contrib) `filelogreceiver`: Fix the behavior of the add operator to continue to support `EXPR(env("MY_ENV_VAR"))` expressions ([#26373](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26373))
- (Contrib) `pkg/stanza`: Fix issue unsupported type 'syslog_parser' ([#26452](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26452))
- (Core) `confmap`: fix bugs of unmarshalling slice values ([#4001](https://github.com/open-telemetry/opentelemetry-collector/issues/4001))


## v0.84.0

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
#####################################################################################
# This file is generated by the Splunk Distribution of the OpenTelemetry Collector. #
# #
# It reflects the default configuration bundled in the Collector executable for use #
# in discovery mode (--discovery) and is provided for reference or customization. #
# Please note that any changes made to this file will need to be reconciled during #
# upgrades of the Collector. #
#####################################################################################
# oracledb:
# enabled: true
# rule:
# docker_observer: type == "container" and any([name, image, command], {# matches "(?i)oracle"}) and not (command matches "splunk.discovery")
# host_observer: type == "hostport" and command matches "(?i)oracle" and not (command matches "splunk.discovery")
# k8s_observer: type == "port" and pod.name matches "(?i)oracle"
# config:
# default:
# endpoint: splunk.discovery.default
# username: splunk.discovery.default
# password: splunk.discovery.default
# service: splunk.discovery.default
# status:
# metrics:
# successful:
# - strict: oracledb.cpu_time
# first_only: true
# log_record:
# severity_text: info
# body: oracledb receiver is working!
# statements:
# failed:
# - regexp: "connection refused"
# first_only: true
# log_record:
# severity_text: info
# append_pattern: true
# body: The container is not serving http connections.
# - regexp: "received goaway and there are no active streams"
# first_only: true
# log_record:
# severity_text: info
# append_pattern: true
# body: Unable to connect and scrape metrics.
# - regexp: "dial tcp: lookup"
# first_only: true
# log_record:
# severity_text: info
# append_pattern: true
# body: Unable to resolve oracledb tcp endpoint
# - regexp: 'error executing select .*: EOF'
# first_only: true
# log_record:
# severity_text: info
# append_pattern: true
# body: Unable to execute select from oracledb. Verify endpoint and user permissions.
# partial:
# - regexp: "listener does not currently know of service requested"
# first_only: true
# log_record:
# severity_text: info
# append_pattern: true
# body: >-
# Make sure your oracledb service is correctly specified using the
# `--set splunk.discovery.receivers.oracledb.config.service="<service>"` command or the
# `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_service="<service>"` environment variable.
# - regexp: 'invalid username/password'
# first_only: true
# log_record:
# severity_text: info
# append_pattern: true
# body: >-
# Make sure your user credentials are correctly specified using the
# `--set splunk.discovery.receivers.oracledb.config.username="<username>"` and
# `--set splunk.discovery.receivers.oracledb.config.password="<password>"` command or the
# `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_username="<username>"` and
# `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_password="<password>"` environment variables.
#
Loading

0 comments on commit 903ea1e

Please sign in to comment.