Skip to content

Commit b4f6413

Browse files
celian-garciarenovate[bot]otelbot[bot]
authored andcommitted
[chore] [receiver/azuremonitor] cleanup azmetrics fake API copy to use the one from the lib (open-telemetry#41514)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description This is doing the cleanup for the following Renovate PR. open-telemetry#41464 ~~I don't know what you prefer to do here. myPR -> renovate PR -> main or merge directly this to main.~~ ~~As you wish~~ Edit: Updated the source branch as main. So it will be easier for me to rule some incoming conflicts with open-telemetry#41499 (review) <!-- Issue number (e.g. #1234) or full URL to issue, if applicable. --> #### Link to tracking issue Fixes <!--Describe what testing was performed and which tests were added.--> #### Testing <!--Describe the documentation added.--> #### Documentation <!--Please delete paragraphs that you did not use before submitting.--> --------- Signed-off-by: Célian Garcia <celian.garcia@amadeus.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
1 parent 2d1a1fd commit b4f6413

File tree

5 files changed

+21
-272
lines changed

5 files changed

+21
-272
lines changed

receiver/azuremonitorreceiver/fake/internal.go

Lines changed: 0 additions & 74 deletions
This file was deleted.

receiver/azuremonitorreceiver/fake/metrics_server.go

Lines changed: 0 additions & 176 deletions
This file was deleted.

receiver/azuremonitorreceiver/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1
77
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1
8-
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.2.0
8+
github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics v1.3.0
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0
1010
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v3 v3.0.0
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions v1.3.0
@@ -40,7 +40,7 @@ require (
4040
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
4141
github.com/gobwas/glob v0.2.3 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
43+
github.com/golang-jwt/jwt/v5 v5.2.3 // indirect
4444
github.com/google/uuid v1.6.0 // indirect
4545
github.com/hashicorp/go-version v1.7.0 // indirect
4646
github.com/json-iterator/go v1.1.12 // indirect
@@ -72,10 +72,10 @@ require (
7272
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
7373
go.opentelemetry.io/otel/trace v1.37.0 // indirect
7474
go.yaml.in/yaml/v3 v3.0.4 // indirect
75-
golang.org/x/crypto v0.39.0 // indirect
76-
golang.org/x/net v0.41.0 // indirect
77-
golang.org/x/sys v0.33.0 // indirect
78-
golang.org/x/text v0.26.0 // indirect
75+
golang.org/x/crypto v0.40.0 // indirect
76+
golang.org/x/net v0.42.0 // indirect
77+
golang.org/x/sys v0.34.0 // indirect
78+
golang.org/x/text v0.27.0 // indirect
7979
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
8080
google.golang.org/grpc v1.73.0 // indirect
8181
google.golang.org/protobuf v1.36.6 // indirect

receiver/azuremonitorreceiver/go.sum

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

receiver/azuremonitorreceiver/options_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ import (
1111
"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
1212
"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
1313
"github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics"
14+
azmetricsfake "github.com/Azure/azure-sdk-for-go/sdk/monitor/query/azmetrics/fake"
1415
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor"
1516
armmonitorfake "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor/fake"
1617
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v3"
1718
armresourcesfake "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources/v3/fake"
1819
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
1920
armsubscriptionsfake "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions/fake"
20-
21-
azmetricsfake "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver/fake"
2221
)
2322

2423
func TestAzureScraperClientOptions(t *testing.T) {
@@ -144,12 +143,12 @@ func newMockClientOptionsResolver(
144143
}
145144

146145
// Init az metrics client options from metrics query responses mock data
147-
azMetricsServer := azmetricsfake.MetricsServer{
146+
azMetricsServer := azmetricsfake.Server{
148147
QueryResources: newMockMetricsQueryResponse(metricsQueryResponses),
149148
}
150149
azMetricsClientOptions := &azmetrics.ClientOptions{
151150
ClientOptions: azcore.ClientOptions{
152-
Transport: azmetricsfake.NewMetricsServerTransport(&azMetricsServer),
151+
Transport: azmetricsfake.NewServerTransport(&azMetricsServer),
153152
},
154153
}
155154

0 commit comments

Comments
 (0)