Skip to content

Commit 1e01312

Browse files
authored
Merge branch 'main' into fix/vcenter-tls
2 parents 7da745e + 3435293 commit 1e01312

File tree

27 files changed

+137
-39
lines changed

27 files changed

+137
-39
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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: exporter/pulsarexporter
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Change configuration option `map_connections_per_broker`, rename to `max_connections_per_broker`.
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: [36579]
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]
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: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: postgresqlreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Minimal supported PostgreSQL version updated from 9.6 to 13.0
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: [30923]
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: Aligning on the supported versions as can be seen [in the PostgreSQL releases section](https://www.postgresql.org/support/versioning)
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]

cmd/githubgen/codeowners.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"sort"
1111
"strings"
1212

13-
"github.com/google/go-github/v66/github"
13+
"github.com/google/go-github/v67/github"
1414
)
1515

1616
const allowlistHeader = `# Code generated by githubgen. DO NOT EDIT.

cmd/githubgen/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/githubgen
33
go 1.22.0
44

55
require (
6-
github.com/google/go-github/v66 v66.0.0
6+
github.com/google/go-github/v67 v67.0.0
77
go.opentelemetry.io/collector/confmap v1.20.1-0.20241202231142-b9ff1bc54c99
88
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.1-0.20241202231142-b9ff1bc54c99
99
gopkg.in/yaml.v3 v3.0.1

cmd/githubgen/go.sum

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

examples/couchbase/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
depends_on:
1818
- couchbase
1919
prometheus:
20-
image: prom/prometheus:v3.0.0
20+
image: prom/prometheus:v3.0.1
2121
volumes:
2222
- ./prometheus-config.yaml:/etc/prometheus/prometheus.yml
2323
ports:

exporter/loadbalancingexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
k8s.io/apimachinery v0.31.3
3838
k8s.io/client-go v0.31.3
3939
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
40-
sigs.k8s.io/controller-runtime v0.19.2
40+
sigs.k8s.io/controller-runtime v0.19.3
4141
)
4242

4343
require (

exporter/loadbalancingexporter/go.sum

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

exporter/pulsarexporter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ The following settings can be optionally configured:
6363
- `timeout`: send pulsar message timeout (default: 5s)
6464
- `operation_timeout`: sets producer-create, subscribe and unsubscribe operations timeout (default: 30 seconds)
6565
- `connection_timeout`: timeout for the establishment of a TCP connection (default: 5 seconds)
66-
- `map_connections_per_broker`: max number of connections to a single broker that will kept in the pool. (default: 1 connection)
66+
- `max_connections_per_broker`: max number of connections to a single broker that will kept in the pool. (default: 1 connection)
6767
- `retry_on_failure`
6868
- `enabled` (default = true)
6969
- `initial_interval` (default = 5s): Time to wait after the first failure before retrying; ignored if `enabled` is `false`

exporter/pulsarexporter/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type Config struct {
3535
Authentication Authentication `mapstructure:"auth"`
3636
OperationTimeout time.Duration `mapstructure:"operation_timeout"`
3737
ConnectionTimeout time.Duration `mapstructure:"connection_timeout"`
38-
MaxConnectionsPerBroker int `mapstructure:"map_connections_per_broker"`
38+
MaxConnectionsPerBroker int `mapstructure:"max_connections_per_broker"`
3939
}
4040

4141
type Authentication struct {

0 commit comments

Comments
 (0)