Skip to content

Commit 2dbec0f

Browse files
authored
Fix module name for GMP, update docs, and prepare for a patch release. (#387)
* add docs for use before the release * fix gmp module name, and update docs * prepare for patch releases
1 parent 86486a5 commit 2dbec0f

11 files changed

Lines changed: 47 additions & 22 deletions

File tree

e2e-test-server/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.17
55
require (
66
cloud.google.com/go/iam v0.1.1 // indirect
77
cloud.google.com/go/pubsub v1.19.0
8-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.0
8+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1
99
go.opentelemetry.io/otel v1.6.3
1010
go.opentelemetry.io/otel/sdk v1.6.2
1111
go.opentelemetry.io/otel/trace v1.6.3
@@ -16,7 +16,7 @@ require (
1616
cloud.google.com/go v0.100.2 // indirect
1717
cloud.google.com/go/compute v1.5.0 // indirect
1818
cloud.google.com/go/trace v1.2.0 // indirect
19-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.0 // indirect
19+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect
2020
github.com/go-logr/logr v1.2.3 // indirect
2121
github.com/go-logr/stdr v1.2.2 // indirect
2222
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect

example/metric/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.17
55
replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric => ../../exporter/metric
66

77
require (
8-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.30.0
8+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.30.1
99
go.opentelemetry.io/otel v1.6.2
1010
go.opentelemetry.io/otel/metric v0.28.0
1111
go.opentelemetry.io/otel/sdk v1.6.2

example/trace/http/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trac
77
replace github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping => ../../../internal/resourcemapping
88

99
require (
10-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.0
10+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1
1111
github.com/davecgh/go-spew v1.1.1 // indirect
1212
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0
1313
go.opentelemetry.io/otel v1.6.3
@@ -18,7 +18,7 @@ require (
1818
require (
1919
cloud.google.com/go/compute v1.5.0 // indirect
2020
cloud.google.com/go/trace v1.2.0 // indirect
21-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.0 // indirect
21+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect
2222
github.com/felixge/httpsnoop v1.0.2 // indirect
2323
github.com/go-logr/logr v1.2.3 // indirect
2424
github.com/go-logr/stdr v1.2.2 // indirect

exporter/collector/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.17
44

55
require (
66
cloud.google.com/go/logging v1.4.2
7-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.0
7+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1
88
github.com/census-instrumentation/opencensus-proto v0.3.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.49.0
1010
github.com/stretchr/testify v1.7.1
@@ -22,7 +22,7 @@ require (
2222
require (
2323
cloud.google.com/go/monitoring v1.4.0
2424
cloud.google.com/go/trace v1.2.0
25-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.0
25+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1
2626
github.com/benbjohnson/clock v1.3.0 // indirect
2727
github.com/google/go-cmp v0.5.7
2828
go.opentelemetry.io/collector/pdata v0.49.0

exporter/collector/googlemanagedprometheus/README.md

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
In your own fork of [open-telemetry/opentelemetry-collector-releases](https://github.com/open-telemetry/opentelemetry-collector-releases), add your own "distribution" directory within the distributions directory, based on either the otelcol or otelcol-contrib distributions. In the `exporters` list in `manifest.yaml`, add:
66
```yaml
77
exporters:
8-
- gomod: "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.29.0"
8+
- gomod: "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.30.1"
99
```
1010
1111
The syntax of `manifest.yaml` is described in the [Collector Builder documentation](https://github.com/open-telemetry/opentelemetry-collector/blob/54f271b7d473f36b4ecbc21994d59359dbd263f6/cmd/builder/README.md#opentelemetry-collector-builder).
@@ -17,9 +17,27 @@ receivers:
1717
prometheus:
1818
config:
1919
scrape_configs:
20-
# TODO: Add your prometheus scrape configuration here.
20+
# Add your prometheus scrape configuration here.
2121
# Using kubernetes_sd_configs with namespaced resources
2222
# ensures the namespace is set on your metrics.
23+
- job_name: 'kubernetes-pods'
24+
kubernetes_sd_configs:
25+
- role: pod
26+
relabel_configs:
27+
- source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape]
28+
action: keep
29+
regex: true
30+
- source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path]
31+
action: replace
32+
target_label: __metrics_path__
33+
regex: (.+)
34+
- source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port]
35+
action: replace
36+
regex: (.+):(?:\d+);(\d+)
37+
replacement: $$1:$$2
38+
target_label: __address__
39+
- action: labelmap
40+
regex: __meta_kubernetes_pod_label_(.+)
2341
processors:
2442
batch:
2543
# batch metrics before sending to reduce API usage
@@ -37,6 +55,13 @@ processors:
3755
timeout: 10s
3856
exporters:
3957
googlemanagedprometheus:
58+
59+
service:
60+
pipelines:
61+
metrics:
62+
receivers: [prometheus]
63+
processors: [batch, memory_limiter, resourcedetection]
64+
exporters: [googlemanagedprometheus]
4065
```
4166

4267
Change the Dockerfile in your directory within `distributions` to point to your collector config [here](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol-contrib/Dockerfile#L17).

exporter/collector/googlemanagedprometheus/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
module github.com/dashpole/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus
1+
module github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus
22

33
go 1.17
44

55
require (
6-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.0
6+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.1
77
github.com/stretchr/testify v1.7.1
88
go.opentelemetry.io/collector v0.49.0
99
go.opentelemetry.io/collector/model v0.49.0
@@ -17,8 +17,8 @@ require (
1717
cloud.google.com/go/logging v1.4.2 // indirect
1818
cloud.google.com/go/monitoring v1.4.0 // indirect
1919
cloud.google.com/go/trace v1.2.0 // indirect
20-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.0 // indirect
21-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.0 // indirect
20+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1 // indirect
21+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect
2222
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2323
github.com/davecgh/go-spew v1.1.1 // indirect
2424
github.com/go-logr/logr v1.2.3 // indirect

exporter/collector/integrationtest/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.17
44

55
require (
66
contrib.go.opencensus.io/exporter/stackdriver v0.13.11
7-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.0
8-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.30.0
7+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.30.1
8+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.30.1
99
github.com/google/go-cmp v0.5.7
1010
github.com/stretchr/testify v1.7.1
1111
go.opencensus.io v0.23.0
@@ -25,8 +25,8 @@ require (
2525
cloud.google.com/go/logging v1.4.2 // indirect
2626
cloud.google.com/go/monitoring v1.4.0 // indirect
2727
cloud.google.com/go/trace v1.2.0 // indirect
28-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.0 // indirect
29-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.0 // indirect
28+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.6.1 // indirect
29+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1 // indirect
3030
github.com/aws/aws-sdk-go v1.42.49 // indirect
3131
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
3232
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect

exporter/metric/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ package metric
1717
// Version is the current release version of the OpenTelemetry
1818
// Operations Metric Exporter in use.
1919
func Version() string {
20-
return "0.30.0"
20+
return "0.30.1"
2121
}

exporter/trace/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
google.golang.org/protobuf v1.28.0
2222
)
2323

24-
require github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.0
24+
require github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.30.1
2525

2626
require (
2727
cloud.google.com/go/compute v1.5.0 // indirect

exporter/trace/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ package trace
1717
// Version is the current release version of the OpenTelemetry
1818
// Operations Trace Exporter in use.
1919
func Version() string {
20-
return "1.6.0"
20+
return "1.6.1"
2121
}

0 commit comments

Comments
 (0)