[chore] Fix the build broken by a merge race condition

open-telemetry · Jan 21, 2023 · a3795da · a3795da
1 parent 7e65c2e
commit a3795da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/golang/snappy v0.0.4
  github.com/mitchellh/hashstructure/v2 v2.0.2
  github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.69.0
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.69.0
+ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.0.0-20230121190643-7e65c2e1427c
  github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.69.0
  github.com/prometheus/common v0.39.0
  github.com/prometheus/prometheus v0.41.0
@@ -195,6 +195,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/corei
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => ../../pkg/resourcetotelemetry
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

diff --git a/receiver/prometheusreceiver/internal/metrics_adjuster.go b/receiver/prometheusreceiver/internal/metrics_adjuster.go
@@ -24,7 +24,7 @@ import (
  semconv "go.opentelemetry.io/collector/semconv/v1.6.1"
  "go.uber.org/zap"
 
- "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/pdatautil"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil"
 )
 
 // Notes on garbage collection (gc):