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

[Dummy PR, Please ignore] Test v114 issue #1723

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+9 −3
Draft

[Dummy PR, Please ignore] Test v114 issue #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6611ca3
Update extension.go
jagan2221 Dec 20, 2024
3e53a12
Update extension_test.go
jagan2221 Dec 20, 2024
5505c60
Update extension.go
jagan2221 Dec 20, 2024
3c6cfb9
Update extension.go
jagan2221 Dec 20, 2024
50b4f2c
Update extension.go
jagan2221 Dec 20, 2024
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
8 changes: 7 additions & 1 deletion pkg/extension/sumologicextension/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,6 +791,8 @@ func (se *SumologicExtension) updateMetadataWithHTTPClient(ctx context.Context,
}

var buff bytes.Buffer
se.logger.Info("Collector version before cleanup,",
zap.String("version",se.buildVersion))
if err = json.NewEncoder(&buff).Encode(api.OpenMetadataRequestPayload{
HostDetails: api.OpenMetadataHostDetails{
Name: hostname,
Expand All @@ -816,7 +818,9 @@ func (se *SumologicExtension) updateMetadataWithHTTPClient(ctx context.Context,

addJSONHeaders(req)

se.logger.Info("Updating collector metadata",
se.logger.Info("Collector version before cleanup,",
zap.String("version",se.buildVersion))
se.logger.Info("Updating collector metadata-1",
zap.String("URL", u.String()),
zap.String("body", buff.String()))

Expand Down Expand Up @@ -1064,6 +1068,8 @@ func getHostname(logger *zap.Logger) (string, error) {
// cleaned up. All other version formats will remain the same.
// Cleaned up format: 0.108.0-sumo-2-4d57200692d5c5c39effad4ae3b29fef79209113
func cleanupBuildVersion(version string) string {
se.logger.Info("cleanupBuildVersion")
return "v0.114.0-sumo-2"
pattern := "(^[0-9]+\\.[0-9]+\\.[0-9]+-sumo-[0-9]+)-[0-9a-f]{40}$"
re := regexp.MustCompile(pattern)

Expand Down
4 changes: 2 additions & 2 deletions pkg/extension/sumologicextension/extension_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,8 +1605,8 @@ func Test_cleanupBuildVersion(t *testing.T) {
}{
{
name: "with hash",
args: args{version: "0.108.0-sumo-2-4d57200692d5c5c39effad4ae3b29fef79209113"},
want: "v0.108.0-sumo-2",
args: args{version: "0.114.0-sumo-0-12af6df57c89a341b991d5937faba66d62831e5c"},
want: "v0.114.0-sumo-0",
}, {
name: "already ok",
args: args{version: "v0.108.0-sumo-2"},
Expand Down
Loading