Skip to content

Commit a4454e2

Browse files
Merge branch 'main' into rm-unused-tools-code
2 parents 7259af2 + b1e5e35 commit a4454e2

File tree

217 files changed

+12735
-18901
lines changed

Some content is hidden

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

217 files changed

+12735
-18901
lines changed

.github/dependabot.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ updates:
2929
interval: weekly
3030
day: sunday
3131
- package-ecosystem: gomod
32-
directory: /bridge/opencensus/test
32+
directory: /bridge/opencensus/opencensusmetric
3333
labels:
3434
- dependencies
3535
- go
@@ -38,7 +38,7 @@ updates:
3838
interval: weekly
3939
day: sunday
4040
- package-ecosystem: gomod
41-
directory: /bridge/opentracing
41+
directory: /bridge/opencensus/test
4242
labels:
4343
- dependencies
4444
- go
@@ -47,7 +47,7 @@ updates:
4747
interval: weekly
4848
day: sunday
4949
- package-ecosystem: gomod
50-
directory: /example/fib
50+
directory: /bridge/opentracing
5151
labels:
5252
- dependencies
5353
- go
@@ -56,7 +56,7 @@ updates:
5656
interval: weekly
5757
day: sunday
5858
- package-ecosystem: gomod
59-
directory: /example/jaeger
59+
directory: /example/fib
6060
labels:
6161
- dependencies
6262
- go
@@ -65,7 +65,7 @@ updates:
6565
interval: weekly
6666
day: sunday
6767
- package-ecosystem: gomod
68-
directory: /example/namedtracer
68+
directory: /example/jaeger
6969
labels:
7070
- dependencies
7171
- go
@@ -74,7 +74,7 @@ updates:
7474
interval: weekly
7575
day: sunday
7676
- package-ecosystem: gomod
77-
directory: /example/opencensus
77+
directory: /example/namedtracer
7878
labels:
7979
- dependencies
8080
- go

CHANGELOG.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,40 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88

99
## [Unreleased]
1010

