Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: replace private image parse for common implementation #37152

Closed
wants to merge 1 commit into from
Closed

fix: replace private image parse for common implementation #37152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions processor/k8sattributesprocessor/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.117.0
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
Expand Down
2 changes: 2 additions & 0 deletions processor/k8sattributesprocessor/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 6 additions & 26 deletions processor/k8sattributesprocessor/internal/kube/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor/internal/metadata"
dcommon "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/docker"
)

var enableRFC3339Timestamp = featuregate.GlobalRegistry().MustRegister(
Expand Down Expand Up @@ -669,30 +670,6 @@ func removeUnnecessaryPodData(pod *api_v1.Pod, rules ExtractionRules) *api_v1.Po
return &transformedPod
}

// parseNameAndTagFromImage parses the image name and tag for differently-formatted image names.
// returns "latest" as the default if tag not present. also checks if the image contains a digest.
// if it does, no latest tag is assumed.
func parseNameAndTagFromImage(image string) (name, tag string, err error) {
ref, err := reference.Parse(image)
if err != nil {
return
}
namedRef, ok := ref.(reference.Named)
if !ok {
return "", "", errors.New("cannot retrieve image name")
}
name = namedRef.Name()
if taggedRef, ok := namedRef.(reference.Tagged); ok {
tag = taggedRef.Tag()
}
if tag == "" {
if digestedRef, ok := namedRef.(reference.Digested); !ok || digestedRef.String() == "" {
tag = "latest"
}
}
return
}

func (c *WatchClient) extractPodContainersAttributes(pod *api_v1.Pod) PodContainers {
containers := PodContainers{
ByID: map[string]*Container{},
Expand All @@ -704,8 +681,11 @@ func (c *WatchClient) extractPodContainersAttributes(pod *api_v1.Pod) PodContain
if c.Rules.ContainerImageName || c.Rules.ContainerImageTag {
for _, spec := range append(pod.Spec.Containers, pod.Spec.InitContainers...) {
container := &Container{}
name, tag, err := parseNameAndTagFromImage(spec.Image)
if err == nil {
image, err := dcommon.ParseImageName(spec.Image)
if err != nil {
dcommon.LogParseError(err, spec.Image, c.logger)
} else {
name, tag := image.Repository, image.Tag
if c.Rules.ContainerImageName {
container.ImageName = name
}
Expand Down
6 changes: 3 additions & 3 deletions receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import (
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/docker"
dcommon "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/docker"
)

func containerResource(cm ecsutil.ContainerMetadata, logger *zap.Logger) pcommon.Resource {
resource := pcommon.NewResource()

image, err := docker.ParseImageName(cm.Image)
image, err := dcommon.ParseImageName(cm.Image)
if err != nil {
docker.LogParseError(err, cm.Image, logger)
dcommon.LogParseError(err, cm.Image, logger)
}

resource.Attributes().PutStr(conventions.AttributeContainerName, cm.ContainerName)
Expand Down
6 changes: 3 additions & 3 deletions receiver/k8sclusterreceiver/internal/container/containers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/docker"
dcommon "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/docker"
metadataPkg "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata"
imetadata "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver/internal/metadata"
Expand Down Expand Up @@ -83,9 +83,9 @@ func RecordSpecMetrics(logger *zap.Logger, mb *imetadata.MetricsBuilder, c corev
rb.SetK8sNamespaceName(pod.Namespace)
rb.SetContainerID(utils.StripContainerID(containerID))
rb.SetK8sContainerName(c.Name)
image, err := docker.ParseImageName(imageStr)
image, err := dcommon.ParseImageName(imageStr)
if err != nil {
docker.LogParseError(err, imageStr, logger)
dcommon.LogParseError(err, imageStr, logger)
} else {
rb.SetContainerImageName(image.Repository)
rb.SetContainerImageTag(image.Tag)
Expand Down
Loading