Skip to content

Update opentelemetry-collector dependencies to v0.119.0. #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
franciscovalentecastro merged 4 commits into from
Feb 18, 2025
Merged

Update opentelemetry-collector dependencies to v0.119.0. #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17a13e2
Update opentelemetry dependencies to v0.119.0
franciscovalentecastro Feb 16, 2025
e2b912b
Update scraper usage in gpu receivers.
franciscovalentecastro Feb 16, 2025
fb0bfe7
Update go file which generates debug logs from scraper component.
franciscovalentecastro Feb 16, 2025
3dd7b24
Update `scraper` variable name to `scp` to avoid confusion with packa…
franciscovalentecastro Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
420 changes: 219 additions & 201 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

978 changes: 479 additions & 499 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion receiver/dcgmreceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"time"

"go.opentelemetry.io/collector/config/confignet"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/dcgmreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/confignet"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
)
Expand Down
14 changes: 7 additions & 7 deletions receiver/dcgmreceiver/factory_gpu_on.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
)
Expand Down Expand Up @@ -58,17 +59,16 @@ func createMetricsReceiver(
}

ns := newDcgmScraper(cfg, params)
scraper, err := scraperhelper.NewScraper(
metadata.Type,
scp, err := scraper.NewMetrics(
ns.scrape,
scraperhelper.WithStart(ns.start),
scraperhelper.WithShutdown(ns.stop))
scraper.WithStart(ns.start),
scraper.WithShutdown(ns.stop))
if err != nil {
return nil, err
}

return scraperhelper.NewScraperControllerReceiver(
return scraperhelper.NewMetricsController(
&cfg.ControllerConfig, params, consumer,
scraperhelper.AddScraper(scraper),
scraperhelper.AddScraper(metadata.Type, scp),
)
}
2 changes: 1 addition & 1 deletion receiver/dcgmreceiver/scraper_gpu_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"go.opentelemetry.io/collector/config/confignet"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"
"go.uber.org/zap/zaptest"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
Expand Down
2 changes: 1 addition & 1 deletion receiver/mongodbreceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"go.mongodb.org/mongo-driver/mongo/options"
"go.opentelemetry.io/collector/config/confignet"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"
"go.uber.org/multierr"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
Expand Down
13 changes: 7 additions & 6 deletions receiver/mongodbreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import (
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
)
Expand Down Expand Up @@ -62,15 +63,15 @@ func createMetricsReceiver(
cfg := rConf.(*Config)
ms := newMongodbScraper(params, cfg)

scraper, err := scraperhelper.NewScraper(metadata.Type, ms.scrape,
scraperhelper.WithStart(ms.start),
scraperhelper.WithShutdown(ms.shutdown))
scp, err := scraper.NewMetrics(ms.scrape,
scraper.WithStart(ms.start),
scraper.WithShutdown(ms.shutdown))
if err != nil {
return nil, err
}

return scraperhelper.NewScraperControllerReceiver(
return scraperhelper.NewMetricsController(
&cfg.ControllerConfig, params, consumer,
scraperhelper.AddScraper(scraper),
scraperhelper.AddScraper(metadata.Type, scp),
)
}
2 changes: 1 addition & 1 deletion receiver/mongodbreceiver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/receiver/receivertest"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/mongodbreceiver/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/hashicorp/go-version"
"go.mongodb.org/mongo-driver/bson"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/receiver/scrapererror"
"go.opentelemetry.io/collector/scraper/scrapererror"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/mongodbreceiver/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/pmetric"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scrapererror"
"go.opentelemetry.io/collector/scraper/scrapererror"
"go.uber.org/zap"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
Expand Down
2 changes: 1 addition & 1 deletion receiver/nvmlreceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package nvmlreceiver
import (
"time"

"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/nvmlreceiver/internal/metadata"
)
Expand Down
2 changes: 1 addition & 1 deletion receiver/nvmlreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package nvmlreceiver
import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/nvmlreceiver/internal/metadata"
)
Expand Down
14 changes: 7 additions & 7 deletions receiver/nvmlreceiver/factory_gpu_on.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/nvmlreceiver/internal/metadata"
)
Expand All @@ -41,17 +42,16 @@ func createMetricsReceiver(
}

ns := newNvmlScraper(cfg, params)
scraper, err := scraperhelper.NewScraper(
metadata.Type,
scp, err := scraper.NewMetrics(
ns.scrape,
scraperhelper.WithStart(ns.start),
scraperhelper.WithShutdown(ns.stop))
scraper.WithStart(ns.start),
scraper.WithShutdown(ns.stop))
if err != nil {
return nil, err
}

return scraperhelper.NewScraperControllerReceiver(
return scraperhelper.NewMetricsController(
&cfg.ControllerConfig, params, consumer,
scraperhelper.AddScraper(scraper),
scraperhelper.AddScraper(metadata.Type, scp),
)
}
2 changes: 1 addition & 1 deletion receiver/varnishreceiver/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"fmt"
"os"

"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/varnishreceiver/internal/metadata"
)
Expand Down
9 changes: 5 additions & 4 deletions receiver/varnishreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/scraperhelper"
"go.opentelemetry.io/collector/scraper"
"go.opentelemetry.io/collector/scraper/scraperhelper"

"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/varnishreceiver/internal/metadata"
)
Expand Down Expand Up @@ -50,13 +51,13 @@ func createMetricsReceiver(
) (receiver.Metrics, error) {
cfg := rConf.(*Config)
ns := newVarnishScraper(params, cfg)
scraper, err := scraperhelper.NewScraper(metadata.Type, ns.scrape, scraperhelper.WithStart(ns.start))
scp, err := scraper.NewMetrics(ns.scrape, scraper.WithStart(ns.start))
if err != nil {
return nil, err
}

return scraperhelper.NewScraperControllerReceiver(
return scraperhelper.NewMetricsController(
&cfg.ControllerConfig, params, consumer,
scraperhelper.AddScraper(scraper),
scraperhelper.AddScraper(metadata.Type, scp),
)
}
4 changes: 2 additions & 2 deletions service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ func MainContext(ctx context.Context) {
zapcore.ErrorLevel,
zapcore.DebugLevel,
// We would like the Error logs from this file to be logged at Debug instead.
// https://github.com/open-telemetry/opentelemetry-collector/blob/831373ae6c6959f6c9258ac585a2ec0ab19a074f/receiver/scraperhelper/scrapercontroller.go#L198
levelchanger.FilePathLevelChangeCondition("scrapercontroller.go"),
// https://github.com/open-telemetry/opentelemetry-collector/blob/release/0.119.x/scraper/scraperhelper/obs_metrics.go#L61
levelchanger.FilePathLevelChangeCondition("obs_metrics.go"),
),
levelchanger.NewLevelChangerOption(
zapcore.WarnLevel,
Expand Down
Loading