diff --git a/pkg/entity/register/worker_test.go b/pkg/entity/register/worker_test.go index 817c3fce9..a9956b096 100644 --- a/pkg/entity/register/worker_test.go +++ b/pkg/entity/register/worker_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/newrelic/infrastructure-agent/internal/instrumentation" "github.com/newrelic/infrastructure-agent/pkg/backend/backoff" log "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" @@ -190,7 +189,7 @@ func TestWorker_Run_SendsWhenBatchLimitIsReached(t *testing.T) { collector: make([][]string, 0), } - w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, registeredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, registeredQueue, config) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -235,7 +234,7 @@ func TestWorker_Run_EntityGraterThanMaxByteSize(t *testing.T) { ids: []entity.ID{1}, } - w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, registeredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, registeredQueue, config) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -285,7 +284,7 @@ func TestWorker_registerEntitiesWithRetry_OnError_RetryBackoff(t *testing.T) { MaxBatchDuration: 50 * time.Millisecond, MaxRetryBo: 0, } - w := NewWorker(agentIdentity, client, backoff, reqsToRegisterQueue, reqsRegisteredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff, reqsToRegisterQueue, reqsRegisteredQueue, config) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -342,7 +341,7 @@ func TestWorker_registerEntitiesWithRetry_OnError_Discard(t *testing.T) { MaxBatchDuration: 50 * time.Millisecond, MaxRetryBo: 0, } - w := NewWorker(agentIdentity, client, backoff, reqsToRegisterQueue, reqsRegisteredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff, reqsToRegisterQueue, reqsRegisteredQueue, config) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -393,7 +392,7 @@ func TestWorker_registerEntitiesWithRetry_Success(t *testing.T) { MaxBatchDuration: 50 * time.Millisecond, MaxRetryBo: 0, } - w := NewWorker(agentIdentity, client, backoff, reqsToRegisterQueue, reqsRegisteredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff, reqsToRegisterQueue, reqsRegisteredQueue, config) ctx, cancel := context.WithCancel(context.Background()) defer cancel() @@ -439,7 +438,7 @@ func TestWorker_send_Logging_VerboseEnabled(t *testing.T) { config := WorkerConfig{ VerboseLogLevel: 1, } - w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, reqsRegisteredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, reqsRegisteredQueue, config) batch := map[entity.Key]fwrequest.EntityFwRequest{ entity.Key("error"): { @@ -526,7 +525,7 @@ func TestWorker_send_Logging_VerboseDisabled(t *testing.T) { config := WorkerConfig{ VerboseLogLevel: 0, } - w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, reqsRegisteredQueue, config, instrumentation.NoopMeasure) + w := NewWorker(agentIdentity, client, backoff.NewDefaultBackoff(), reqsToRegisterQueue, reqsRegisteredQueue, config) batch := map[entity.Key]fwrequest.EntityFwRequest{ entity.Key("error"): { diff --git a/pkg/integrations/v4/dm/emitter_test.go b/pkg/integrations/v4/dm/emitter_test.go index d006dbbe2..5134f2524 100644 --- a/pkg/integrations/v4/dm/emitter_test.go +++ b/pkg/integrations/v4/dm/emitter_test.go @@ -7,14 +7,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/newrelic/infrastructure-agent/internal/agent/types" "io/ioutil" "os" "sync" "testing" "time" - "github.com/newrelic/infrastructure-agent/internal/instrumentation" + "github.com/newrelic/infrastructure-agent/internal/agent/types" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" @@ -187,7 +186,7 @@ func TestEmitter_Send_usingIDCache(t *testing.T) { ffRetriever.ShouldGetFeatureFlag("dm_register_deprecated", testCase.FFEnabled, testCase.FFExists) registerClient := &identityapi.RegisterClientMock{} - emtr := NewEmitter(aCtx, dmSender, registerClient, instrumentation.NoopMeasure, ffRetriever) + emtr := NewEmitter(aCtx, dmSender, registerClient, ffRetriever) emtrStruct := emtr.(*emitter) // nolint:forcetypeassert emtrStruct.idCache.Put(entity.Key(fmt.Sprintf("%s:%s", data.DataSets[0].Entity.Type, data.DataSets[0].Entity.Name)), firstEntity.ID) @@ -232,7 +231,7 @@ func TestEmitter_Send_ignoreEntity(t *testing.T) { ffRetriever := &feature_flags.FeatureFlagRetrieverMock{} registerClient := &identityapi.RegisterClientMock{} - emtr := NewEmitter(aCtx, dmSender, registerClient, instrumentation.NoopMeasure, ffRetriever) + emtr := NewEmitter(aCtx, dmSender, registerClient, ffRetriever) dmSender.wg.Add(getMetricsSend(data)) @@ -315,7 +314,7 @@ func TestEmitter_Send(t *testing.T) { ffRetriever := &feature_flags.FeatureFlagRetrieverMock{} registerClient := &identityapi.RegisterClientMock{} - emtr := NewEmitter(aCtx, metricSender, registerClient, instrumentation.NoopMeasure, ffRetriever) + emtr := NewEmitter(aCtx, metricSender, registerClient, ffRetriever) // avoid waiting for more data to create register submission batch emtrStruct := emtr.(*emitter) // nolint:forcetypeassert @@ -375,7 +374,7 @@ func TestEmitter_ShouldNotSendDataWhenDeprecatedRegisterFFIsEnabled(t *testing.T ffRetriever := &feature_flags.FeatureFlagRetrieverMock{} registerClient := &identityapi.RegisterClientMock{} - emtr := NewEmitter(aCtx, ms, registerClient, instrumentation.NoopMeasure, ffRetriever) + emtr := NewEmitter(aCtx, ms, registerClient, ffRetriever) // avoid waiting for more data to create register submission batch emtrStruct := emtr.(*emitter) // nolint:forcetypeassert @@ -434,7 +433,7 @@ func TestEmitter_ShouldRegisterFFDoesNotExistOrIsDisabled(t *testing.T) { ent := testCase.integrationPayload.DataSets[0].Entity registerClient.ShouldRegisterBatchEntities(identity.ID, []entity.Fields{ent}, []identityapi.RegisterEntityResponse{{ID: identity.ID, Name: ent.Name}}) - emtr := NewEmitter(aCtx, metricSender, registerClient, instrumentation.NoopMeasure, ffRetriever) + emtr := NewEmitter(aCtx, metricSender, registerClient, ffRetriever) // avoid waiting for more data to create register submission batch emtrStruct := emtr.(*emitter) // nolint:forcetypeassert @@ -476,7 +475,7 @@ func TestEmitter_Send_failedToSubmitMetrics_dropAndLog(t *testing.T) { ffRetriever.ShouldNotGetFeatureFlag("dm_register_deprecated") registerClient := &identityapi.RegisterClientMock{} - emtr := NewEmitter(aCtx, ms, registerClient, instrumentation.NoopMeasure, ffRetriever).(*emitter) // nolint:forcetypeassert + emtr := NewEmitter(aCtx, ms, registerClient, ffRetriever).(*emitter) // nolint:forcetypeassert emtr.idCache.Put(entity.Key(fmt.Sprintf("%s:%s", data.DataSets[0].Entity.Type, data.DataSets[0].Entity.Name)), identity.ID) emtr.Send(fwrequest.NewFwRequest(integration.Definition{Name: "nri-test", ExecutorConfig: executor.Config{User: "root"}}, nil, nil, data)) diff --git a/pkg/metrics/containerd_sampler_mock_test.go b/pkg/metrics/containerd_sampler_mock_test.go index 140563666..2be8bc270 100644 --- a/pkg/metrics/containerd_sampler_mock_test.go +++ b/pkg/metrics/containerd_sampler_mock_test.go @@ -18,7 +18,8 @@ import ( "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/oci" - prototypes "github.com/gogo/protobuf/types" + "github.com/containerd/containerd/platforms" + "github.com/containerd/typeurl/v2" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" @@ -158,7 +159,7 @@ func (m *MockContainerdContainer) SetLabels(_ context.Context, _ map[string]stri return nil, errUnimplemented } -func (m *MockContainerdContainer) Extensions(_ context.Context) (map[string]prototypes.Any, error) { +func (m *MockContainerdContainer) Extensions(_ context.Context) (map[string]typeurl.Any, error) { return nil, errUnimplemented } @@ -280,6 +281,10 @@ func (m *MockContainerdImage) Name() string { return "image1" } +func (m *MockContainerdImage) Platform() platforms.MatchComparer { //nolint:ireturn + return nil +} + func (m *MockContainerdImage) Target() ocispec.Descriptor { return ocispec.Descriptor{ Digest: digest.Digest("sha256:1234567890"), diff --git a/test/cfgprotocol/agent/emulator.go b/test/cfgprotocol/agent/emulator.go index 1657c8969..56ed0c7a2 100644 --- a/test/cfgprotocol/agent/emulator.go +++ b/test/cfgprotocol/agent/emulator.go @@ -15,7 +15,6 @@ import ( "github.com/newrelic/infrastructure-agent/internal/agent" "github.com/newrelic/infrastructure-agent/internal/agent/cmdchannel/fflag" "github.com/newrelic/infrastructure-agent/internal/feature_flags" - "github.com/newrelic/infrastructure-agent/internal/instrumentation" "github.com/newrelic/infrastructure-agent/internal/integrations/v4/files" "github.com/newrelic/infrastructure-agent/internal/integrations/v4/integration" "github.com/newrelic/infrastructure-agent/internal/integrations/v4/v3legacy" @@ -112,7 +111,7 @@ func (ae *Emulator) RunAgent() error { configEntryQ := make(chan configrequest.Entry, 100) ffRetriever := &feature_flags.FeatureFlagRetrieverMock{} - dmEmitter := dm.NewEmitter(ae.agent.GetContext(), dmSender, nil, instrumentation.NoopMeasure, ffRetriever) + dmEmitter := dm.NewEmitter(ae.agent.GetContext(), dmSender, nil, ffRetriever) // track stoppable integrations tracker := track.NewTracker(dmEmitter)