Skip to content

Commit c56e00b

Browse files
committed
Entity support prototype
1 parent 52f731e commit c56e00b

File tree

683 files changed

+2301
-1929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

683 files changed

+2301
-1929
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ docker-telemetrygen:
294294
rm cmd/telemetrygen/telemetrygen_*
295295

296296
.PHONY: generate
297-
generate: install-tools
298-
cd ./internal/tools && go install go.opentelemetry.io/collector/cmd/mdatagen
297+
generate:
298+
#cd ./internal/tools && go install go.opentelemetry.io/collector/cmd/mdatagen
299299
$(MAKE) for-all CMD="$(GOCMD) generate ./..."
300300
$(MAKE) gofmt
301301

cmd/githubgen/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ require (
2020
go.uber.org/multierr v1.11.0 // indirect
2121
go.uber.org/zap v1.27.0 // indirect
2222
)
23+
24+
replace go.opentelemetry.io/collector/pdata => /Users/danoshin/Projects/opentelemetry-collector/pdata

cmd/opampsupervisor/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ require (
3434
go.uber.org/multierr v1.11.0 // indirect
3535
golang.org/x/net v0.23.0 // indirect
3636
)
37+
38+
replace go.opentelemetry.io/collector/pdata => /Users/danoshin/Projects/opentelemetry-collector/pdata

cmd/otelcontribcol/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,3 +1387,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githu
13871387
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/grpcutil => ../../internal/grpcutil
13881388

13891389
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudmonitoringreceiver => ../../receiver/googlecloudmonitoringreceiver
1390+
1391+
replace go.opentelemetry.io/collector/pdata => /Users/danoshin/Projects/opentelemetry-collector/pdata

cmd/oteltestbedcol/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,3 +423,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
423423
replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
424424

425425
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension
426+
427+
replace go.opentelemetry.io/collector/pdata => /Users/danoshin/Projects/opentelemetry-collector/pdata

cmd/oteltestbedcol/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/telemetrygen/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,5 @@ retract (
6666

6767
// IMPORTANT NOTE: Do not add replace statements to this go.mod. This will break go install.
6868
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27855.
69+
70+
replace go.opentelemetry.io/collector/pdata => /Users/danoshin/Projects/opentelemetry-collector/pdata

cmd/telemetrygen/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/telemetrygen/internal/e2etest/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,5 @@ retract (
9797
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../../internal/common
9898

9999
replace github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen => ../..
100+
101+
replace go.opentelemetry.io/collector/pdata => /Users/danoshin/Projects/opentelemetry-collector/pdata

cmd/telemetrygen/internal/e2etest/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)