Skip to content

Commit

Permalink
handle errors
Browse files Browse the repository at this point in the history
Signed-off-by: Saumya Shah <saumyabshah90@gmail.com>
  • Loading branch information
Saumya40-codes committed Oct 8, 2024
1 parent 34fa174 commit 2cd1e4c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cmd/esmapping-generator/app/renderer/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package renderer

import (
"fmt"
"fmt"
"strconv"

"github.com/jaegertracing/jaeger/cmd/esmapping-generator/app"
Expand Down
21 changes: 14 additions & 7 deletions plugin/storage/es/mappings/mapping.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package mappings
import (
"bytes"
"embed"
"fmt"
"strings"

"github.com/jaegertracing/jaeger/pkg/es"
Expand Down Expand Up @@ -41,18 +42,18 @@ const (
SamplingMapping
)

func (mt MappingType) String() string {
func (mt MappingType) String() (string, error) {
switch mt {
case SpanMapping:
return "jaeger-span"
return "jaeger-span", nil
case ServiceMapping:
return "jaeger-service"
return "jaeger-service", nil
case DependenciesMapping:
return "jaeger-dependencies"
return "jaeger-dependencies", nil
case SamplingMapping:
return "jaeger-sampling"
return "jaeger-sampling", nil
default:
return "unknown"
return "", fmt.Errorf("Unknown mapping type %d", mt)
}
}

Expand All @@ -67,7 +68,13 @@ func (mb *MappingBuilder) GetMapping(mappingType MappingType) (string, error) {
default:
version = "-6"
}
return mb.fixMapping(mappingType.String() + version + ".json")

templateName, err := mappingType.String()
if err != nil {
return "", err
}

return mb.fixMapping(templateName + version + ".json")
}

// GetSpanServiceMappings returns span and service mappings
Expand Down

0 comments on commit 2cd1e4c

Please sign in to comment.