Skip to content

Commit 213fcce

Browse files
committed
Merge remote-tracking branch 'bacherfl/feat/16214/scale-metric-values' into feat/16214/scale-metric-values
2 parents 15a2006 + f019ec0 commit 213fcce

File tree

148 files changed

+1274
-463
lines changed

Some content is hidden

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

148 files changed

+1274
-463
lines changed
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/telemetrygen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add support for specifying trace ID and span ID in telemetrygen for logs
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: [33234]
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: []

.chloggen/geoipprocessor_intro.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: 'new_component'
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: geoipprocessor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "introduce the GeoIP processor"
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: [ 32663 ]
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 ]

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ processor/cumulativetodeltaprocessor/ @open-telemetry/collect
163163
processor/deltatocumulativeprocessor/ @open-telemetry/collector-contrib-approvers @sh0rez @RichieSams @jpkrohling
164164
processor/deltatorateprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9
165165
processor/filterprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @boostchicken
166+
processor/geoipprocessor/ @open-telemetry/collector-contrib-approvers @andrzej-stencel @michalpristas @rogercoll
166167
processor/groupbyattrsprocessor/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo
167168
processor/groupbytraceprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
168169
processor/intervalprocessor/ @open-telemetry/collector-contrib-approvers @RichieSams @sh0rez @djaglowski

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ body:
159159
- processor/deltatocumulative
160160
- processor/deltatorate
161161
- processor/filter
162+
- processor/geoip
162163
- processor/groupbyattrs
163164
- processor/groupbytrace
164165
- processor/interval

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ body:
153153
- processor/deltatocumulative
154154
- processor/deltatorate
155155
- processor/filter
156+
- processor/geoip
156157
- processor/groupbyattrs
157158
- processor/groupbytrace
158159
- processor/interval

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ body:
153153
- processor/deltatocumulative
154154
- processor/deltatorate
155155
- processor/filter
156+
- processor/geoip
156157
- processor/groupbyattrs
157158
- processor/groupbytrace
158159
- processor/interval

.github/ISSUE_TEMPLATE/unmaintained.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ body:
158158
- processor/deltatocumulative
159159
- processor/deltatorate
160160
- processor/filter
161+
- processor/geoip
161162
- processor/groupbyattrs
162163
- processor/groupbytrace
163164
- processor/interval

cmd/configschema/go.mod

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ require (
2525
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 // indirect
2626
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect
2727
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
28-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.16.0 // indirect
29-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.16.0 // indirect
28+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.16.1 // indirect
29+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.16.1 // indirect
3030
github.com/gocql/gocql v1.6.0 // indirect
3131
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
3232
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.101.0 // indirect
@@ -274,9 +274,9 @@ require (
274274
github.com/DataDog/go-sqllexer v0.0.9 // indirect
275275
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
276276
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect
277-
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.16.0 // indirect
278-
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.16.0 // indirect
279-
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.16.0 // indirect
277+
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.16.1 // indirect
278+
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.16.1 // indirect
279+
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.16.1 // indirect
280280
github.com/DataDog/sketches-go v1.4.5 // indirect
281281
github.com/DataDog/viper v1.13.3 // indirect
282282
github.com/DataDog/zstd v1.5.2 // indirect
@@ -306,11 +306,11 @@ require (
306306
github.com/ardielle/ardielle-go v1.5.2 // indirect
307307
github.com/armon/go-metrics v0.4.1 // indirect
308308
github.com/armon/go-radix v1.0.0 // indirect
309-
github.com/aws/aws-sdk-go v1.53.7 // indirect
309+
github.com/aws/aws-sdk-go v1.53.10 // indirect
310310
github.com/aws/aws-sdk-go-v2 v1.27.0 // indirect
311311
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
312-
github.com/aws/aws-sdk-go-v2/config v1.27.15 // indirect
313-
github.com/aws/aws-sdk-go-v2/credentials v1.17.15 // indirect
312+
github.com/aws/aws-sdk-go-v2/config v1.27.16 // indirect
313+
github.com/aws/aws-sdk-go-v2/credentials v1.17.16 // indirect
314314
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.3 // indirect
315315
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15 // indirect
316316
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.7 // indirect
@@ -321,12 +321,12 @@ require (
321321
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
322322
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.9 // indirect
323323
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
324-
github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.7 // indirect
324+
github.com/aws/aws-sdk-go-v2/service/kinesis v1.27.8 // indirect
325325
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
326-
github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.9 // indirect
327-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.8 // indirect
328-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.2 // indirect
329-
github.com/aws/aws-sdk-go-v2/service/sts v1.28.9 // indirect
326+
github.com/aws/aws-sdk-go-v2/service/servicediscovery v1.29.10 // indirect
327+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.9 // indirect
328+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.24.3 // indirect
329+
github.com/aws/aws-sdk-go-v2/service/sts v1.28.10 // indirect
330330
github.com/aws/smithy-go v1.20.2 // indirect
331331
github.com/benbjohnson/clock v1.3.5 // indirect
332332
github.com/beorn7/perks v1.0.1 // indirect
@@ -376,13 +376,13 @@ require (
376376
github.com/envoyproxy/go-control-plane v0.12.0 // indirect
377377
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
378378
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
379-
github.com/expr-lang/expr v1.16.7 // indirect
379+
github.com/expr-lang/expr v1.16.9 // indirect
380380
github.com/facebook/time v0.0.0-20240510113249-fa89cc575891 // indirect
381381
github.com/fatih/color v1.16.0 // indirect
382382
github.com/felixge/httpsnoop v1.0.4 // indirect
383383
github.com/fsnotify/fsnotify v1.7.0 // indirect
384384
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
385-
github.com/getsentry/sentry-go v0.27.0 // indirect
385+
github.com/getsentry/sentry-go v0.28.0 // indirect
386386
github.com/go-faster/city v1.0.1 // indirect
387387
github.com/go-faster/errors v0.7.1 // indirect
388388
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
@@ -637,7 +637,7 @@ require (
637637
github.com/shopspring/decimal v1.3.1 // indirect
638638
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
639639
github.com/signalfx/sapm-proto v0.14.0 // indirect
640-
github.com/sijms/go-ora/v2 v2.8.18 // indirect
640+
github.com/sijms/go-ora/v2 v2.8.19 // indirect
641641
github.com/sirupsen/logrus v1.9.3 // indirect
642642
github.com/snowflakedb/gosnowflake v1.10.1-0.20240509141315-5570db2126fe // indirect
643643
github.com/soheilhy/cmux v0.1.5 // indirect
@@ -653,7 +653,7 @@ require (
653653
github.com/stretchr/objx v0.5.2 // indirect
654654
github.com/subosito/gotenv v1.6.0 // indirect
655655
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
656-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.925 // indirect
656+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.930 // indirect
657657
github.com/tg123/go-htpasswd v1.2.2 // indirect
658658
github.com/tidwall/gjson v1.14.3 // indirect
659659
github.com/tidwall/match v1.1.1 // indirect

0 commit comments

Comments
 (0)