Skip to content

Commit f74d091

Browse files
juanhotencodingjuanhotencoding
authored
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents d4f5e8b + 2ec3148 commit f74d091

File tree

622 files changed

+21597
-19710
lines changed

Some content is hidden

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

622 files changed

+21597
-19710
lines changed

‎.chloggen/carbon-unnamed-regex-groups.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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: carbonreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Support unnamed groups in carbon receiver regex parser
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: [39137]
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+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

‎.chloggen/fix-36805.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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: spanmetricsconnector
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Separate Dimensions for calls and duration metrics
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: [36805]
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+
Add two new fields to the settings: `histogram.dimensions` and `calls_dimensions`.
20+
Use them to add independent dimensions to the duration and calls metrics.
21+
22+
# If your change doesn't affect end users or the exported elements of any package,
23+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
24+
# Optional: The change log or logs in which this entry should be included.
25+
# e.g. '[user]' or '[user, api]'
26+
# Include 'user' if the change is relevant to end users.
27+
# Include 'api' if there is a change to a library API.
28+
# Default: '[user]'
29+
change_logs: [user]

‎.chloggen/golden_docker.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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: cmd/golden
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add a docker image for golden
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: [39662]
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+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,13 @@ docker-telemetrygen:
360360
cd cmd/telemetrygen && docker build --platform linux/$(GOARCH) --build-arg="TARGETOS=$(GOOS)" --build-arg="TARGETARCH=$(GOARCH)" -t telemetrygen:latest .
361361
rm cmd/telemetrygen/telemetrygen_*
362362

363+
.PHONY: docker-golden
364+
docker-golden:
365+
GOOS=linux GOARCH=$(GOARCH) $(MAKE) golden
366+
cp bin/golden_* cmd/golden/
367+
cd cmd/golden && docker build --platform linux/$(GOARCH) --build-arg="TARGETOS=$(GOOS)" --build-arg="TARGETARCH=$(GOARCH)" -t golden:latest .
368+
rm cmd/golden/golden_*
369+
363370
.PHONY: generate
364371
generate: install-tools
365372
PATH="$(ROOT_DIR).tools:$$PATH" $(MAKE) for-all CMD="$(GOCMD) generate ./..."

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ See [CONTRIBUTING.md](CONTRIBUTING.md).
7070
Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/open-telemetry/teams/collector-contrib-triagers))
7171

