Skip to content

Commit

Permalink
Make internal/version internal to internal/otelcontribcore (#9770)
Browse files Browse the repository at this point in the history
  • Loading branch information
mx-psi authored May 6, 2022
1 parent 4a245c6 commit 75bd1e9
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN_CONFIG?=local/config.yaml
CMD?=
OTEL_VERSION=main

BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector-contrib/internal/version
BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelcontribcore/internal/version
VERSION=$(shell git describe --always --match "v[0-9]*" HEAD)
BUILD_INFO=-ldflags "-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package version // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/version"
package version // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelcontribcore/internal/version"

// Version variable will be replaced at link time after `make` has been run.
var Version = "latest"
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/otelcontribcore/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/service"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/version"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/otelcontribcore/internal/version"
)

type ComponentsFunc func() (component.Factories, error)
Expand Down

0 comments on commit 75bd1e9

Please sign in to comment.