Skip to content

Commit

Permalink
Merge branch 'main' into gh-trace-skeleton
Browse files Browse the repository at this point in the history
  • Loading branch information
adrielp authored Dec 3, 2024
2 parents c30b1d8 + 31b8aa6 commit 9edb77d
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 16 deletions.
27 changes: 27 additions & 0 deletions .chloggen/bump_minimal_pg_version.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: deprecation

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: postgresqlreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Minimal supported PostgreSQL version updated from 9.6 to 13.0

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [30923]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: Aligning on the supported versions as can be seen [in the PostgreSQL releases section](https://www.postgresql.org/support/versioning)

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
2 changes: 1 addition & 1 deletion cmd/githubgen/codeowners.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sort"
"strings"

"github.com/google/go-github/v66/github"
"github.com/google/go-github/v67/github"
)

const allowlistHeader = `# Code generated by githubgen. DO NOT EDIT.
Expand Down
2 changes: 1 addition & 1 deletion cmd/githubgen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/githubgen
go 1.22.0

require (
github.com/google/go-github/v66 v66.0.0
github.com/google/go-github/v67 v67.0.0
go.opentelemetry.io/collector/confmap v1.20.1-0.20241202231142-b9ff1bc54c99
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.20.1-0.20241202231142-b9ff1bc54c99
gopkg.in/yaml.v3 v3.0.1
Expand Down
4 changes: 2 additions & 2 deletions cmd/githubgen/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion receiver/githubreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.22.8
require (
github.com/Khan/genqlient v0.7.0
github.com/google/go-cmp v0.6.0
github.com/google/go-github/v66 v66.0.0
github.com/julienschmidt/httprouter v1.3.0
github.com/google/go-github/v67 v67.0.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.114.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.114.0
github.com/stretchr/testify v1.10.0
Expand Down
4 changes: 2 additions & 2 deletions receiver/githubreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

"github.com/google/go-github/v66/github"
"github.com/google/go-github/v67/github"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

"github.com/Khan/genqlient/graphql"
"github.com/google/go-github/v66/github"
"github.com/google/go-github/v67/github"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"time"

"github.com/Khan/genqlient/graphql"
"github.com/google/go-github/v66/github"
"github.com/google/go-github/v67/github"
"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/receiver/receivertest"
)
Expand Down
4 changes: 2 additions & 2 deletions receiver/postgresqlreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
<!-- end autogenerated section -->

This receiver queries the PostgreSQL [statistics collector](https://www.postgresql.org/docs/9.6/monitoring-stats.html).
This receiver queries the PostgreSQL [statistics collector](https://www.postgresql.org/docs/13/monitoring-stats.html).

> :construction: This receiver is in **BETA**. Configuration fields and metric data model are subject to change.
## Prerequisites

This receiver supports PostgreSQL versions 9.6+
See PostgreSQL documentation for [supported versions](https://www.postgresql.org/support/versioning).

The monitoring user must be granted `SELECT` on `pg_stat_database`.

Expand Down
2 changes: 1 addition & 1 deletion receiver/postgresqlreceiver/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func integrationTest(name string, databases []string) func(*testing.T) {
NewFactory(),
scraperinttest.WithContainerRequest(
testcontainers.ContainerRequest{
Image: "postgres:9.6.24",
Image: "postgres:13.18",
Env: map[string]string{
"POSTGRES_USER": "root",
"POSTGRES_PASSWORD": "otel",
Expand Down
2 changes: 1 addition & 1 deletion receiver/solacereceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solace
go 1.22.0

require (
github.com/Azure/go-amqp v1.2.0
github.com/Azure/go-amqp v1.3.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.114.1-0.20241202231142-b9ff1bc54c99
go.opentelemetry.io/collector/component/componenttest v0.114.1-0.20241202231142-b9ff1bc54c99
Expand Down
4 changes: 2 additions & 2 deletions receiver/solacereceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9edb77d

Please sign in to comment.