Skip to content

Commit 1576b79

Browse files
xavirgxavirg
authored
Merge branch 'main' into main
2 parents e738ba2 + 95e35ee commit 1576b79

File tree

1,414 files changed

+18947
-18735
lines changed

Some content is hidden

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

1,414 files changed

+18947
-18735
lines changed

‎.chloggen/38081-add-new-batching-coralogix-exporter.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: coralogixexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add new batching capabilities to the Coralogix exporter.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38081]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: |
19+
This change adds a new batching capabilities to the Coralogix exporter.
20+
This change is triggered by https://github.com/open-telemetry/opentelemetry-collector/issues/8122.
21+
22+
The new batching capabilities are disabled by default.
23+
To enable them, you need to set the following configuration:
24+
25+
```yaml
26+
exporters:
27+
coralogix:
28+
batcher:
29+
enabled: true # Enable batching
30+
flush_timeout: 3s # Flush timeout
31+
min_size_items: 8888 # Minimum number of items to flush
32+
max_size_items: 10000 # Maximum number of items to batch
33+
```
34+
35+
# If your change doesn't affect end users or the exported elements of any package,
36+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
37+
# Optional: The change log or logs in which this entry should be included.
38+
# e.g. '[user]' or '[user, api]'
39+
# Include 'user' if the change is relevant to end users.
40+
# Include 'api' if there is a change to a library API.
41+
# Default: '[user]'
42+
change_logs: []

