Skip to content

Commit

Permalink
Merge pull request #66 from lightstep/jmacd/update_arrow
Browse files Browse the repository at this point in the history
Update otel-arrow version; minor config adjustments
  • Loading branch information
jmacd authored Jan 3, 2024
2 parents 8e93778 + eb7eafc commit 7747a92
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 34 deletions.
5 changes: 5 additions & 0 deletions arrow/config/saas-collector.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# This configuration is used to sanity check the build configuration
# in the directory above. This is not a useful example configuration
# for sending to ServiceNow Cloud Observability; for a useful example
# configuration of the OTel-Arrow components, see ../../charts/*/arrow.yaml.

receivers:
# otelarrow is an OTel Arrow receiver that will operate as the SaaS-side
# of the bridge.
Expand Down
27 changes: 19 additions & 8 deletions arrow/otelcolarrow-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,31 @@ dist:
# Note: This should match the version of the core and contrib
# collector components used below (e.g., the debugexporter and
# otlphttpexporter versions below).
otelcol_version: 0.89.0
otelcol_version: 0.91.0

exporters:
# This is the core OpenTelemetry Protocol with Apache Arrow exporter
# This is the core OpenTelemetry Protocol with Apache Arrow exporter,
# recommended for exporting to ServiceNow Cloud Observability.
- import: github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter
gomod: github.com/open-telemetry/otel-arrow/collector v0.10.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.89.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.89.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.13.0

# The following components may be useful for debugging.

# The debug exporter, useful for printing telemetry to the console.
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.91.0
# This is the core OTLP/HTTP exporter, useful for forwarding OTLP/HTTP
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.91.0
# This is the core OTLP/gRPC exporter, useful for forwarding OTLP/gRPC.
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0

receivers:
# This is the core OpenTelemetry Protocol with Apache Arrow receiver
# This is the core OpenTelemetry Protocol with Apache Arrow receiver,
# recommended for receiving OTLP/gRPC and OTel-Arrow.
- import: github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver
gomod: github.com/open-telemetry/otel-arrow/collector v0.10.0
gomod: github.com/open-telemetry/otel-arrow/collector v0.13.0
# This is the core OTLP receiver, necessary for receiving OTLP/HTTP.
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0


extensions:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.88.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.91.0
4 changes: 2 additions & 2 deletions charts/collector-k8s/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: otelcollector
description: Deprecated chart for using the OpenTelemetry Collector to scape static or dynamic metric targets.
type: application
version: 0.2.1
appVersion: 0.83.0
version: 0.3.0
appVersion: 0.91.0
deprecated: true
dependencies:
# cert manager must be manually installed because it has CRDs
Expand Down
4 changes: 2 additions & 2 deletions charts/kube-otel-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: kube-otel-stack
description: Chart for sending Kubernetes metrics to Lightstep using the OpenTelemetry Operator.
type: application
version: 0.3.9
appVersion: 0.83.0
version: 0.4.0
appVersion: 0.91.0
dependencies:
# cert manager must be manually installed because it has CRDs
# https://github.com/kubernetes-sigs/security-profiles-operator/issues/1062
Expand Down
2 changes: 2 additions & 0 deletions charts/kube-otel-stack/arrow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ tracesCollector:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
otlp:
protocols:
http:
endpoint: "0.0.0.0:4318"
exporters:
Expand Down
4 changes: 2 additions & 2 deletions charts/otel-cloud-stack/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "0.2.9"
version: "0.3.0"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "1.17.0"
appVersion: "1.18.0"
2 changes: 2 additions & 0 deletions charts/otel-cloud-stack/arrow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ tracesCollector:
protocols:
grpc:
endpoint: "0.0.0.0:4317"
otlp:
protocols:
http:
endpoint: "0.0.0.0:4318"
exporters:
Expand Down
40 changes: 20 additions & 20 deletions gateway-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dist:
# This indicates which version of the core collector components as
# well as the builder version. At the time of this writing, we
# recommend using at least the current release.
otelcol_version: 0.83.0
otelcol_version: 0.91.0

# We recommend building in both the OTLP exporter and the OTel-Arrow
# exporter.
Expand All @@ -44,7 +44,7 @@ exporters:
# the otel-arrow repository.
#
# Use this exporter stanza:
- gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- gomod: github.com/open-telemetry/otel-arrow/collector v0.13.0
import: github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter
# Note that while OTel-Arrow supports traces, metrics, and logs.
# ServiceNow's initial release is limited to OTel-Arrow traces
Expand All @@ -58,14 +58,14 @@ exporters:
# configuration. Generally, remove the `arrow` subection of the
# `otelarrow` exporter configuration and it will apply to the OTLP
# exporter.
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0

# In case you want to record an OTLP telemetry session to a JSON
# file, we recommend this additional utility. See also the
# obfuscation processor, listed below. The OTel-Arrow provides
# offline tools that can help explain poor compression performance
# using inputs generated by this exporter, for example.
- gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- gomod: github.com/open-telemetry/otel-arrow/collector v0.13.0
import: github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter

receivers:
Expand All @@ -76,59 +76,59 @@ receivers:
# This enables other OTel Collectors or experimental SDKs that support OTel-Arrow to
# send to this collector, such as this one for the OTel-Go Trace SDK:
# https://github.com/lightstep/otel-launcher-go/tree/main/lightstep/sdk/trace/exporters/otlp/otelcol
- gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- gomod: github.com/open-telemetry/otel-arrow/collector v0.13.0
import: github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver
# As an alternate to the OTel-Arrow receiver (e.g., in case malfunction or performance
# issue), we recommend building with the core OTLP receiver as a fallback. The
# OTel-Arrow component is derived from the OTLP component, so it supports compatible
# configuration. Generally, remove the `arrow` subection of the `otelarrow` receiver
# configuration and it will apply to the OTLP exporter.
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.83.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0

# You may wish to enable other receivers from the Collector-Contrib repository or
# elsewhere. Here are some that might be useful:
#
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.83.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.83.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.83.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.83.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.91.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.91.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.91.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.91.0

processors:
# We recommend use of the batch processor.
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.83.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.91.0

# We recommend building with the follow processor for obfuscation, in case you want to
# record telemetry sessions for offline analysis.
- gomod: github.com/open-telemetry/otel-arrow/collector v0.4.0
- gomod: github.com/open-telemetry/otel-arrow/collector v0.13.0
import: github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor

# We emphatically DO NOT recommend use of the memory limiter processor, i.e., do not
# build with go.opentelemetry.io/collector/processor/memorylimiter.

# These Collector-Contrib components are referred to in the charts in this package.
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.83.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.83.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.83.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.83.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.91.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.91.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.91.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.91.0

# ServiceNow does not at this time recommend the probabilistic sampler processor,
# because it leads to undercounting of spans. We will update this recommendation
# when the sampler is fully supported.
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.83.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.91.0

# TODO: Note: We will recommend use of a new uncompressed-size processor
# when it is ready.

# You may be interested in other transform components in the
# Collector-Contrib repository. Here are some that might be useful:
#
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.83.0
# - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.91.0

extensions:
# You may be interested in externsions from the Collector-Contrib repository. None are
# required. Here are some that might be useful:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.83.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.91.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.91.0

# We do not support use of headersetterextension to apply the lightstep-access-token
# header on a per-request basis. Contact ServiceNow if you are interested in
Expand Down

0 comments on commit 7747a92

Please sign in to comment.