Skip to content

Commit effe649

Browse files
authored
Merge branch 'main' into switch_pulsar_exporter
2 parents 6583415 + 72c66f0 commit effe649

File tree

113 files changed

+739
-8223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+739
-8223
lines changed

.github/workflows/auto-instrumentation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Set up QEMU
2828
if: ${{ matrix.ARCH == 'arm64' }}
29-
uses: docker/setup-qemu-action@v2
29+
uses: docker/setup-qemu-action@v3
3030
with:
3131
platforms: arm64
3232
image: tonistiigi/binfmt:qemu-v7.0.0
@@ -102,7 +102,7 @@ jobs:
102102

103103
- name: Set up QEMU
104104
if: ${{ matrix.ARCH == 'arm64' }}
105-
uses: docker/setup-qemu-action@v2
105+
uses: docker/setup-qemu-action@v3
106106
with:
107107
platforms: arm64
108108
image: tonistiigi/binfmt:qemu-v7.0.0
@@ -131,7 +131,7 @@ jobs:
131131

132132
- name: Set up QEMU
133133
if: ${{ matrix.ARCH == 'arm64'}}
134-
uses: docker/setup-qemu-action@v2
134+
uses: docker/setup-qemu-action@v3
135135
with:
136136
platforms: arm64
137137
image: tonistiigi/binfmt:qemu-v7.0.0

.github/workflows/installer-script-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Check out the codebase.
6060
uses: actions/checkout@v4
6161

62-
- uses: docker/setup-qemu-action@v2
62+
- uses: docker/setup-qemu-action@v3
6363
if: ${{ matrix.ARCH != 'amd64' }}
6464
with:
6565
platforms: ${{ matrix.ARCH }}

.github/workflows/integration-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
key: agent-bundle-buildx-${{ matrix.ARCH }}-${{ hashFiles('internal/signalfx-agent/bundle/**') }}
5050
restore-keys: |
5151
agent-bundle-buildx-${{ matrix.ARCH }}-
52-
- uses: docker/setup-qemu-action@v2
52+
- uses: docker/setup-qemu-action@v3
5353
if: ${{ matrix.ARCH != 'amd64' }}
5454
with:
5555
platforms: ${{ matrix.ARCH }}
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
name: otelcol-${{ matrix.ARCH }}
8888
path: ./bin
89-
- uses: docker/setup-qemu-action@v2
89+
- uses: docker/setup-qemu-action@v3
9090
if: ${{ matrix.ARCH != 'amd64' }}
9191
with:
9292
platforms: ${{ matrix.ARCH }}
@@ -119,7 +119,7 @@ jobs:
119119
with:
120120
name: otelcol-${{ matrix.ARCH }}
121121
path: ./bin
122-
- uses: docker/setup-qemu-action@v2
122+
- uses: docker/setup-qemu-action@v3
123123
if: ${{ matrix.ARCH != 'amd64' }}
124124
with:
125125
platforms: ${{ matrix.ARCH }}

.github/workflows/linux-package-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
restore-keys: |
9494
agent-bundle-buildx-${{ matrix.ARCH }}-
9595
96-
- uses: docker/setup-qemu-action@v2
96+
- uses: docker/setup-qemu-action@v3
9797
if: ${{ matrix.ARCH != 'amd64' }}
9898
with:
9999
platforms: ${{ matrix.ARCH }}
@@ -200,7 +200,7 @@ jobs:
200200
name: ${{ env.SYS_PACKAGE }}-${{ matrix.ARCH }}-package
201201
path: ./dist
202202

203-
- uses: docker/setup-qemu-action@v2
203+
- uses: docker/setup-qemu-action@v3
204204
if: ${{ matrix.ARCH != 'amd64' }}
205205
with:
206206
platforms: ${{ matrix.ARCH }}
@@ -269,7 +269,7 @@ jobs:
269269

270270
- name: Set up QEMU
271271
if: ${{ matrix.ARCH != 'amd64' }}
272-
uses: docker/setup-qemu-action@v2
272+
uses: docker/setup-qemu-action@v3
273273
with:
274274
platforms: ${{ matrix.ARCH }}
275275
image: tonistiigi/binfmt:qemu-v7.0.0