‎.github/workflows/build-and-test.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,22 @@ jobs:
289289
path: ~/.cache/go-build
290290
key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ matrix.runner }}-${{ hashFiles('**/go.sum') }}
291291
- name: Run Unit Tests
292-
if: startsWith( matrix.go-version, '1.22' ) != true
292+
if: startsWith( matrix.go-version, '1.23' ) != true
293293
run: make gotest GROUP=${{ matrix.group }}
294-
- name: Run Unit Tests With Coverage
295-
if: startsWith( matrix.go-version, '1.22' ) # only run coverage on one version
296-
run: make gotest-with-cover GROUP=${{ matrix.group }}
294+
- name: Run Unit Tests With JUnit and Coverage
295+
if: startsWith( matrix.go-version, '1.23' ) # only run junit/coverage on one version
296+
run: make gotest-with-junit-and-cover GROUP=${{ matrix.group }}
297297
- uses: actions/upload-artifact@v4
298-
if: startsWith( matrix.go-version, '1.22' ) # only upload artifact for one version
298+
if: startsWith( matrix.go-version, '1.23' ) # only upload artifact for one version
299299
with:
300300
name: coverage-artifacts-${{ matrix.go-version }}-${{ matrix.runner }}-${{ matrix.group }}
301301
path: ${{ matrix.group }}-coverage.txt
302+
- uses: actions/upload-artifact@v4
303+
if: startsWith( matrix.go-version, '1.23' ) # only upload artifact for one version
304+
with:
305+
name: test-results-${{ matrix.go-version }}-${{ matrix.runner }}-${{ matrix.group }}
306+
path: internal/tools/testresults/
307+
retention-days: 4
302308
unittest:
303309
if: ${{ github.actor != 'dependabot[bot]' && always() }}
304310
runs-on: ubuntu-24.04

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ __debug_bin*
3535
coverage/*
3636
*-coverage.txt
3737
integration-coverage.html
38+
internal/tools/testresults/*
3839

3940
# Wix
4041
*.wixobj

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./
1717

1818
### 🛑 Breaking changes 🛑
1919

20+
- `receiver/prometheus`: Prometheus receiver now uses scrapers in Prometheus 3.0. (#36873)
21+
There are a number of breaking changes in Prometheus 3.0. Learn more about those changes and migration guide on https://prometheus.io/docs/prometheus/latest/migration/.
2022
- `all`: Added support for go1.24, bumped minimum version to 1.23 (#37875)
2123
- `elasticsearchexporter`: Use go-elasticsearch/v8, require minimum version of ES 7.17.x or 8.x (#32454)
2224
- `elasticsearchexporter`: Remove dedot config. ECS mode now always dedots, no others dedot at all. (#33772)

‎Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ gotest:
154154
gotest-with-cover:
155155
@$(MAKE) $(FOR_GROUP_TARGET) TARGET="test-with-cover"
156156
$(GOCMD) tool covdata textfmt -i=./coverage/unit -o ./$(GROUP)-coverage.txt
157+
158+
.PHONY: gotest-with-junit
159+
gotest-with-junit:
160+
@$(MAKE) for-all-target TARGET="test-with-junit"
161+
162+
.PHONY: gotest-with-junit-and-cover
163+
gotest-with-junit-and-cover:
164+
@$(MAKE) for-all-target TARGET="test-with-junit-and-cover"
157165

158166
.PHONY: gobuildtest
159167
gobuildtest:

‎Makefile.Common

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ GOTESTARCH?=$(GOARCH)
3030

3131
DOCKERCMD ?= docker
3232

33+
CURR_MOD := $(shell go list -m | tr '/' '-' )
34+
3335
# In order to help reduce toil related to managing tooling for the open telemetry collector
3436
# this section of the makefile looks at only requiring command definitions to be defined
3537
# as part of $(TOOLS_MOD_DIR)/tools.go, following the existing practice.
@@ -42,6 +44,9 @@ TOOLS_BIN_DIR := $(SRC_ROOT)/.tools
4244
TOOLS_BIN_NAMES := $(addprefix $(TOOLS_BIN_DIR)/, $(notdir $(TOOLS_PKG_NAMES)))
4345
CHLOGGEN_CONFIG := .chloggen/config.yaml
4446

47+
# no trailing slash
48+
JUNIT_OUT_DIR ?= $(TOOLS_MOD_DIR)/testresults
49+
4550
.PHONY: install-tools
4651
install-tools: $(TOOLS_BIN_NAMES)
4752

@@ -107,6 +112,17 @@ do-unit-tests-with-cover: $(GOTESTSUM)
107112
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." -- $(GOTEST_OPT_WITH_COVERAGE)
108113
$(GOCMD) tool cover -html=coverage.txt -o coverage.html
109114

115+
.PHONY: test-with-junit
116+
test-with-junit: $(GOTESTSUM)
117+
mkdir -p $(JUNIT_OUT_DIR)
118+
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." --junitfile $(JUNIT_OUT_DIR)/$(CURR_MOD)-junit.xml -- $(GOTEST_OPT) ./...
119+
120+
.PHONY: test-with-junit-and-cover
121+
test-with-junit-and-cover: $(GOTESTSUM)
122+
mkdir -p $(JUNIT_OUT_DIR)
123+
$(GOTESTSUM) $(GOTESTSUM_OPT) --packages="./..." --junitfile $(JUNIT_OUT_DIR)/$(CURR_MOD)-junit.xml -- $(GOTEST_OPT_WITH_COVERAGE) ./...
124+
$(GOCMD) tool cover -html=coverage.txt -o coverage.html
125+
110126
.PHONY: buildtest
111127
buildtest:
112128
ifneq (,$(wildcard ./*.go))

‎cmd/githubgen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.23.0
55

66
require (
77
github.com/google/go-github/v69 v69.2.0
8-
go.opentelemetry.io/collector/confmap v1.26.1-0.20250219144032-c2af75d88e89
9-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250219144032-c2af75d88e89
8+
go.opentelemetry.io/collector/confmap v1.26.1-0.20250221111745-6de29ce16921
9+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250221111745-6de29ce16921
1010
gopkg.in/yaml.v3 v3.0.1
1111
)
1212

‎cmd/githubgen/go.sum

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/opampsupervisor/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ require (
1212
github.com/knadh/koanf/v2 v2.1.2
1313
github.com/open-telemetry/opamp-go v0.18.0
1414
github.com/stretchr/testify v1.10.0
15-
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250219144032-c2af75d88e89
16-
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250219144032-c2af75d88e89
17-
go.opentelemetry.io/collector/confmap v1.26.1-0.20250219144032-c2af75d88e89
18-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250219144032-c2af75d88e89
19-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250219144032-c2af75d88e89
20-
go.opentelemetry.io/collector/semconv v0.120.1-0.20250219144032-c2af75d88e89
15+
go.opentelemetry.io/collector/config/configopaque v1.26.1-0.20250221111745-6de29ce16921
16+
go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250221111745-6de29ce16921
17+
go.opentelemetry.io/collector/confmap v1.26.1-0.20250221111745-6de29ce16921
18+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250221111745-6de29ce16921
19+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250221111745-6de29ce16921
20+
go.opentelemetry.io/collector/semconv v0.120.1-0.20250221111745-6de29ce16921
2121
go.uber.org/goleak v1.3.0
2222
go.uber.org/zap v1.27.0
2323
golang.org/x/sys v0.30.0

‎cmd/opampsupervisor/go.sum

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/otelcontribcol/builder-config.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dist:
1414
output_path: ./cmd/otelcontribcol
1515

1616
extensions:
17-
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.1-0.20250219144032-c2af75d88e89
17+
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.120.1-0.20250221111745-6de29ce16921
1818
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.120.1
1919
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.120.1
2020
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.120.1
@@ -52,10 +52,10 @@ extensions:
5252
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/skywalkingencodingextension v0.120.1
5353

5454
exporters:
55-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.1-0.20250219144032-c2af75d88e89
56-
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.120.1-0.20250219144032-c2af75d88e89
57-
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.120.1-0.20250219144032-c2af75d88e89
58-
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.1-0.20250219144032-c2af75d88e89
55+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.120.1-0.20250221111745-6de29ce16921
56+
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.120.1-0.20250221111745-6de29ce16921
57+
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.120.1-0.20250221111745-6de29ce16921
58+
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.120.1-0.20250221111745-6de29ce16921
5959
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.120.1
6060
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.120.1
6161
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.120.1
@@ -105,8 +105,8 @@ exporters:
105105
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.120.1
106106

107107
processors:
108-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250219144032-c2af75d88e89
109-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250219144032-c2af75d88e89
108+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250221111745-6de29ce16921
109+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250221111745-6de29ce16921
110110
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.120.1
111111
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.120.1
112112
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.120.1
@@ -132,8 +132,8 @@ processors:
132132
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.120.1
133133

134134
receivers:
135-
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.120.1-0.20250219144032-c2af75d88e89
136-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250219144032-c2af75d88e89
135+
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.120.1-0.20250221111745-6de29ce16921
136+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.120.1-0.20250221111745-6de29ce16921
137137
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.120.1
138138
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.120.1
139139
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.120.1
@@ -230,7 +230,7 @@ receivers:
230230
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.120.1
231231

232232
connectors:
233-
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.120.1-0.20250219144032-c2af75d88e89
233+
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.120.1-0.20250221111745-6de29ce16921
234234
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.120.1
235235
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.120.1
236236
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.120.1
@@ -245,11 +245,11 @@ connectors:
245245
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/signaltometricsconnector v0.120.1
246246

247247
providers:
248-
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250219144032-c2af75d88e89
249-
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250219144032-c2af75d88e89
250-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.1-0.20250219144032-c2af75d88e89
251-
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.1-0.20250219144032-c2af75d88e89
252-
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.1-0.20250219144032-c2af75d88e89
248+
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.26.1-0.20250221111745-6de29ce16921
249+
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.1-0.20250221111745-6de29ce16921
250+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.26.1-0.20250221111745-6de29ce16921
251+
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.26.1-0.20250221111745-6de29ce16921
252+
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.26.1-0.20250221111745-6de29ce16921
253253
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.120.1
254254
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider v0.120.1
255255

0 commit comments

Comments
 (0)