Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

steps:
- name: golang:1.23
- name: golang:1.25
dir: samples/instrumentation-quickstart/integrationtest
env:
- COMPOSE_OVERRIDE_FILE=../docker-compose.cloudbuild.yaml
Expand Down
4 changes: 2 additions & 2 deletions samples/instrumentation-quickstart/integrationtest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module integrationtest

go 1.24.9

require github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/quickstarttest v0.0.0-20250114143142-e149ed7094ab
require github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/quickstarttest v0.0.0-20251205205940-e7125b8e8f51

require (
dario.cat/mergo v1.0.2 // indirect
Expand Down Expand Up @@ -138,7 +138,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.2 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
Expand Down
8 changes: 4 additions & 4 deletions samples/instrumentation-quickstart/integrationtest/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/DefangLabs/secret-detector v0.0.0-20250811234530-d4b4214cd679 h1:qNT7R4qrN+5u5ajSbqSW1opHP4LA8lzA+ASyw5MQZjs=
github.com/DefangLabs/secret-detector v0.0.0-20250811234530-d4b4214cd679/go.mod h1:blbwPQh4DTlCZEfk1BLU4oMIhLda2U+A840Uag9DsZw=
github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/quickstarttest v0.0.0-20250114143142-e149ed7094ab h1:9OXXzInvP4VS3HDWKffd3VWj4R4AF2GAtk32UZpeQGM=
github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/quickstarttest v0.0.0-20250114143142-e149ed7094ab/go.mod h1:rO1zHFu/xDhYgOK4xQWzwwrmyegPn7ywl7R90t7zPcE=
github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/quickstarttest v0.0.0-20251205205940-e7125b8e8f51 h1:k8WdqZWOUfxqQq9A4iqV4JZHPMpNdiAz1YFIXmWG/1A=
github.com/GoogleCloudPlatform/opentelemetry-operations-e2e-testing/quickstarttest v0.0.0-20251205205940-e7125b8e8f51/go.mod h1:lHSTo/JjBm2O8rk935IZIwtY/WfVgo1Q8QQ1xYkrq6Q=
github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
Expand Down Expand Up @@ -424,8 +424,8 @@ github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvM
github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
github.com/prometheus/common v0.67.2 h1:PcBAckGFTIHt2+L3I33uNRTlKTplNzFctXcWhPyAEN8=
github.com/prometheus/common v0.67.2/go.mod h1:63W3KZb1JOKgcjlIr64WW/LvFGAqKPj0atm+knVGEko=
github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
Expand Down
21 changes: 19 additions & 2 deletions samples/instrumentation-quickstart/otel-collector-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,17 @@ exporters:
# Export metrics to Google Managed service for Prometheus
googlemanagedprometheus:
project: ${GOOGLE_CLOUD_PROJECT}
otlphttp:
encoding: proto
endpoint: https://telemetry.googleapis.com
# Use the googleclientauth extension to authenticate with Google credentials
auth:
authenticator: googleclientauth

extensions:
googleclientauth:
project: ${GOOGLE_CLOUD_PROJECT}
quota_project: ${GOOGLE_CLOUD_PROJECT}

processors:
# Batch telemetry together to more efficiently send to GCP
Expand All @@ -109,8 +120,14 @@ processors:
# If running on GCP (e.g. on GKE), detect resource attributes from the environment.
resourcedetection:
detectors: ["env", "gcp"]
resource/gcp_project_id:
attributes:
- key: gcp.project_id
value: ${GOOGLE_CLOUD_PROJECT}
action: insert

service:
extensions: [googleclientauth]
telemetry:
metrics:
readers:
Expand All @@ -122,8 +139,8 @@ service:
pipelines:
traces:
receivers: ["otlp"]
processors: ["batch", "resourcedetection"]
exporters: ["googlecloud"]
processors: ["batch", "resourcedetection", "resource/gcp_project_id"]
exporters: ["otlphttp"]
metrics:
receivers: ["otlp"]
processors: ["batch", "resourcedetection", "resource"]
Expand Down