Skip to content

Commit 4487e9a

Browse files
franciscovalentecastrofranciscovalentecastro
authored
Update opentelemetry-collector dependencies to v0.119.0. (#243)
1 parent abcc368 commit 4487e9a

File tree

17 files changed

+736
-736
lines changed

17 files changed

+736
-736
lines changed

‎go.mod

+219-201
Large diffs are not rendered by default.

‎go.sum

+479-499
Large diffs are not rendered by default.

‎receiver/dcgmreceiver/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"time"
1919

2020
"go.opentelemetry.io/collector/config/confignet"
21-
"go.opentelemetry.io/collector/receiver/scraperhelper"
21+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2222

2323
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
2424
)

‎receiver/dcgmreceiver/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"go.opentelemetry.io/collector/component"
1919
"go.opentelemetry.io/collector/config/confignet"
2020
"go.opentelemetry.io/collector/receiver"
21-
"go.opentelemetry.io/collector/receiver/scraperhelper"
21+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2222

2323
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
2424
)

‎receiver/dcgmreceiver/factory_gpu_on.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import (
2828
"go.opentelemetry.io/collector/component"
2929
"go.opentelemetry.io/collector/consumer"
3030
"go.opentelemetry.io/collector/receiver"
31-
"go.opentelemetry.io/collector/receiver/scraperhelper"
31+
"go.opentelemetry.io/collector/scraper"
32+
"go.opentelemetry.io/collector/scraper/scraperhelper"
3233

3334
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"
3435
)
@@ -58,17 +59,16 @@ func createMetricsReceiver(
5859
}
5960

6061
ns := newDcgmScraper(cfg, params)
61-
scraper, err := scraperhelper.NewScraper(
62-
metadata.Type,
62+
scp, err := scraper.NewMetrics(
6363
ns.scrape,
64-
scraperhelper.WithStart(ns.start),
65-
scraperhelper.WithShutdown(ns.stop))
64+
scraper.WithStart(ns.start),
65+
scraper.WithShutdown(ns.stop))
6666
if err != nil {
6767
return nil, err
6868
}
6969

70-
return scraperhelper.NewScraperControllerReceiver(
70+
return scraperhelper.NewMetricsController(
7171
&cfg.ControllerConfig, params, consumer,
72-
scraperhelper.AddScraper(scraper),
72+
scraperhelper.AddScraper(metadata.Type, scp),
7373
)
7474
}

‎receiver/dcgmreceiver/scraper_gpu_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"go.opentelemetry.io/collector/config/confignet"
3232
"go.opentelemetry.io/collector/pdata/pmetric"
3333
"go.opentelemetry.io/collector/receiver"
34-
"go.opentelemetry.io/collector/receiver/scraperhelper"
34+
"go.opentelemetry.io/collector/scraper/scraperhelper"
3535
"go.uber.org/zap/zaptest"
3636

3737
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/dcgmreceiver/internal/metadata"

‎receiver/mongodbreceiver/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"go.mongodb.org/mongo-driver/mongo/options"
2525
"go.opentelemetry.io/collector/config/confignet"
2626
"go.opentelemetry.io/collector/config/configtls"
27-
"go.opentelemetry.io/collector/receiver/scraperhelper"
27+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2828
"go.uber.org/multierr"
2929

3030
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"

‎receiver/mongodbreceiver/factory.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ import (
2323
"go.opentelemetry.io/collector/config/configtls"
2424
"go.opentelemetry.io/collector/consumer"
2525
"go.opentelemetry.io/collector/receiver"
26-
"go.opentelemetry.io/collector/receiver/scraperhelper"
26+
"go.opentelemetry.io/collector/scraper"
27+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2728

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

65-
scraper, err := scraperhelper.NewScraper(metadata.Type, ms.scrape,
66-
scraperhelper.WithStart(ms.start),
67-
scraperhelper.WithShutdown(ms.shutdown))
66+
scp, err := scraper.NewMetrics(ms.scrape,
67+
scraper.WithStart(ms.start),
68+
scraper.WithShutdown(ms.shutdown))
6869
if err != nil {
6970
return nil, err
7071
}
7172

72-
return scraperhelper.NewScraperControllerReceiver(
73+
return scraperhelper.NewMetricsController(
7374
&cfg.ControllerConfig, params, consumer,
74-
scraperhelper.AddScraper(scraper),
75+
scraperhelper.AddScraper(metadata.Type, scp),
7576
)
7677
}

‎receiver/mongodbreceiver/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"go.opentelemetry.io/collector/component"
2424
"go.opentelemetry.io/collector/consumer/consumertest"
2525
"go.opentelemetry.io/collector/receiver/receivertest"
26-
"go.opentelemetry.io/collector/receiver/scraperhelper"
26+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2727

2828
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
2929
)

‎receiver/mongodbreceiver/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/hashicorp/go-version"
2323
"go.mongodb.org/mongo-driver/bson"
2424
"go.opentelemetry.io/collector/pdata/pcommon"
25-
"go.opentelemetry.io/collector/receiver/scrapererror"
25+
"go.opentelemetry.io/collector/scraper/scrapererror"
2626