11+
### Changed
12+
13+
- The metric SDK in `go.opentelemetry.io/otel/sdk/metric` is completely refactored to comply with the OpenTelemetry specification.
14+
Please see the package documentation for how the new SDK is initialized and configured. (#3175)
15+
16+
### Removed
17+
18+
- The metric portion of the OpenCensus bridge (`go.opentelemetry.io/otel/bridge/opencensus`) has been removed.
19+
A new bridge compliant with the revised metric SDK will be added back in a future release. (#3175)
20+
- The `go.opentelemetry.io/otel/sdk/metric/aggregator/aggregatortest` package is removed, see the new metric SDK. (#3175)
21+
- The `go.opentelemetry.io/otel/sdk/metric/aggregator/histogram` package is removed, see the new metric SDK. (#3175)
22+
- The `go.opentelemetry.io/otel/sdk/metric/aggregator/lastvalue` package is removed, see the new metric SDK. (#3175)
23+
- The `go.opentelemetry.io/otel/sdk/metric/aggregator/sum` package is removed, see the new metric SDK. (#3175)
24+
- The `go.opentelemetry.io/otel/sdk/metric/aggregator` package is removed, see the new metric SDK. (#3175)
25+
- The `go.opentelemetry.io/otel/sdk/metric/controller/basic` package is removed, see the new metric SDK. (#3175)
26+
- The `go.opentelemetry.io/otel/sdk/metric/controller/controllertest` package is removed, see the new metric SDK. (#3175)
27+
- The `go.opentelemetry.io/otel/sdk/metric/controller/time` package is removed, see the new metric SDK. (#3175)
28+
- The `go.opentelemetry.io/otel/sdk/metric/export/aggregation` package is removed, see the new metric SDK. (#3175)
29+
- The `go.opentelemetry.io/otel/sdk/metric/export` package is removed, see the new metric SDK. (#3175)
30+
- The `go.opentelemetry.io/otel/sdk/metric/metrictest` package is removed.
31+
A replacement package that supports the new metric SDK will be added back in a future release. (#3175)
32+
- The `go.opentelemetry.io/otel/sdk/metric/number` package is removed, see the new metric SDK. (#3175)
33+
- The `go.opentelemetry.io/otel/sdk/metric/processor/basic` package is removed, see the new metric SDK. (#3175)
34+
- The `go.opentelemetry.io/otel/sdk/metric/processor/processortest` package is removed, see the new metric SDK. (#3175)
35+
- The `go.opentelemetry.io/otel/sdk/metric/processor/reducer` package is removed, see the new metric SDK. (#3175)
36+
- The `go.opentelemetry.io/otel/sdk/metric/registry` package is removed, see the new metric SDK. (#3175)
37+
- The `go.opentelemetry.io/otel/sdk/metric/sdkapi` package is removed, see the new metric SDK. (#3175)
38+
- The `go.opentelemetry.io/otel/sdk/metric/selector/simple` package is removed, see the new metric SDK. (#3175)
39+
- The `"go.opentelemetry.io/otel/sdk/metric".ErrUninitializedInstrument` variable was removed. (#3175)
40+
- The `"go.opentelemetry.io/otel/sdk/metric".ErrBadInstrument` variable was removed. (#3175)
41+
- The `"go.opentelemetry.io/otel/sdk/metric".Accumulator` type was removed, see the `MeterProvider`in the new metric SDK. (#3175)
42+
- The `"go.opentelemetry.io/otel/sdk/metric".NewAccumulator` function was removed, see `NewMeterProvider`in the new metric SDK. (#3175)
43+
- The deprecated `"go.opentelemetry.io/otel/sdk/metric".AtomicFieldOffsets` function was removed. (#3175)
44+
1145
## [1.10.0] - 2022-09-09
1246

1347
### Added

bridge/opencensus/README.md

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -79,50 +79,3 @@ OpenCensus and OpenTelemetry APIs are not entirely compatible. If the bridge fi
7979
* Custom OpenCensus Samplers specified during StartSpan are ignored.
8080
* Links cannot be added to OpenCensus spans.
8181
* OpenTelemetry Debug or Deferred trace flags are dropped after an OpenCensus span is created.
82-
83-
## Metrics
84-
85-
### The problem: mixing libraries without mixing pipelines
86-
87-
The problem for monitoring is simpler than the problem for tracing, since there
88-
are no context propagation issues to deal with. However, it still is difficult
89-
for users to migrate an entire applications' monitoring at once. It
90-
should be possible to send metrics generated by OpenCensus libraries to an
91-
OpenTelemetry pipeline so that migrating a metric does not require maintaining
92-
separate export pipelines for OpenCensus and OpenTelemetry.
93-
94-
### The Exporter "wrapper" solution
95-
96-
The solution we use here is to allow wrapping an OpenTelemetry exporter such
97-
that it implements the OpenCensus exporter interfaces. This allows a single
98-
exporter to be used for metrics from *both* OpenCensus and OpenTelemetry.
99-
100-
### User Journey
101-
102-
Starting from an application using entirely OpenCensus APIs:
103-
104-
1. Instantiate OpenTelemetry SDK and Exporters.
105-
2. Replace OpenCensus exporters with a wrapped OpenTelemetry exporter from step 1.
106-
3. Migrate libraries individually from OpenCensus to OpenTelemetry
107-
4. Remove OpenCensus Exporters and configuration.
108-
109-
For example, to swap out the OpenCensus logging exporter for the OpenTelemetry stdout exporter:
110-
111-
```go
112-
import (
113-
"go.opencensus.io/metric/metricexport"
114-
"go.opentelemetry.io/otel/bridge/opencensus"
115-
"go.opentelemetry.io/otel/exporters/stdout"
116-
"go.opentelemetry.io/otel"
117-
)
118-
// With OpenCensus, you could have previously configured the logging exporter like this:
119-
// import logexporter "go.opencensus.io/examples/exporter"
120-
// exporter, _ := logexporter.NewLogExporter(logexporter.Options{})
121-
// Instead, we can create an equivalent using the OpenTelemetry stdout exporter:
122-
openTelemetryExporter, _ := stdout.New(stdout.WithPrettyPrint())
123-
exporter := opencensus.NewMetricExporter(openTelemetryExporter)
124-
125-
// Use the wrapped OpenTelemetry exporter like you normally would with OpenCensus
126-
intervalReader, _ := metricexport.NewIntervalReader(&metricexport.Reader{}, exporter)
127-
intervalReader.Start()
128-
```

bridge/opencensus/aggregation.go

Lines changed: 0 additions & 157 deletions
This file was deleted.

0 commit comments

Comments
 (0)