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

Jump to bottom

reverting to a previous commit #39

Open
wants to merge 6 commits into
base: prev-commit
Choose a base branch
from
Open

reverting to a previous commit #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
af21f9f
Merge branch 'main' of https://github.com/logicmonitor/lm-telemetry-s…
patil-kshitij Oct 13, 2022
6c79edf
Changed InstrumentationLibrarySpans to ScopeSpans
patil-kshitij Nov 4, 2022
4d9afab
corrected a typo
patil-kshitij Nov 4, 2022
3f1fa27
Merge pull request #38 from logicmonitor/ratio-based-sampling-option
patil-kshitij Nov 4, 2022
7f70677
Update main.yml
patil-kshitij Nov 4, 2022
f06bd48
Merge pull request #40 from logicmonitor/patil-kshitij-patch-1
patil-kshitij Nov 4, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: golangci/golangci-lint-action@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.29
version: v1.50.1

# This workflow contains a single job called "build"
build:
Expand Down
2 changes: 1 addition & 1 deletion config/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func WithGCPcloudFunctionDetector() Option {
}
}

func WithAureVMDetector() Option {
func WithAzureVMDetector() Option {
return func(c *Config) {
c.Detector = vm.NewResourceDetector()
}
Expand Down
12 changes: 6 additions & 6 deletions exporter/otlphttpexporter/transformer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func Spans(sdl []tracesdk.ReadOnlySpan) []*tracepb.ResourceSpans {
r attribute.Distinct
il instrumentation.Library
}
ilsm := make(map[ilsKey]*tracepb.InstrumentationLibrarySpans)
ilsm := make(map[ilsKey]*tracepb.ScopeSpans)

var resources int
for _, sd := range sdl {
Expand All @@ -42,7 +42,7 @@ func Spans(sdl []tracesdk.ReadOnlySpan) []*tracepb.ResourceSpans {
ils, iOk := ilsm[iKey]
if !iOk {
// Either the resource or instrumentation library were unknown.
ils = &tracepb.InstrumentationLibrarySpans{
ils = &tracepb.ScopeSpans{
Spans: []*tracepb.Span{},
SchemaUrl: sd.InstrumentationLibrary().SchemaURL,
}
Expand All @@ -55,9 +55,9 @@ func Spans(sdl []tracesdk.ReadOnlySpan) []*tracepb.ResourceSpans {
resources++
// The resource was unknown.
rs = &tracepb.ResourceSpans{
Resource: Resource(sd.Resource()),
InstrumentationLibrarySpans: []*tracepb.InstrumentationLibrarySpans{ils},
SchemaUrl: sd.Resource().SchemaURL(),
Resource: Resource(sd.Resource()),
ScopeSpans: []*tracepb.ScopeSpans{ils},
SchemaUrl: sd.Resource().SchemaURL(),
}
rsm[rKey] = rs
continue
Expand All @@ -69,7 +69,7 @@ func Spans(sdl []tracesdk.ReadOnlySpan) []*tracepb.ResourceSpans {
// been seen and the append we did above will be included it in the
// InstrumentationLibrarySpans reference.
if !iOk {
rs.InstrumentationLibrarySpans = append(rs.InstrumentationLibrarySpans, ils)
rs.ScopeSpans = append(rs.ScopeSpans, ils)
}
}

Expand Down
27 changes: 16 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,24 @@ module github.com/logicmonitor/lm-telemetry-sdk-go
go 1.16

require (
cloud.google.com/go v0.88.0
cloud.google.com/go/compute v1.10.0
github.com/aws/aws-lambda-go v1.27.1
github.com/aws/aws-sdk-go v1.40.41
github.com/stretchr/testify v1.7.0
github.com/aws/aws-sdk-go v1.44.114
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/contrib/detectors/aws v0.22.0
go.opentelemetry.io/contrib/detectors/aws/ecs v0.22.0
go.opentelemetry.io/contrib/detectors/gcp v0.22.0
go.opentelemetry.io/otel v1.5.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC3
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.0.0-RC3
go.opentelemetry.io/otel/sdk v1.0.0-RC3
go.opentelemetry.io/otel/trace v1.5.0
go.opentelemetry.io/proto/otlp v0.9.0
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.27.1
go.opentelemetry.io/otel v1.11.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.11.0
go.opentelemetry.io/otel/sdk v1.11.0
go.opentelemetry.io/otel/trace v1.11.0
go.opentelemetry.io/proto/otlp v0.19.0
golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458 // indirect
golang.org/x/sys v0.0.0-20221010170243-090e33056c14 // indirect
golang.org/x/text v0.3.8 // indirect
google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e // indirect
google.golang.org/grpc v1.50.0
google.golang.org/protobuf v1.28.1
)
Loading