2727
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"
2828
)

‎receiver/mongodbreceiver/scraper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"go.opentelemetry.io/collector/pdata/pcommon"
2727
"go.opentelemetry.io/collector/pdata/pmetric"
2828
"go.opentelemetry.io/collector/receiver"
29-
"go.opentelemetry.io/collector/receiver/scrapererror"
29+
"go.opentelemetry.io/collector/scraper/scrapererror"
3030
"go.uber.org/zap"
3131

3232
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/mongodbreceiver/internal/metadata"

‎receiver/nvmlreceiver/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package nvmlreceiver
1717
import (
1818
"time"
1919

20-
"go.opentelemetry.io/collector/receiver/scraperhelper"
20+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2121

2222
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/nvmlreceiver/internal/metadata"
2323
)

‎receiver/nvmlreceiver/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package nvmlreceiver
1717
import (
1818
"go.opentelemetry.io/collector/component"
1919
"go.opentelemetry.io/collector/receiver"
20-
"go.opentelemetry.io/collector/receiver/scraperhelper"
20+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2121

2222
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/nvmlreceiver/internal/metadata"
2323
)

‎receiver/nvmlreceiver/factory_gpu_on.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import (
2424
"go.opentelemetry.io/collector/component"
2525
"go.opentelemetry.io/collector/consumer"
2626
"go.opentelemetry.io/collector/receiver"
27-
"go.opentelemetry.io/collector/receiver/scraperhelper"
27+
"go.opentelemetry.io/collector/scraper"
28+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2829

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

4344
ns := newNvmlScraper(cfg, params)
44-
scraper, err := scraperhelper.NewScraper(
45-
metadata.Type,
45+
scp, err := scraper.NewMetrics(
4646
ns.scrape,
47-
scraperhelper.WithStart(ns.start),
48-
scraperhelper.WithShutdown(ns.stop))
47+
scraper.WithStart(ns.start),
48+
scraper.WithShutdown(ns.stop))
4949
if err != nil {
5050
return nil, err
5151
}
5252

53-
return scraperhelper.NewScraperControllerReceiver(
53+
return scraperhelper.NewMetricsController(
5454
&cfg.ControllerConfig, params, consumer,
55-
scraperhelper.AddScraper(scraper),
55+
scraperhelper.AddScraper(metadata.Type, scp),
5656
)
5757
}

‎receiver/varnishreceiver/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"fmt"
1919
"os"
2020

21-
"go.opentelemetry.io/collector/receiver/scraperhelper"
21+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2222

2323
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/varnishreceiver/internal/metadata"
2424
)

‎receiver/varnishreceiver/factory.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import (
2121
"go.opentelemetry.io/collector/component"
2222
"go.opentelemetry.io/collector/consumer"
2323
"go.opentelemetry.io/collector/receiver"
24-
"go.opentelemetry.io/collector/receiver/scraperhelper"
24+
"go.opentelemetry.io/collector/scraper"
25+
"go.opentelemetry.io/collector/scraper/scraperhelper"
2526

2627
"github.com/GoogleCloudPlatform/opentelemetry-operations-collector/receiver/varnishreceiver/internal/metadata"
2728
)
@@ -50,13 +51,13 @@ func createMetricsReceiver(
5051
) (receiver.Metrics, error) {
5152
cfg := rConf.(*Config)
5253
ns := newVarnishScraper(params, cfg)
53-
scraper, err := scraperhelper.NewScraper(metadata.Type, ns.scrape, scraperhelper.WithStart(ns.start))
54+
scp, err := scraper.NewMetrics(ns.scrape, scraper.WithStart(ns.start))
5455
if err != nil {
5556
return nil, err
5657
}
5758

58-
return scraperhelper.NewScraperControllerReceiver(
59+
return scraperhelper.NewMetricsController(
5960
&cfg.ControllerConfig, params, consumer,
60-
scraperhelper.AddScraper(scraper),
61+
scraperhelper.AddScraper(metadata.Type, scp),
6162
)
6263
}

‎service/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ func MainContext(ctx context.Context) {
6666
zapcore.ErrorLevel,
6767
zapcore.DebugLevel,
6868
// We would like the Error logs from this file to be logged at Debug instead.
69-
// https://github.com/open-telemetry/opentelemetry-collector/blob/831373ae6c6959f6c9258ac585a2ec0ab19a074f/receiver/scraperhelper/scrapercontroller.go#L198
70-
levelchanger.FilePathLevelChangeCondition("scrapercontroller.go"),
69+
// https://github.com/open-telemetry/opentelemetry-collector/blob/release/0.119.x/scraper/scraperhelper/obs_metrics.go#L61
70+
levelchanger.FilePathLevelChangeCondition("obs_metrics.go"),
7171
),
7272
levelchanger.NewLevelChangerOption(
7373
zapcore.WarnLevel,

0 commit comments

Comments
 (0)