Skip to content

Commit 8cf3541

Browse files
sincejunesincejune
authored
Merge branch 'main' into support-logs-scraper
2 parents c03a55f + f9341b2 commit 8cf3541

File tree

101 files changed

+1151
-1002
lines changed

Some content is hidden

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

101 files changed

+1151
-1002
lines changed

‎.chloggen/mx-psi_deprecate-metricslevel-toplevel.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: cmd/mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove dead field `telemetry::level`
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12144]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

‎cmd/mdatagen/go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ require (
2222
go.opentelemetry.io/collector/scraper v0.118.0
2323
go.opentelemetry.io/collector/scraper/scrapertest v0.118.0
2424
go.opentelemetry.io/collector/semconv v0.118.0
25-
go.opentelemetry.io/otel/metric v1.32.0
26-
go.opentelemetry.io/otel/sdk v1.32.0
27-
go.opentelemetry.io/otel/sdk/metric v1.32.0
28-
go.opentelemetry.io/otel/trace v1.32.0
25+
go.opentelemetry.io/otel/metric v1.34.0
26+
go.opentelemetry.io/otel/sdk v1.34.0
27+
go.opentelemetry.io/otel/sdk/metric v1.34.0
28+
go.opentelemetry.io/otel/trace v1.34.0
2929
go.uber.org/goleak v1.3.0
3030
go.uber.org/multierr v1.11.0
3131
go.uber.org/zap v1.27.0
@@ -50,6 +50,7 @@ require (
5050
github.com/modern-go/reflect2 v1.0.2 // indirect
5151
github.com/pmezard/go-difflib v1.0.0 // indirect
5252
github.com/spf13/pflag v1.0.5 // indirect
53+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
5354
go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect
5455
go.opentelemetry.io/collector/consumer/consumererror v0.118.0 // indirect
5556
go.opentelemetry.io/collector/consumer/xconsumer v0.118.0 // indirect
@@ -58,9 +59,9 @@ require (
5859
go.opentelemetry.io/collector/pipeline v0.118.0 // indirect
5960
go.opentelemetry.io/collector/processor/xprocessor v0.118.0 // indirect
6061
go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect
61-
go.opentelemetry.io/otel v1.32.0 // indirect
62+
go.opentelemetry.io/otel v1.34.0 // indirect
6263
golang.org/x/net v0.33.0 // indirect
63-
golang.org/x/sys v0.28.0 // indirect
64+
golang.org/x/sys v0.29.0 // indirect
6465
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
6566
google.golang.org/grpc v1.69.4 // indirect
6667
google.golang.org/protobuf v1.36.3 // indirect

‎cmd/mdatagen/go.sum

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

‎cmd/mdatagen/internal/telemetry.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33

44
package internal // import "go.opentelemetry.io/collector/cmd/mdatagen/internal"
55

6-
import (
7-
"go.opentelemetry.io/collector/config/configtelemetry"
8-
)
9-
106
type Telemetry struct {
11-
Level configtelemetry.Level `mapstructure:"level"`
127
Metrics map[MetricName]Metric `mapstructure:"metrics"`
138
}
149

‎cmd/otelcorecol/go.mod

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ require (
4949
github.com/gogo/protobuf v1.3.2 // indirect
5050
github.com/golang/snappy v0.0.4 // indirect
5151
github.com/google/uuid v1.6.0 // indirect
52-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
52+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
5353
github.com/hashicorp/go-version v1.7.0 // indirect
5454
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5555
github.com/json-iterator/go v1.1.12 // indirect
@@ -69,7 +69,7 @@ require (
6969
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
7070
github.com/prometheus/client_golang v1.20.5 // indirect
7171
github.com/prometheus/client_model v0.6.1 // indirect
72-
github.com/prometheus/common v0.61.0 // indirect
72+
github.com/prometheus/common v0.62.0 // indirect
7373
github.com/prometheus/procfs v0.15.1 // indirect
7474
github.com/rs/cors v1.11.1 // indirect
7575
github.com/shirou/gopsutil/v4 v4.24.12 // indirect
@@ -79,6 +79,7 @@ require (
7979
github.com/tklauser/go-sysconf v0.3.12 // indirect
8080
github.com/tklauser/numcpus v0.6.1 // indirect
8181
github.com/yusufpapurcu/wmi v1.2.4 // indirect
82+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
8283
go.opentelemetry.io/collector v0.118.0 // indirect
8384
go.opentelemetry.io/collector/client v1.24.0 // indirect
8485
go.opentelemetry.io/collector/component/componentstatus v0.118.0 // indirect
@@ -121,38 +122,38 @@ require (
121122
go.opentelemetry.io/collector/receiver/xreceiver v0.118.0 // indirect
122123
go.opentelemetry.io/collector/semconv v0.118.0 // indirect
123124
go.opentelemetry.io/collector/service v0.118.0 // indirect
124-
go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
125+
go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 // indirect
125126
go.opentelemetry.io/contrib/config v0.10.0 // indirect
126127
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
127128
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
128129
go.opentelemetry.io/contrib/propagators/b3 v1.31.0 // indirect
129130
go.opentelemetry.io/contrib/zpages v0.56.0 // indirect
130-
go.opentelemetry.io/otel v1.32.0 // indirect
131+
go.opentelemetry.io/otel v1.34.0 // indirect
131132
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 // indirect
132-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect
133-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
134+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0 // indirect
134135
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
135136
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
136137
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
137-
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
138+
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
138139
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect
139-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect
140+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 // indirect
140141
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.31.0 // indirect
141-
go.opentelemetry.io/otel/log v0.8.0 // indirect
142-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
143-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
142+
go.opentelemetry.io/otel/log v0.10.0 // indirect
143+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
144+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
144145
go.opentelemetry.io/otel/sdk/log v0.7.0 // indirect
145-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
146-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
147-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
146+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
147+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
148+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
148149
go.uber.org/multierr v1.11.0 // indirect
149150
go.uber.org/zap v1.27.0 // indirect
150151
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
151152
golang.org/x/net v0.34.0 // indirect
152153
golang.org/x/text v0.21.0 // indirect
153154
gonum.org/v1/gonum v0.15.1 // indirect
154-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
155-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
155+
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
156+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
156157
google.golang.org/grpc v1.69.4 // indirect
157158
google.golang.org/protobuf v1.36.3 // indirect
158159
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)