.github/workflows/nomad.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
paths:
99
- 'deployments/nomad/**'
1010
- '.github/workflows/nomad.yml'
11+
- '!**.md'
1112

1213
permissions:
1314
contents: write

.github/workflows/vuln-scans.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
key: agent-bundle-buildx-${{ matrix.ARCH }}-${{ hashFiles('internal/signalfx-agent/bundle/**') }}
6666
restore-keys: |
6767
agent-bundle-buildx-${{ matrix.ARCH }}-
68-
- uses: docker/setup-qemu-action@v2
68+
- uses: docker/setup-qemu-action@v3
6969
if: ${{ matrix.ARCH != 'amd64' }}
7070
with:
7171
platforms: ${{ matrix.ARCH }}
@@ -91,7 +91,7 @@ jobs:
9191
fail-fast: false
9292
steps:
9393
- uses: actions/checkout@v4
94-
- uses: docker/setup-qemu-action@v2
94+
- uses: docker/setup-qemu-action@v3
9595
if: ${{ matrix.ARCH != 'amd64' }}
9696
with:
9797
platforms: ${{ matrix.ARCH }}
@@ -122,7 +122,7 @@ jobs:
122122
GRYPE_PLATFORM: ${{ matrix.ARCH }}
123123
steps:
124124
- uses: actions/checkout@v4
125-
- uses: docker/setup-qemu-action@v2
125+
- uses: docker/setup-qemu-action@v3
126126
if: ${{ matrix.ARCH != 'amd64' }}
127127
with:
128128
platforms: ${{ matrix.ARCH }}

.github/workflows/win-package-test.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,22 @@ jobs:
158158
name: msi-build
159159
path: ./tests/zeroconfig/windows/testdata/docker-setup/
160160

161+
- name: Get latest signalfx-dotnet-tracing release
162+
id: dotnet-tracing
163+
uses: pozetroninc/[email protected]
164+
with:
165+
owner: signalfx
166+
repo: signalfx-dotnet-tracing
167+
excludes: prerelease, draft
168+
token: ${{ secrets.GITHUB_TOKEN }}
169+
170+
- name: Set SIGNALFX_DOTNET_TRACING_VERSION
171+
run: |
172+
version="${{ steps.dotnet-tracing.outputs.release }}"
173+
sed -i "s|SIGNALFX_DOTNET_TRACING_VERSION|${version#v}|" tests/zeroconfig/windows/testdata/resource_traces/aspnetcore.yaml
174+
sed -i "s|SIGNALFX_DOTNET_TRACING_VERSION|${version#v}|" tests/zeroconfig/windows/testdata/resource_traces/aspnetfx.yaml
175+
shell: bash
176+
161177
- name: Run the test script
162178
working-directory: tests/zeroconfig/windows/
163179
run: |