7272
- [Benedikt Bongartz](https://github.com/frzifus), Red Hat
73-
- [Braydon Kains](https://github.com/braydonk), Google
7473
- [Florian Bacher](https://github.com/bacherfl), Dynatrace
7574
- [Israel Blancas](https://github.com/iblancasa), Coralogix
7675
- [James Moessis](https://github.com/jamesmoessis), Atlassian
@@ -92,6 +91,7 @@ Emeritus Triagers:
9291
Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs/open-telemetry/teams/collector-contrib-approvers)):
9392

9493
- [Arthur Silva Sens](https://github.com/ArthurSens), Grafana Labs
94+
- [Braydon Kains](https://github.com/braydonk), Google
9595
- [Christos Markou](https://github.com/ChrsMark), Elastic
9696
- [Curtis Robert](https://github.com/crobert-1), Splunk
9797
- [David Ashpole](https://github.com/dashpole), Google (on leave)

‎cmd/golden/Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM alpine:latest@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c AS certs
2+
RUN apk --update add ca-certificates
3+
4+
FROM scratch
5+
6+
ARG USER_UID=10001
7+
ARG USER_GID=10001
8+
USER ${USER_UID}:${USER_GID}
9+
10+
ARG TARGETOS
11+
ARG TARGETARCH
12+
13+
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
14+
COPY ./golden_${TARGETOS}_${TARGETARCH} /golden
15+
16+
ENTRYPOINT ["/golden"]

‎cmd/golden/go.mod

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.125.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
88
github.com/stretchr/testify v1.10.0
9-
go.opentelemetry.io/collector/component v1.31.1-0.20250430101735-2ecd0b7f95cd
10-
go.opentelemetry.io/collector/component/componenttest v0.125.1-0.20250430101735-2ecd0b7f95cd
11-
go.opentelemetry.io/collector/consumer v1.31.1-0.20250430101735-2ecd0b7f95cd
12-
go.opentelemetry.io/collector/pdata v1.31.1-0.20250430101735-2ecd0b7f95cd
13-
go.opentelemetry.io/collector/receiver v1.31.1-0.20250430101735-2ecd0b7f95cd
14-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.1-0.20250430101735-2ecd0b7f95cd
9+
go.opentelemetry.io/collector/component v1.31.1-0.20250501194116-727ae96d6214
10+
go.opentelemetry.io/collector/component/componenttest v0.125.1-0.20250501194116-727ae96d6214
11+
go.opentelemetry.io/collector/consumer v1.31.1-0.20250501194116-727ae96d6214
12+
go.opentelemetry.io/collector/pdata v1.31.1-0.20250501194116-727ae96d6214
13+
go.opentelemetry.io/collector/receiver v1.31.1-0.20250501194116-727ae96d6214
14+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.125.1-0.20250501194116-727ae96d6214
1515
go.opentelemetry.io/otel/metric v1.35.0
1616
go.opentelemetry.io/otel/trace v1.35.0
1717
go.uber.org/goleak v1.3.0
@@ -22,12 +22,14 @@ require (
2222
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/felixge/httpsnoop v1.0.4 // indirect
25+
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e // indirect
2526
github.com/fsnotify/fsnotify v1.9.0 // indirect
2627
github.com/go-logr/logr v1.4.2 // indirect
2728
github.com/go-logr/stdr v1.2.2 // indirect
2829
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
2930
github.com/gogo/protobuf v1.3.2 // indirect
3031
github.com/golang/snappy v1.0.0 // indirect
32+
github.com/google/go-tpm v0.9.3 // indirect
3133
github.com/google/uuid v1.6.0 // indirect
3234
github.com/hashicorp/go-version v1.7.0 // indirect
3335
github.com/json-iterator/go v1.1.12 // indirect
@@ -45,29 +47,29 @@ require (
4547
github.com/pmezard/go-difflib v1.0.0 // indirect
4648
github.com/rs/cors v1.11.1 // indirect
4749
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
48-
go.opentelemetry.io/collector v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
49-
go.opentelemetry.io/collector/client v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
50-
go.opentelemetry.io/collector/component/componentstatus v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
51-
go.opentelemetry.io/collector/config/configauth v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
52-
go.opentelemetry.io/collector/config/configcompression v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
53-
go.opentelemetry.io/collector/config/configgrpc v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
54-
go.opentelemetry.io/collector/config/confighttp v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
55-
go.opentelemetry.io/collector/config/configmiddleware v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
56-
go.opentelemetry.io/collector/config/confignet v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
57-
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
58-
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
59-
go.opentelemetry.io/collector/confmap v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
60-
go.opentelemetry.io/collector/consumer/consumererror v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
61-
go.opentelemetry.io/collector/consumer/xconsumer v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
62-
go.opentelemetry.io/collector/extension/extensionauth v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
63-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
64-
go.opentelemetry.io/collector/featuregate v1.31.1-0.20250430101735-2ecd0b7f95cd // indirect
65-
go.opentelemetry.io/collector/internal/sharedcomponent v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
66-
go.opentelemetry.io/collector/internal/telemetry v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
67-
go.opentelemetry.io/collector/pdata/pprofile v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
68-
go.opentelemetry.io/collector/pipeline v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
69-
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
70-
go.opentelemetry.io/collector/receiver/xreceiver v0.125.1-0.20250430101735-2ecd0b7f95cd // indirect
50+
go.opentelemetry.io/collector v0.125.1-0.20250501194116-727ae96d6214 // indirect
51+
go.opentelemetry.io/collector/client v1.31.1-0.20250501194116-727ae96d6214 // indirect
52+
go.opentelemetry.io/collector/component/componentstatus v0.125.1-0.20250501194116-727ae96d6214 // indirect
53+
go.opentelemetry.io/collector/config/configauth v0.125.1-0.20250501194116-727ae96d6214 // indirect
54+
go.opentelemetry.io/collector/config/configcompression v1.31.1-0.20250501194116-727ae96d6214 // indirect
55+
go.opentelemetry.io/collector/config/configgrpc v0.125.1-0.20250501194116-727ae96d6214 // indirect
56+
go.opentelemetry.io/collector/config/confighttp v0.125.1-0.20250501194116-727ae96d6214 // indirect
57+
go.opentelemetry.io/collector/config/configmiddleware v0.125.1-0.20250501194116-727ae96d6214 // indirect
58+
go.opentelemetry.io/collector/config/confignet v1.31.1-0.20250501194116-727ae96d6214 // indirect
59+
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250501194116-727ae96d6214 // indirect
60+
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250501194116-727ae96d6214 // indirect
61+
go.opentelemetry.io/collector/confmap v1.31.1-0.20250501194116-727ae96d6214 // indirect
62+
go.opentelemetry.io/collector/consumer/consumererror v0.125.1-0.20250501194116-727ae96d6214 // indirect
63+
go.opentelemetry.io/collector/consumer/xconsumer v0.125.1-0.20250501194116-727ae96d6214 // indirect
64+
go.opentelemetry.io/collector/extension/extensionauth v1.31.1-0.20250501194116-727ae96d6214 // indirect
65+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.125.1-0.20250501194116-727ae96d6214 // indirect
66+
go.opentelemetry.io/collector/featuregate v1.31.1-0.20250501194116-727ae96d6214 // indirect
67+
go.opentelemetry.io/collector/internal/sharedcomponent v0.125.1-0.20250501194116-727ae96d6214 // indirect
68+
go.opentelemetry.io/collector/internal/telemetry v0.125.1-0.20250501194116-727ae96d6214 // indirect
69+
go.opentelemetry.io/collector/pdata/pprofile v0.125.1-0.20250501194116-727ae96d6214 // indirect
70+
go.opentelemetry.io/collector/pipeline v0.125.1-0.20250501194116-727ae96d6214 // indirect
71+
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.1-0.20250501194116-727ae96d6214 // indirect
72+
go.opentelemetry.io/collector/receiver/xreceiver v0.125.1-0.20250501194116-727ae96d6214 // indirect
7173
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
7274
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
7375
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
@@ -76,6 +78,7 @@ require (
7678
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
7779
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
7880
go.uber.org/multierr v1.11.0 // indirect
81+
golang.org/x/crypto v0.37.0 // indirect
7982
golang.org/x/net v0.39.0 // indirect
8083
golang.org/x/sys v0.32.0 // indirect
8184
golang.org/x/text v0.24.0 // indirect

0 commit comments

Comments
 (0)