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

A rebase from the latest master onto our skyman/master branch #381

Merged
merged 13 commits into from
Jan 14, 2021
Merged

A rebase from the latest master onto our skyman/master branch #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c690f7f
Bump cloud.google.com/go in /processor/resourcedetectionprocessor (#2…
dependabot[bot] Jan 12, 2021
bb44b79
Release v0.18.0 (#2008)
jchengsfx Jan 13, 2021
f74ee2b
[exporter/datadog]: sanitize datadog service names (#1982)
ericmustin Jan 13, 2021
5c83df6
Test that default metrics have no tags set other than hostname (#2014)
albertvaka Jan 13, 2021
1e13a8c
Update example configuration (#2013)
sumo-drosiek Jan 13, 2021
6c499bc
Add more metadata to awsecscontainer receiver (#2011)
JohnWu20 Jan 13, 2021
e3c8dd1
Fix readme and add test to validate example config (#2000)
djaglowski Jan 13, 2021
58fba1f
Prometheus federation example (#2007)
atoulme Jan 13, 2021
d2f6f48
[exporter/datadog]: ensure that version tag is used for stats aggrega…
ericmustin Jan 13, 2021
f74b765
[AzureMonitorExporter] Favor RPC over HTTP spans (#378) (#2006)
pcwiese Jan 13, 2021
1cfde07
Adding ai.operation.parentid override
pcwiese Jul 24, 2020
542cb93
Add composite sampling policy in tail sampler
vangarp Nov 9, 2020
29b9194
Fix lb exporter issues when DNS resolution fails during startup
vangarp Dec 9, 2020
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
33 changes: 33 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,39 @@

## Unreleased

## v0.18.0

# 🎉 OpenTelemetry Collector Contrib v0.18.0 (Beta) 🎉

The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-collector release](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.18.0) (be sure to check the release notes here as well!). Check out the [Getting Started Guide](https://opentelemetry.io/docs/collector/getting-started/) for deployment and configuration information.

## 🚀 New components 🚀

- `sumologic` exporter to send logs and metrics data to Sumo Logic
- `dynatrace` exporter to send metrics to Dynatrace

## 💡 Enhancements 💡

- `datadog` exporter:
- Add resource attributes to tags conversion feature (#1782)
- Add Kubernetes conventions for hostnames (#1919)
- Add container tags to datadog export for container infra metrics in service view (#1895)
- Update resource naming and span naming (#1861)
- Add environment variables support for config options (#1897)
- `awsxray` exporter: Add parsing of JavaScript stack traces (#1888)
- `elastic` exporter: Translate exception span events (#1858)
- `signalfx` exporter: Add translation rules to aggregate per core CPU metrics in default translations (#1841)
- `resourcedetection` processor: Gather tags associated with the EC2 instance and add them as resource attributes (#1899)
- `simpleprometheus` receiver: Add support for passing params to the prometheus scrape config (#1949)
- `azuremonitor` exporter: Implement Span status code specification changes - gRPC (#1960)
- `metricstransform` processor: Add grouping option ($1887)
- `alibabacloudlogservice` exporter: Use producer to send data to improve performance (#1981)

## 🧰 Bug fixes 🧰

- `datadog` exporter: Handle monotonic metrics client-side (#1805)
- `awsxray` exporter: Log error when translating span (#1809)

## v0.17.0

# 🎉 OpenTelemetry Collector Contrib v0.17.0 (Beta) 🎉
Expand Down
6 changes: 3 additions & 3 deletions Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ALL_SRC_AND_DOC := $(shell find . \( -name "*.md" -o -name "*.go" -o -name "*.ya

# ALL_PKGS is used with 'go cover'
ALL_PKGS := $(shell go list $(sort $(dir $(ALL_SRC))) 2>/dev/null)
# ALL_MODULES includes ./* dirs (excludes . dir)
ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep '^./' )
# ALL_MODULES includes ./* dirs (excludes . dir and example with go code)
ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep '^./' | grep -v 'receiver/simpleprometheusreceiver/examples/' )

GOTEST_OPT?= -race -timeout 30s
GOTEST_INTEGRATION_OPT?= -race -timeout 60s
Expand Down Expand Up @@ -126,6 +126,6 @@ misspell-correction:
impi:
@$(IMPI) --local github.com/open-telemetry/opentelemetry-collector-contrib --scheme stdThirdPartyLocal ./...

.PHONY: dep
.PHONY: dep
dep:
go mod download
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/gogo/protobuf v1.3.2
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
)
8 changes: 4 additions & 4 deletions exporter/alibabacloudlogserviceexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab h1:aqnt+nso9pgomKAZd/PWs2lfAY7zyT8JYhvXfnw4XoI=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab/go.mod h1:dn4SrTEW1h36xuWAMI7ZQncS6IoGYx5jjXDhtQcG41A=
go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down Expand Up @@ -1260,8 +1260,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ require (
github.com/golang/protobuf v1.4.3
github.com/google/uuid v1.1.4
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
)
8 changes: 4 additions & 4 deletions exporter/awsemfexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,8 +982,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab h1:aqnt+nso9pgomKAZd/PWs2lfAY7zyT8JYhvXfnw4XoI=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab/go.mod h1:dn4SrTEW1h36xuWAMI7ZQncS6IoGYx5jjXDhtQcG41A=
go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down Expand Up @@ -1381,8 +1381,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9 h1:f+/+gfZ/tfaHBXXiv1gWRmCej6wlX3mLY4bnLpI99wk=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsprometheusremotewriteexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ go 1.15
require (
github.com/aws/aws-sdk-go v1.36.24
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
)
8 changes: 4 additions & 4 deletions exporter/awsprometheusremotewriteexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,8 +982,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab h1:aqnt+nso9pgomKAZd/PWs2lfAY7zyT8JYhvXfnw4XoI=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab/go.mod h1:dn4SrTEW1h36xuWAMI7ZQncS6IoGYx5jjXDhtQcG41A=
go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down Expand Up @@ -1381,8 +1381,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9 h1:f+/+gfZ/tfaHBXXiv1gWRmCej6wlX3mLY4bnLpI99wk=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsxrayexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/aws/aws-sdk-go v1.36.24
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/awsxrayexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,8 +982,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab h1:aqnt+nso9pgomKAZd/PWs2lfAY7zyT8JYhvXfnw4XoI=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab/go.mod h1:dn4SrTEW1h36xuWAMI7ZQncS6IoGYx5jjXDhtQcG41A=
go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down Expand Up @@ -1381,8 +1381,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df h1:dzcY2V+Hq5AopGNrrPau/ZLX3Io4ma9h4e5E//dkeH4=
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/stretchr/testify v1.6.1
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20201021035429-f5854403a974
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/azuremonitorexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,8 +993,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab h1:aqnt+nso9pgomKAZd/PWs2lfAY7zyT8JYhvXfnw4XoI=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab/go.mod h1:dn4SrTEW1h36xuWAMI7ZQncS6IoGYx5jjXDhtQcG41A=
go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down Expand Up @@ -1391,8 +1391,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df h1:dzcY2V+Hq5AopGNrrPau/ZLX3Io4ma9h4e5E//dkeH4=
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
Expand Down
18 changes: 13 additions & 5 deletions exporter/azuremonitorexporter/trace_to_envelope.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ func spanToEnvelope(
envelope.Tags[contracts.OperationId] = span.TraceID().HexString()
envelope.Tags[contracts.OperationParentId] = span.ParentSpanID().HexString()

// If a specific ai.operation.parentid is specified as an attribute, use that instead of the parent span id.
// This is a by convention method to enable proper linking of legacy AppInsights hierarchical requests to OpenTelemetry instrumented requests.
// Services are responsible for parsing an inbound hierarchical request and adding this special tag.
if alternateParentIDAttributeValue, success := attributeMap.Get(contracts.OperationParentId); success {
envelope.Tags[contracts.OperationParentId] = alternateParentIDAttributeValue.StringVal()
attributeMap.Delete(contracts.OperationParentId)
}

data := contracts.NewData()
var dataSanitizeFunc func() []string
var dataProperties map[string]string
Expand Down Expand Up @@ -594,16 +602,16 @@ func mapIncomingSpanToType(attributeMap pdata.AttributeMap) spanType {
return unknownSpanType
}

// HTTP
if _, exists := attributeMap.Get(conventions.AttributeHTTPMethod); exists {
return httpSpanType
}

// RPC
if _, exists := attributeMap.Get(conventions.AttributeRPCSystem); exists {
return rpcSpanType
}

// HTTP
if _, exists := attributeMap.Get(conventions.AttributeHTTPMethod); exists {
return httpSpanType
}

// Database
if _, exists := attributeMap.Get(conventions.AttributeDBSystem); exists {
return databaseSpanType
Expand Down
2 changes: 1 addition & 1 deletion exporter/carbonexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
8 changes: 4 additions & 4 deletions exporter/carbonexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,8 +981,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab h1:aqnt+nso9pgomKAZd/PWs2lfAY7zyT8JYhvXfnw4XoI=
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab/go.mod h1:dn4SrTEW1h36xuWAMI7ZQncS6IoGYx5jjXDhtQcG41A=
go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
Expand Down Expand Up @@ -1379,8 +1379,8 @@ google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc v1.34.1 h1:ugq+9++ZQPFzM2pKUMCIK8gj9M0pFyuUWO9Q8kwEDQw=
google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df h1:dzcY2V+Hq5AopGNrrPau/ZLX3Io4ma9h4e5E//dkeH4=
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
Expand Down
2 changes: 1 addition & 1 deletion exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.6.1
github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
go.opentelemetry.io/collector v0.17.1-0.20210111170652-28e3cc1d73ab
go.opentelemetry.io/collector v0.18.0
go.uber.org/zap v1.16.0
gopkg.in/DataDog/dd-trace-go.v1 v1.28.0
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
Expand Down
Loading