.gitlab-ci.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,6 @@ agent-bundle-linux:
216216
TAG: arm
217217
tags:
218218
- $TAG
219-
cache:
220-
key: agent-bundle-${ARCH}
221-
paths:
222-
- .cache/buildx/agent-bundle-${ARCH}
223219
script:
224220
- *docker-reader-role
225221
- docker login -u $CIRCLECI_QUAY_USERNAME -p $CIRCLECI_QUAY_PASSWORD quay.io
@@ -282,6 +278,7 @@ sign-exe:
282278
- .trigger-filter
283279
- .submit-signing-request
284280
stage: sign-binaries
281+
retry: 2
285282
needs:
286283
- compile
287284
parallel:
@@ -300,6 +297,7 @@ sign-osx:
300297
- .trigger-filter
301298
- .submit-signing-request
302299
stage: sign-binaries
300+
retry: 2
303301
needs:
304302
- compile
305303
parallel:
@@ -409,6 +407,7 @@ sign-debs:
409407
- .trigger-filter
410408
- .submit-signing-request
411409
stage: sign-packages
410+
retry: 2
412411
needs:
413412
- build-deb
414413
- instrumentation-deb
@@ -431,6 +430,7 @@ sign-rpms:
431430
- .trigger-filter
432431
- .submit-signing-request
433432
stage: sign-packages
433+
retry: 2
434434
needs:
435435
- build-rpm
436436
- instrumentation-rpm
@@ -453,6 +453,7 @@ sign-tar:
453453
- .trigger-filter
454454
- .submit-signing-request
455455
stage: sign-packages
456+
retry: 2
456457
needs:
457458
- build-tar
458459
variables:
@@ -476,6 +477,7 @@ sign-msi:
476477
- .trigger-filter
477478
- .submit-signing-request
478479
stage: sign-packages
480+
retry: 2
479481
needs:
480482
- build-msi
481483
variables:
@@ -497,6 +499,7 @@ sign-agent-bundles:
497499
- .trigger-filter
498500
- .submit-signing-request
499501
stage: sign-packages
502+
retry: 2
500503
needs:
501504
- agent-bundle-linux
502505
- agent-bundle-windows
@@ -524,6 +527,7 @@ sign-ps-installer:
524527
- .trigger-filter
525528
- .submit-signing-request
526529
stage: sign-packages
530+
retry: 2
527531
dependencies: []
528532
variables:
529533
ARTIFACT: dist/install.ps1
@@ -818,6 +822,7 @@ sign-apt-metadata:
818822
- .trigger-filter
819823
- .submit-signing-request
820824
stage: sign-metadata
825+
retry: 2
821826
resource_group: artifactory-deb
822827
needs:
823828
- release-debs
@@ -836,6 +841,7 @@ sign-yum-metadata:
836841
- .trigger-filter
837842
- .submit-signing-request
838843
stage: sign-metadata
844+
retry: 2
839845
parallel:
840846
matrix:
841847
- ARCH: ['x86_64', 'aarch64']

CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,50 @@
22

33
## Unreleased
44

5+
## v0.85.0
6+
7+
***ADVANCED NOTICE - SPLUNK_LISTEN_INTERFACE DEFAULTS***
8+
9+
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`.
10+
11+
### 🛑 Breaking changes 🛑
12+
13+
- (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))
14+
Drop support of `HorizontalPodAutoscaler` `v2beta2` version and `CronJob` `v1beta1` version.
15+
Note that metrics for those resources will not be emitted anymore on Kubernetes 1.22 and older.
16+
- (Contrib) `prometheusexporters`: Append prometheus type and unit suffixes by default in prometheus exporters. ([#26488](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26488))
17+
Suffixes can be disabled by setting add_metric_suffixes to false on the exporter.
18+
- (Contrib) `attributesprocessor`, `resourceprocessor`: Transition featuregate `coreinternal.attraction.hash.sha256` to stable ([#4759](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/4759))
19+
20+
### 💡 Enhancements 💡
21+
22+
- (Splunk) `wavefrontreceiver`: Add wavefrontreceiver ([#3629](https://github.com/signalfx/splunk-otel-collector/pull/3629))
23+
- (Splunk) Update `splunk-otel-javaagent` to 1.28.0 ([#3647](https://github.com/signalfx/splunk-otel-collector/pull/3647))
24+
- (Contrib) `postgresqlreceiver`: Added postgresql.database.locks metric. ([#26317](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26317))
25+
- (Contrib) `receiver/statsdreceiver`: Add support for distribution type metrics in the statsdreceiver. ([#24768](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24768))
26+
- (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))
27+
- (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))
28+
- (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))
29+
30+
Available featuregates are:
31+
* `extension.jaegerremotesampling.replaceThriftWithProto`
32+
* `receiver.jaegerreceiver.replaceThriftWithProto`
33+
- (Contrib) `k8sclusterreceiver`: Add optional `k8s.kubelet.version`, `k8s.kubeproxy.version` node resource attributes ([#24835](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24835))
34+
- (Contrib) `k8sclusterreceiver`: Add `k8s.pod.status_reason` option metric ([#24034](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/24034))
35+
- (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))
36+
- (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))
37+
- (Core) `confighttp`: Add option to disable HTTP keep-alives ([#8260](https://github.com/open-telemetry/opentelemetry-collector/issues/8260))
38+
39+
### 🧰 Bug fixes 🧰
40+
41+
- (Splunk) `fluentd`: Update fluentd url for windows ([#3635](https://github.com/signalfx/splunk-otel-collector/pull/3635))
42+
- (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))
43+
- (Contrib) `processor/tailsampling`: Added saving instrumentation library information for tail-sampling ([#13642](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/13642))
44+
- (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))
45+
- (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))
46+
- (Contrib) `pkg/stanza`: Fix issue unsupported type 'syslog_parser' ([#26452](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/26452))
47+
- (Core) `confmap`: fix bugs of unmarshalling slice values ([#4001](https://github.com/open-telemetry/opentelemetry-collector/issues/4001))
48+
549
## v0.84.0
650

751
### 🛑 Breaking changes 🛑
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#####################################################################################
2+
# This file is generated by the Splunk Distribution of the OpenTelemetry Collector. #
3+
# #
4+
# It reflects the default configuration bundled in the Collector executable for use #
5+
# in discovery mode (--discovery) and is provided for reference or customization. #
6+
# Please note that any changes made to this file will need to be reconciled during #
7+
# upgrades of the Collector. #
8+
#####################################################################################
9+
# oracledb:
10+
# enabled: true
11+
# rule:
12+
# docker_observer: type == "container" and any([name, image, command], {# matches "(?i)oracle"}) and not (command matches "splunk.discovery")
13+
# host_observer: type == "hostport" and command matches "(?i)oracle" and not (command matches "splunk.discovery")
14+
# k8s_observer: type == "port" and pod.name matches "(?i)oracle"
15+
# config:
16+
# default:
17+
# endpoint: splunk.discovery.default
18+
# username: splunk.discovery.default
19+
# password: splunk.discovery.default
20+
# service: splunk.discovery.default
21+
# status:
22+
# metrics:
23+
# successful:
24+
# - strict: oracledb.cpu_time
25+
# first_only: true
26+
# log_record:
27+
# severity_text: info
28+
# body: oracledb receiver is working!
29+
# statements:
30+
# failed:
31+
# - regexp: "connection refused"
32+
# first_only: true
33+
# log_record:
34+
# severity_text: info
35+
# append_pattern: true
36+
# body: The container is not serving http connections.
37+
# - regexp: "received goaway and there are no active streams"
38+
# first_only: true
39+
# log_record:
40+
# severity_text: info
41+
# append_pattern: true
42+
# body: Unable to connect and scrape metrics.
43+
# - regexp: "dial tcp: lookup"
44+
# first_only: true
45+
# log_record:
46+
# severity_text: info
47+
# append_pattern: true
48+
# body: Unable to resolve oracledb tcp endpoint
49+
# - regexp: 'error executing select .*: EOF'
50+
# first_only: true
51+
# log_record:
52+
# severity_text: info
53+
# append_pattern: true
54+
# body: Unable to execute select from oracledb. Verify endpoint and user permissions.
55+
# partial:
56+
# - regexp: "listener does not currently know of service requested"
57+
# first_only: true
58+
# log_record:
59+
# severity_text: info
60+
# append_pattern: true
61+
# body: >-
62+
# Make sure your oracledb service is correctly specified using the
63+
# `--set splunk.discovery.receivers.oracledb.config.service="<service>"` command or the
64+
# `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_service="<service>"` environment variable.
65+
# - regexp: 'invalid username/password'
66+
# first_only: true
67+
# log_record:
68+
# severity_text: info
69+
# append_pattern: true
70+
# body: >-
71+
# Make sure your user credentials are correctly specified using the
72+
# `--set splunk.discovery.receivers.oracledb.config.username="<username>"` and
73+
# `--set splunk.discovery.receivers.oracledb.config.password="<password>"` command or the
74+
# `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_username="<username>"` and
75+
# `SPLUNK_DISCOVERY_RECEIVERS_oracledb_CONFIG_password="<password>"` environment variables.
76+
#

0 commit comments

Comments
 (0)